Skip to content

Commit

Permalink
SAM-2843 Create Matching question screen. Add Bootstrap. Large screens
Browse files Browse the repository at this point in the history 
Changed display for large resolutions
  • Loading branch information
@alejandrogj
alejandrogj committed Apr 22, 2016
1 parent 8e29111 commit 9b4b758
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 18 deletions.
4 changes: 4 additions & 0 deletions samigo/samigo-app/src/webapp/css/tool_sam.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1295,3 +1295,7 @@ div.eventLogPagerContainer {
margin: 1em 0;
}

#itemForm\3A pairs{
max-width: 1200px;
}

36 changes: 18 additions & 18 deletions samigo/samigo-app/src/webapp/jsf/author/item/matching.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@

<!-- 1 POINTS -->
<div class="form-group row">
<h:outputLabel for="answerptr" value="#{authorMessages.answer_point_value}" styleClass="col-md-4 form-control-label"/>
<h:outputLabel for="answerptr" value="#{authorMessages.answer_point_value}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-2">
<h:inputText id="answerptr" label="#{authorMessages.pt}" value="#{itemauthor.currentItem.itemScore}"
required="true" disabled="#{author.isEditPoolFlow}" styleClass="form-control ConvertPoint">
Expand All @@ -100,7 +100,7 @@
</div>

<div class="form-group row">
<h:outputLabel value="#{authorMessages.answer_point_value_display}" styleClass="col-md-4 form-control-label"/>
<h:outputLabel value="#{authorMessages.answer_point_value_display}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-5 samigo-inline-radio">
<h:selectOneRadio value="#{itemauthor.currentItem.itemScoreDisplayFlag}" >
<f:selectItem itemValue="true" itemLabel="#{authorMessages.yes}" />
Expand All @@ -112,7 +112,7 @@
<!-- 1.2 Min POINTS -->
<f:subview id="minPoints" rendered="#{itemauthor.allowMinScore}">
<div class="form-group row">
<h:outputLabel value="#{authorMessages.answer_min_point_value}" styleClass="col-md-4 form-control-label"/>
<h:outputLabel value="#{authorMessages.answer_min_point_value}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-2">
<h:inputText id="answerminptr" value="#{itemauthor.currentItem.itemMinScore}" styleClass="form-control ConvertPoint">
<f:validateDoubleRange/>
Expand All @@ -125,7 +125,7 @@

<!-- 2 TEXT -->
<div class="form-group row">
<h:outputLabel value="#{authorMessages.q_text}" styleClass="col-md-4 form-control-label"/>
<h:outputLabel value="#{authorMessages.q_text}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<!-- WYSIWYG -->
<div class="col-md-8">
<h:panelGrid>
Expand Down Expand Up @@ -195,7 +195,7 @@
<!-- WYSIWYG -->
<div class="tier2">
<div class="form-group row">
<h:outputLabel value=" #{authorMessages.matching_choice_col}" styleClass="col-md-4 form-control-label"/>
<h:outputLabel value=" #{authorMessages.matching_choice_col}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-8">
<h:panelGrid>
<samigo:wysiwyg value="#{itemauthor.currentItem.currentMatchPair.choice}"
Expand All @@ -206,7 +206,7 @@
</div>
</div>
<div class="form-group row">
<h:outputLabel for="controllingSequence" value=" #{authorMessages.matching_match_col}" styleClass="col-md-4 form-control-label"/>
<h:outputLabel for="controllingSequence" value=" #{authorMessages.matching_match_col}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-8">
<h:selectOneMenu value="#{itemauthor.currentItem.currentMatchPair.controllingSequence }" id="controllingSequence">
<f:selectItems value="#{itemauthor.currentItem.selfSequenceList }" />
Expand All @@ -225,7 +225,7 @@
<h:panelGroup layout="block" rendered="#{itemauthor.target == 'questionpool' || (itemauthor.target != 'questionpool' && (author.isEditPendingAssessmentFlow && assessmentSettings.feedbackAuthoring ne '1') || (!author.isEditPendingAssessmentFlow && publishedSettings.feedbackAuthoring ne '1'))}">
<!-- WYSIWYG -->
<div class="form-group row">
<h:outputLabel value="#{authorMessages.correct_match_feedback_opt}" styleClass="col-md-4 form-control-label"/>
<h:outputLabel value="#{authorMessages.correct_match_feedback_opt}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-8">
<h:panelGrid>
<samigo:wysiwyg rows="140" value="#{itemauthor.currentItem.currentMatchPair.corrMatchFeedback}" hasToggle="yes" mode="author">
Expand All @@ -236,7 +236,7 @@
</div>
<!-- WYSIWYG -->
<div class="form-group row">
<h:outputLabel value="#{authorMessages.incorrect_match_feedback_opt}" styleClass="col-md-4 form-control-label"/>
<h:outputLabel value="#{authorMessages.incorrect_match_feedback_opt}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-8">
<h:panelGrid>
<samigo:wysiwyg rows="140" value="#{itemauthor.currentItem.currentMatchPair.incorrMatchFeedback}" hasToggle="yes" mode="author">
Expand Down Expand Up @@ -278,7 +278,7 @@

<!-- 6 PART -->
<h:panelGroup styleClass="form-group row" layout="block" rendered="#{itemauthor.target == 'assessment' && !author.isEditPoolFlow}">
<h:outputLabel value="#{authorMessages.assign_to_p}" styleClass="col-md-4 form-control-label"/>
<h:outputLabel value="#{authorMessages.assign_to_p}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-8">
<h:selectOneMenu id="assignToPart" value="#{itemauthor.currentItem.selectedSection}">
<f:selectItems value="#{itemauthor.sectionSelectList}" />
Expand All @@ -288,7 +288,7 @@

<!-- 7 POOL -->
<h:panelGroup styleClass="form-group row" layout="block" rendered="#{itemauthor.target == 'assessment' && author.isEditPendingAssessmentFlow}">
<h:outputLabel value="#{authorMessages.assign_to_question_p}" styleClass="col-md-4 form-control-label"/>
<h:outputLabel value="#{authorMessages.assign_to_question_p}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-8">
<h:selectOneMenu id="assignToPool" value="#{itemauthor.currentItem.selectedPool}">
<f:selectItem itemValue="" itemLabel="#{authorMessages.select_a_pool_name}" />
Expand All @@ -303,7 +303,7 @@
<h:outputLabel value="#{authorMessages.correct_incorrect_an}" styleClass="col-md-12 form-control-label"/>
</div>
<div class="form-group row">
<h:outputLabel value="#{authorMessages.correct_answer_opti}" styleClass="col-md-4 form-control-label"/>
<h:outputLabel value="#{authorMessages.correct_answer_opti}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-8">
<h:panelGrid>
<samigo:wysiwyg rows="140" value="#{itemauthor.currentItem.corrFeedback}" hasToggle="yes" mode="author">
Expand All @@ -313,7 +313,7 @@
</div>
</div>
<div class="form-group row">
<h:outputLabel value="#{authorMessages.incorrect_answer_op}" styleClass="col-md-4 form-control-label"/>
<h:outputLabel value="#{authorMessages.incorrect_answer_op}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-8">
<h:panelGrid>
<samigo:wysiwyg rows="140" value="#{itemauthor.currentItem.incorrFeedback}" hasToggle="yes" mode="author">
Expand All @@ -329,20 +329,20 @@
<h:panelGroup rendered="#{itemauthor.showMetadata == 'true'}" styleClass="longtext">
<h:outputLabel value="Metadata"/><br/>
<div class="form-group row">
<h:outputLabel for="obj" value="#{authorMessages.objective}" styleClass="col-md-4 form-control-label"/>
<div class="col-md-5">
<h:outputLabel for="obj" value="#{authorMessages.objective}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-5 col-lg-3">
<h:inputText size="30" id="obj" value="#{itemauthor.currentItem.objective}" styleClass="form-control"/>
</div>
</div>
<div class="form-group row">
<h:outputLabel for="keyword" value="#{authorMessages.keyword}" styleClass="col-md-4 form-control-label"/>
<div class="col-md-5">
<h:outputLabel for="keyword" value="#{authorMessages.keyword}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-5 col-lg-3">
<h:inputText size="30" id="keyword" value="#{itemauthor.currentItem.keyword}" styleClass="form-control"/>
</div>
</div>
<div class="form-group row">
<h:outputLabel for="rubric" value="#{authorMessages.rubric_colon}" styleClass="col-md-4 form-control-label"/>
<div class="col-md-5">
<h:outputLabel for="rubric" value="#{authorMessages.rubric_colon}" styleClass="col-md-4 col-lg-2 form-control-label"/>
<div class="col-md-5 col-lg-3">
<h:inputText size="30" id="rubric" value="#{itemauthor.currentItem.rubric}" styleClass="form-control"/>
</div>
</div>
Expand Down

0 comments on commit 9b4b758

Please sign in to comment.