Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
===================================================================
diff -u -r3d4019df4427943688421ed16aac8c9ffdad257a -r1260e45458aeab2dd1bc862fb07096f514444aad
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 3d4019df4427943688421ed16aac8c9ffdad257a)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 1260e45458aeab2dd1bc862fb07096f514444aad)
@@ -213,7 +213,7 @@
 	    throw new ServletException(e);
 	}
 
-	return "pages/authoring/authoring5";
+	return "pages/authoring/authoring";
     }
 
     /**
@@ -349,7 +349,7 @@
 
 	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-	return "pages/authoring/authoring5";
+	return "pages/authoring/authoring";
     }
 
     /**
@@ -485,9 +485,9 @@
 	//in case of edit in monitor and at least one attempted user, we show authoring page with restricted options
 	boolean isAuthoringRestricted = (boolean) sessionMap.get(AssessmentConstants.ATTR_IS_AUTHORING_RESTRICTED);
 	if (isAuthoringRestricted) {
-	    return "pages/authoring/parts/questionlistRestricted5";
+	    return "pages/authoring/parts/questionlistRestricted";
 	} else {
-	    return "pages/authoring/parts/questionlist5";
+	    return "pages/authoring/parts/questionlist";
 	}
     }
 
@@ -563,7 +563,7 @@
 
 	// set session map ID so that itemlist.jsp can get sessionMAP
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return "pages/authoring/parts/questionlist5";
+	return "pages/authoring/parts/questionlist";
     }
 
     /**
@@ -580,7 +580,7 @@
 	}
 	// set session map ID so that itemlist.jsp can get sessionMAP
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return "pages/authoring/parts/questionlist5";
+	return "pages/authoring/parts/questionlist";
     }
 
     /**
@@ -629,7 +629,7 @@
 
 	// set session map ID so that itemlist.jsp can get sessionMAP
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	return "pages/authoring/parts/questionlist5";
+	return "pages/authoring/parts/questionlist";
     }
 
     /**
@@ -663,7 +663,7 @@
 	List<QuestionReference> delList = getDeletedQuestionReferences(sessionMap);
 	delList.add(questionReference);
 
-	return "pages/authoring/parts/questionlist5";
+	return "pages/authoring/parts/questionlist";
     }
 
     @RequestMapping(path = "/toggleQuestionRequired", method = RequestMethod.POST)
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd -r1260e45458aeab2dd1bc862fb07096f514444aad
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1260e45458aeab2dd1bc862fb07096f514444aad)
@@ -24,7 +24,7 @@
  
  /**
   * AuthoringButton.tag
-  *	Author: Dapeng Ni
+  *	Author: Dapeng Ni, Marcin Cieslak
   *	Description: Creates the save/cancel button for authoring page
   */
  
@@ -122,12 +122,14 @@
     	window.close();
     }  				
 </script>	
-<div id="saveCancelButtons" >
-		<a href="javascript:doSubmit_Form_Only();" id="saveButton" name="submit" class="btn btn-primary pull-right">
-			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
-		</a>
-		<a href="javascript:;" name="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
-			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</a>
+<div id="saveCancelButtons" class="d-flex justify-content-end">
+	<button id="cancelButton" onclick="javascript:doCancel()" type="button" class="btn btn-outline-secondary mr-2">
+		<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
+	</button>
+	
+	<button id="saveButton" onClick="javascript:doSubmit_Form_Only();" class="btn btn-primary">
+		<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
+	</button>
+
 </div>
 <!-- end tab content -->
\ No newline at end of file
Fisheye: Tag 1260e45458aeab2dd1bc862fb07096f514444aad refers to a dead (removed) revision in file `lams_tool_assessment/web/WEB-INF/tags/AuthoringButton5.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r6d2a3554753de6920d704a64c03dc48cc11599a8 -r1260e45458aeab2dd1bc862fb07096f514444aad
--- lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 6d2a3554753de6920d704a64c03dc48cc11599a8)
+++ lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1260e45458aeab2dd1bc862fb07096f514444aad)
@@ -1,6 +1,6 @@
 <% 
  /**
-  * Outcome.tag
+  * OutcomeAuthor.tag
   *	Author: Marcin Cieslak
   *	Description: Outcome selection in authoring
   */
@@ -24,21 +24,23 @@
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
 
 <%-- ---------------------------------------%>
-<style type="text/css">
-	.outcomeMappings {
+<style>
+	#outcomeAuthor${outcomeTagId} .outcomeMappings div {
 		display: inline-block;
 	}
 	
-	.outcomeButton {
-		padding-top: 2px;
-		padding-bottom: 2px;
+	#outcomeAuthor${outcomeTagId} input {
+		margin-bottom: 0 !important;
 	}
+	
+	.ui-autocomplete .ui-menu-item {
+		cursor: pointer;
+	}
 </style>
 
 <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
@@ -63,6 +65,14 @@
 			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
+			'open'	: function(event, ui){
+				$('.ui-autocomplete').addClass('dropdown-menu');
+				$('.ui-menu-item').addClass('dropdown-item');
+			},
+			'classes' : {
+				'ui-autocomplete' : 'dropdown-menu',
+				'ui-menu-item'    : 'dropdown-item'
+			},
 			'response' : function(event, ui) {
 				// filter out already mapped outcomes
 				var index = ui.content.length - 1,
@@ -142,7 +152,7 @@
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
 						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
-						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+						$('<button type="button" class="mr-2 mt-2 btn btn-sm btn-info outcomeButton" />')
 							.attr('mappingId', this.mappingId)
 							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
 							.prop('disabled', qbMapping)
@@ -176,35 +186,17 @@
 	}
 </script>
 
-<c:choose>
-	<c:when test="${inPanel}">
-		<lams:SimplePanel titleKey="outcome.authoring.title">
-			<div class="input-group">
-			    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-			    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-			    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-			</div>
-			<div class="voffset10">
-				<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-			</div>
-		</lams:SimplePanel>
-	</c:when>
-	<c:otherwise>
-		<div class="form-group row">
-		    <label for="outcomeSearchInput${outcomeTagId}" class="col-sm-3">
-		    	<fmt:message key="outcome.authoring.title" />
-		    </label>
-		    
-		    <div class="col-sm-9">
-		    	<div class="input-group">
-				    <span class="input-group-addon"><i class="fa fa-search"></i></span>
-				    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-				    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
-				</div>
-				<div class="voffset10">
-					<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
-				</div>
-			</div>
+<div id="outcomeAuthor${outcomeTagId}">
+	<lams:Input id="outcomeSearchInput${outcomeTagId}" labelCellSize="3" labelKey="outcome.authoring.title" inputCellClass="justify-content-start flex-wrap">
+		<div class="input-group">
+			<div class="input-group-prepend">
+		    	<span class="input-group-text"><i class="fa fa-search"></i></span>
+		    </div>
+		    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="form-control" 
+		    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
 		</div>
-	</c:otherwise>
-</c:choose>
+		<div class="outcomeMappings">
+			<div class="mt-2 mr-2"><fmt:message key="outcome.authoring.existing" />: </div><div id="outcomeMappings${outcomeTagId}"></div>
+		</div>
+	</lams:Input>
+</div>
\ No newline at end of file
Fisheye: Tag 1260e45458aeab2dd1bc862fb07096f514444aad refers to a dead (removed) revision in file `lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor5.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r0bc73958f17fe53a99f0e38e96a7eda971b9ad8c -r1260e45458aeab2dd1bc862fb07096f514444aad
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 0bc73958f17fe53a99f0e38e96a7eda971b9ad8c)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 1260e45458aeab2dd1bc862fb07096f514444aad)
@@ -429,12 +429,4 @@
 	    <name>Input</name>
 		<path>/WEB-INF/tags/Input.tag</path>
    	</tag-file> 
-   	<tag-file>
-       <name>OutcomeAuthor5</name>
-       <path>/WEB-INF/tags/OutcomeAuthor5.tag</path>
-   	</tag-file> 
-   	<tag-file>
-       <name>AuthoringButton5</name>
-       <path>/WEB-INF/tags/AuthoringButton5.tag</path>
-   	</tag-file>  
 </taglib>
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -r57504156db251a3ca6eb0949f66c08304b11eb87 -r1260e45458aeab2dd1bc862fb07096f514444aad
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 57504156db251a3ca6eb0949f66c08304b11eb87)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 1260e45458aeab2dd1bc862fb07096f514444aad)
@@ -1,321 +1,173 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO"%>
-<c:set var="sessionMapID" value="${assessmentForm.sessionMapID}" />
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<script lang="javascript">
-	$(document).ready(function(){
-		$("#attemptsAllowedRadio").change(function() {
-			$("#passingMark").val("0");
-			$("#passingMark").prop("disabled", true);
-			$("#attemptsAllowed").prop("disabled", false);
-		});
+<div class="row">
+	<div class="col-12 col-xl-6 pr-4">
+		<lams:Dropdown name="assessment.questionsPerPage"
+			useSpringForm="true"
+			labelKey="label.authoring.advance.questions.per.page"
+			tooltipKey="label.authoring.advance.questions.per.page.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.questions.per.page.tooltip.description">
+				<option value="0"><fmt:message key="label.authoring.advance.all.in.one.page" /></option>
+				<option value="10">10</option>
+				<option value="9">9</option>
+				<option value="8">8</option>
+				<option value="7">7</option>
+				<option value="6">6</option>
+				<option value="5">5</option>
+				<option value="4">4</option>
+				<option value="3">3</option>
+				<option value="2">2</option>
+				<option value="1">1</option>
+		</lams:Dropdown>
+	
+		<lams:Switch name="assessment.shuffled" id="shuffled"
+			useSpringForm="true"
+			labelKey="label.authoring.advance.shuffle.questions"
+			tooltipKey="label.authoring.advance.shuffle.questions.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.shuffle.questions.tooltip.description" />
+	
+		<lams:Switch name="assessment.numbered" id="questions-numbering"
+			useSpringForm="true"
+			labelKey="label.authoring.advance.numbered.questions"
+			tooltipKey="label.authoring.advance.numbered.questions.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.numbered.questions.tooltip.description" />
+	
+		<lams:Input
+			id="relativeTimeLimit"
+			labelKey="label.authoring.advance.time.limit"
+			tooltipKey="label.authoring.advance.time.limit.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.time.limit.tooltip.description">
+				<form:input path="assessment.relativeTimeLimit" id="relativeTimeLimit" type="number" min="0" max="999" size="3" cssClass="form-control form-control-select"/>
+		</lams:Input>
 		
-		$("#passingMarkRadio").change(function() {
-			$("#attemptsAllowed").val("0");
-			$("#attemptsAllowed").prop("disabled", true);
-			$("#passingMark").prop("disabled", false);
-		});
 		
-		$("#display-summary").change(function(){
-			$('#display-summary-area').toggle('slow');
-			$('#allowQuestionFeedback').prop("checked", false);
-			$('#allowDiscloseAnswers').prop("checked", false);
-			$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').prop("checked", false).prop('disabled', false);
-			$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').parent().removeClass('text-muted');
-			$('#allowHistoryResponsesAfterAttempt').prop("checked", false);
-		});
-
-		$('#allowDiscloseAnswers').change(function(){
-			if ($(this).prop('checked')) {
-				$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').prop('checked', false).prop('disabled', true);
-			} else {
-				$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').prop('disabled', false);
-			}
-			$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').parent().toggleClass('text-muted');
-		});
+		<div class="col-sm-12 form-group row">
+			<label class="col-form-label"><fmt:message key="label.authoring.advance.choose.restriction" /></label>
+		</div>
 		
-		$("#useSelectLeaderToolOuput").change(function() {
-			if ($(this).prop('checked')) {
-				$("#display-summary").prop("checked", true).prop("disabled", true);
-				$('#display-summary-area').show('slow');
-				$('#questionEtherpadEnabled').closest('.checkbox').show('slow');
-				$('#allowDiscloseAnswers').prop('disabled', false);
-			} else {
-				$("#display-summary").prop("disabled", false);
-				$('#questionEtherpadEnabled').prop("checked", false).closest('.checkbox').hide('slow');
-				$('#allowDiscloseAnswers').prop("checked", false).prop('disabled', true).change();
-			}		
-		});
-
-		$("#enable-confidence-levels").change(function(){
-			$('#confidence-levels-type-area').toggle('slow');
-		});
+		<div class="form-group row">
+			<label class="col-sm-8 col-form-label" for="attemptsAllowedRadio">
+				<input type="radio" name="isAttemptsChosen" id="attemptsAllowedRadio" value="true"
+					<c:if test="${assessmentForm.assessment.passingMark == 0}">checked="checked"</c:if>
+				/>
+				&nbsp;
+				<fmt:message key="label.authoring.advance.attempts.allowed" />
+			</label>
+			
+		    <div class="col-sm-4 justify-content-end d-flex">
+		    	<form:select path="assessment.attemptsAllowed" id="attemptsAllowed" cssClass="form-control form-control-select">
+						<form:option value="0"><fmt:message key="label.authoring.advance.unlimited" /></form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="1">1</form:option>
+				</form:select>
+		    </div>
+		</div>
 		
-		<c:if test="${assessmentForm.assessment.passingMark == 0}">$("#passingMark").prop("disabled", true);</c:if>
-		<c:if test="${assessmentForm.assessment.passingMark > 0}">$("#attemptsAllowed").prop("disabled", true);</c:if>
-		<c:if test="${assessmentForm.assessment.useSelectLeaderToolOuput}">$("#display-summary").prop("disabled", true);</c:if>
-		<c:if test="${assessmentForm.assessment.allowDiscloseAnswers}">
-			$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').prop('disabled', true);
-			$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').parent().addClass('text-muted');
-		</c:if>
-		<c:if test="${!assessmentForm.assessment.enableConfidenceLevels}">
-			$('#confidence-levels-type-area').css('display', 'none');
-		</c:if>
-	});
-</script>
-
-<!-- Advance Tab Content -->
-
-<lams:SimplePanel titleKey="label.select.leader">
-<div class="checkbox">
-	<label for="useSelectLeaderToolOuput">
-		<form:checkbox path="assessment.useSelectLeaderToolOuput" value="1" id="useSelectLeaderToolOuput"/>
-		<fmt:message key="label.use.select.leader.tool.output" />
-	</label>
-</div>
-
-<c:if test="${sessionMap.isQuestionEtherpadEnabled}">
-	<div class="checkbox loffset20"
-		<c:if test="${!assessmentForm.assessment.useSelectLeaderToolOuput}">style="display:none;"</c:if>>
-		<label for="questionEtherpadEnabled">
-			<form:checkbox path="assessment.questionEtherpadEnabled" id="questionEtherpadEnabled"/>
-			<fmt:message key="label.authoring.advance.question.etherpad" />
-		</label>
-	</div>
-</c:if>
-
-</lams:SimplePanel>
-
-<lams:SimplePanel titleKey="label.question.options">
-
-<lams:SimplePanel panelBodyClass="panel-body-sm">
-
-<div class="form-inline">
-	<label for="assessment.questionsPerPage">
-		<fmt:message key="label.authoring.advance.questions.per.page" />&nbsp;
-		<form:select path="assessment.questionsPerPage" cssClass="form-control input-sm">
-			<form:option value="0"><fmt:message key="label.authoring.advance.all.in.one.page" /></form:option>
-			<form:option value="10">10</form:option>
-			<form:option value="9">9</form:option>
-			<form:option value="8">8</form:option>
-			<form:option value="7">7</form:option>
-			<form:option value="6">6</form:option>
-			<form:option value="5">5</form:option>
-			<form:option value="4">4</form:option>
-			<form:option value="3">3</form:option>
-			<form:option value="2">2</form:option>
-			<form:option value="1">1</form:option>
-		</form:select>
-	</label>
-</div>
-
-<div class="checkbox">
-	<label for="shuffled">
-		<form:checkbox path="assessment.shuffled" id="shuffled"/>
-		<fmt:message key="label.authoring.advance.shuffle.questions" />
-	</label>
-</div>
-
-<div class="checkbox">
-	<label for="questions-numbering">
-		<form:checkbox path="assessment.numbered" id="questions-numbering"/>
-		<fmt:message key="label.authoring.advance.numbered.questions" />
-	</label>
-</div>
-
-</lams:SimplePanel>
-
-<lams:SimplePanel panelBodyClass="panel-body-sm">
-
-<div class="form-inline">
-	<label for="relativeTimeLimit">
-		<fmt:message key="label.authoring.advance.time.limit" />&nbsp;
-		<form:input path="assessment.relativeTimeLimit" type="number" min="0" max="999" size="3" id="relativeTimeLimit" cssClass="form-control input-sm"/>
-	</label>
-</div>
-
-<fmt:message key="label.authoring.advance.choose.restriction" />
-	
-<div class="loffset20">
-	<div class="radio form-inline">
-		<label for="attemptsAllowedRadio">
-			<input type="radio" name="isAttemptsChosen" value="${true}" id="attemptsAllowedRadio"
-					<c:if test="${assessmentForm.assessment.passingMark == 0}">checked="checked"</c:if> />
-					
-			<fmt:message key="label.authoring.advance.attempts.allowed" />&nbsp;
+		<div class="form-group row">
+			<label class="col-sm-8 col-form-label" for="passingMarkRadio">
+				<input type="radio" name="isAttemptsChosen" id="passingMarkRadio" value="false"
+					<c:if test="${assessmentForm.assessment.passingMark > 0}">checked="checked"</c:if>
+				/>
+				&nbsp;
+				<fmt:message key="label.authoring.advance.passing.mark" />
+			</label>
 			
-			<form:select path="assessment.attemptsAllowed" id="attemptsAllowed" cssClass="form-control input-sm">
-				<form:option value="0"><fmt:message key="label.authoring.advance.unlimited" /></form:option>
-				<form:option value="6">6</form:option>
-				<form:option value="5">5</form:option>
-				<form:option value="4">4</form:option>
-				<form:option value="3">3</form:option>
-				<form:option value="2">2</form:option>
-				<form:option value="1">1</form:option>
-			</form:select>
-		</label>
-	</div>
-
-	<div class="radio form-inline">
-		<label for="passingMarkRadio">
-			<input type="radio" name="isAttemptsChosen" value="${false}" id="passingMarkRadio"	
-					<c:if test="${assessmentForm.assessment.passingMark > 0}">checked="checked"</c:if> />
-					
-			<fmt:message key="label.authoring.advance.passing.mark" />&nbsp;
+		    <div class="col-sm-4 justify-content-end d-flex">
+		    	<form:select path="assessment.passingMark" id="passingMark" cssClass="form-control form-control-select" />
+		    </div>
+		</div>
+		
+		<lams:Switch name="assessment.enableConfidenceLevels" id="enable-confidence-levels"
+			useSpringForm="true"
+			labelKey="label.enable.confidence.levels"
+			tooltipKey="label.enable.confidence.levels.tooltip"
+			tooltipDescriptionKey="label.enable.confidence.levels.tooltip.description" />
 			
-			<form:select path="assessment.passingMark" id="passingMark" cssClass="form-control input-sm"/>
-		</label>
+		<lams:Dropdown name="assessment.confidenceLevelsType"
+			useSpringForm="true"
+			labelKey="label.scale">
+				<option value="${ConfidenceLevelDTO.CONFIDENCE_LEVELS_TYPE_0_TO_100}">
+					<fmt:message key="label.0.to.100" />
+				</option>
+				<option value="${ConfidenceLevelDTO.CONFIDENCE_LEVELS_TYPE_CONFIDENT}">
+					<fmt:message key="label.not.confident" />, <fmt:message key="label.confident" />, <fmt:message key="label.very.confident" />
+				</option>
+				<option value="${ConfidenceLevelDTO.CONFIDENCE_LEVELS_TYPE_SURE}">
+					<fmt:message key="label.not.sure" />, <fmt:message key="label.sure" />, <fmt:message key="label.very.sure" />
+				</option>
+		</lams:Dropdown>
+		
+		<lams:Switch name="assessment.notifyTeachersOnAttemptCompletion" id="notifyTeachersOnAttemptCompletion"
+			useSpringForm="true"
+			labelKey="label.authoring.advanced.notify.on.attempt.completion"
+			tooltipKey="label.authoring.advanced.notify.on.attempt.completion.tooltip"
+			tooltipDescriptionKey="label.authoring.advanced.notify.on.attempt.completion.tooltip.description" />
 	</div>
 	
-</div>
-
-</lams:SimplePanel>
-
-<lams:SimplePanel panelBodyClass="panel-body-sm">
-
-<div class="checkbox">
-	<label for="display-summary">
-		<form:checkbox path="assessment.displaySummary" id="display-summary"/>
-		<fmt:message key="label.authoring.advance.display.summary" />
-	</label>
-</div>
-
-<div id="display-summary-area" class="loffset20" 
-		<c:if test="${!assessmentForm.assessment.displaySummary}">style="display:none;"</c:if>>
-
-	<div class="checkbox">
-		<label for="allowQuestionFeedback">
-			<form:checkbox path="assessment.allowQuestionFeedback" id="allowQuestionFeedback"/>
-			<fmt:message key="label.authoring.advance.allow.students.question.feedback" />
-		</label>
-	</div>
 	
-	<div class="checkbox">
-		<label for="allowDiscloseAnswers">
-			<form:checkbox path="assessment.allowDiscloseAnswers" id="allowDiscloseAnswers"/>
-			<fmt:message key="label.authoring.advance.disclose.answers" />
-		</label>
-	</div>
-
-	<div class="checkbox">
-		<label for="allowRightAnswersAfterQuestion">
-			<form:checkbox path="assessment.allowRightAnswersAfterQuestion" id="allowRightAnswersAfterQuestion"/>
-			<fmt:message key="label.authoring.advance.allow.students.right.answers" />
-		</label>
-	</div>
-
-	<div class="checkbox">
-		<label for="allowWrongAnswersAfterQuestion">
-			<form:checkbox path="assessment.allowWrongAnswersAfterQuestion" id="allowWrongAnswersAfterQuestion"/>
-			<fmt:message key="label.authoring.advance.allow.students.wrong.answers" />
-		</label>
-	</div>
-
-	<div class="checkbox">
-		<label for="allowHistoryResponsesAfterAttempt">
-			<form:checkbox path="assessment.allowHistoryResponses" id="allowHistoryResponsesAfterAttempt"/>
-			<fmt:message key="label.authoring.advance.allow.students.history.responses" />
-		</label>
-	</div>
-</div>
-
-<div class="checkbox">
-	<label for="allowOverallFeedbackAfterQuestion">
-		<form:checkbox path="assessment.allowOverallFeedbackAfterQuestion" id="allowOverallFeedbackAfterQuestion"/>
-		<fmt:message key="label.authoring.advance.allow.students.overall.feedback" />
-	</label>
-</div>
-
-<div class="checkbox">
-	<label for="allowGradesAfterAttempt">
-		<form:checkbox path="assessment.allowGradesAfterAttempt" id="allowGradesAfterAttempt"/>
-		<fmt:message key="label.authoring.advance.allow.students.grades" />
-	</label>
-</div>
-
-<div class="checkbox">
-	<label for="allowAnswerJustification">
-		<form:checkbox path="assessment.allowAnswerJustification" id="allowAnswerJustification"/>
-		<fmt:message key="label.authoring.advance.answer.justification" />
-	</label>
-</div>
-
-<div class="checkbox">
-	<label for="enable-confidence-levels">
-		<form:checkbox path="assessment.enableConfidenceLevels" id="enable-confidence-levels"/>
-		<fmt:message key="label.enable.confidence.levels" />
-	</label>
-	<br>
-	
-	<label for="assessment.confidenceLevelsType" id="confidence-levels-type-area" class="radio form-inline">
-		<fmt:message key="label.scale" />&nbsp;
+	<div class="col-12 col-xl-6 pr-4">
+		<lams:Switch name="assessment.displaySummary" id="display-summary"
+			useSpringForm="true"
+			labelKey="label.authoring.advance.display.summary"
+			tooltipKey="label.authoring.advance.display.summary.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.display.summary.tooltip.description" />
 		
-		<form:select path="assessment.confidenceLevelsType" cssClass="form-control input-sm">
-			<form:option value="<%= ConfidenceLevelDTO.CONFIDENCE_LEVELS_TYPE_0_TO_100 %>">
-				<fmt:message key="label.0.to.100" />
-			</form:option>
-			<form:option value="<%= ConfidenceLevelDTO.CONFIDENCE_LEVELS_TYPE_CONFIDENT %>">
-				<fmt:message key="label.not.confident" />, <fmt:message key="label.confident" />, <fmt:message key="label.very.confident" />
-			</form:option>
-			<form:option value="<%= ConfidenceLevelDTO.CONFIDENCE_LEVELS_TYPE_SURE %>">
-				<fmt:message key="label.not.sure" />, <fmt:message key="label.sure" />, <fmt:message key="label.very.sure" />
-			</form:option>
-		</form:select>
-	</label>
-</div>
-</lams:SimplePanel>
-
-</lams:SimplePanel>
-
-<lams:SimplePanel titleKey="label.notifications">
-<div class="checkbox">
-	<label for="notifyTeachersOnAttemptCompletion">
-		<form:checkbox path="assessment.notifyTeachersOnAttemptCompletion" id="notifyTeachersOnAttemptCompletion"/>
-		<fmt:message key="label.authoring.advanced.notify.on.attempt.completion" />
-	</label>
-</div>
-</lams:SimplePanel>
-
-<!-- Overall feedback -->
-<lams:SimplePanel titleKey="label.authoring.advance.overall.feedback">
-
-<input type="hidden" name="overallFeedbackList" id="overallFeedbackList" />
-<iframe id="advancedInputArea" name="advancedInputArea" style="width:650px;height:100%;border:0px;display:block;" 
-		frameborder="no" scrolling="no" src="<c:url value='/authoring/initOverallFeedback.do'/>?sessionMapID=${assessmentForm.sessionMapID}">
-</iframe>
-</lams:SimplePanel>
-
-<lams:OutcomeAuthor toolContentId="${assessmentForm.assessment.contentId}" />
-
-<lams:SimplePanel titleKey="label.activity.completion">
-
-<div class="checkbox">
-	<label for="reflectOnActivity">
-		<form:checkbox path="assessment.reflectOnActivity" id="reflectOnActivity"/>
-		<fmt:message key="advanced.reflectOnActivity" />
-	</label>
-</div>
-
-<div class="form-group">
-	<form:textarea path="assessment.reflectInstructions" rows="3" id="reflectInstructions" cssClass="form-control"/>
-</div>
-</lams:SimplePanel>
-
-<script type="text/javascript">
-	//automatically turn on refect option if there are text input in refect instruction area
-	var ra = document.getElementById("reflectInstructions");
-	var rao = document.getElementById("reflectOnActivity");
-	function turnOnRefect(){
-		if(isEmpty(ra.value)){
-			//turn off	
-			rao.checked = false;
-		}else{
-			//turn on
-			rao.checked = true;		
-		}
-	}
-	
-	ra.onkeyup=turnOnRefect;
-</script>
-
+		<div id="display-summary-area" class="loffset20" 
+			<c:if test="${!assessmentForm.assessment.displaySummary}">style="display:none;"</c:if>
+		>
+		
+			<lams:Switch name="assessment.allowQuestionFeedback" id="allowQuestionFeedback"
+				useSpringForm="true"
+				labelKey="label.authoring.advance.allow.students.question.feedback"
+				tooltipKey="label.authoring.advance.allow.students.question.feedback.tooltip"
+				tooltipDescriptionKey="label.authoring.advance.allow.students.question.feedback.tooltip.description" />
+			
+			<lams:Switch name="assessment.allowDiscloseAnswers" id="allowDiscloseAnswers"
+				useSpringForm="true"
+				labelKey="label.authoring.advance.disclose.answers"
+				tooltipKey="label.authoring.advance.disclose.answers.tooltip"
+				tooltipDescriptionKey="label.authoring.advance.disclose.answers.tooltip.description" />
+			
+			<lams:Switch name="assessment.allowRightAnswersAfterQuestion" id="allowRightAnswersAfterQuestion"
+				useSpringForm="true"
+				labelKey="label.authoring.advance.allow.students.right.answers"
+				tooltipKey="label.authoring.advance.allow.students.right.answers.tooltip"
+				tooltipDescriptionKey="label.authoring.advance.allow.students.right.answers.tooltip.description" />
+				
+			<lams:Switch name="assessment.allowWrongAnswersAfterQuestion" id="allowWrongAnswersAfterQuestion"
+				useSpringForm="true"
+				labelKey="label.authoring.advance.allow.students.wrong.answers"
+				tooltipKey="label.authoring.advance.allow.students.wrong.answers.tooltip"
+				tooltipDescriptionKey="label.authoring.advance.allow.students.wrong.answers.tooltip.description" />
+				
+			<lams:Switch name="assessment.allowWrongAnswersAfterQuestion" id="allowHistoryResponsesAfterAttempt"
+				useSpringForm="true"
+				labelKey="label.authoring.advance.allow.students.history.responses"
+				tooltipKey="label.authoring.advance.allow.students.history.responses.tooltip"
+				tooltipDescriptionKey="label.authoring.advance.allow.students.history.responses.tooltip.description" />
+		</div>
+		
+		<lams:Switch name="assessment.allowOverallFeedbackAfterQuestion" id="allowOverallFeedbackAfterQuestion"
+				useSpringForm="true"
+				labelKey="label.authoring.advance.allow.students.overall.feedback"
+				tooltipKey="label.authoring.advance.allow.students.overall.feedback.tooltip"
+				tooltipDescriptionKey="label.authoring.advance.allow.students.overall.feedback.tooltip.description" />
+				
+		<lams:Switch name="assessment.allowGradesAfterAttempt" id="allowGradesAfterAttempt"
+			useSpringForm="true"
+			labelKey="label.authoring.advance.allow.students.grades"
+			tooltipKey="label.authoring.advance.allow.students.grades.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.allow.students.grades.tooltip.description" />
+			
+		<lams:Switch name="assessment.allowAnswerJustification" id="allowAnswerJustification"
+			useSpringForm="true"
+			labelKey="label.authoring.advance.answer.justification"
+			tooltipKey="label.authoring.advance.answer.justification.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.answer.justification.tooltip.description" />
+	</div>
+</div>
\ No newline at end of file
Fisheye: Tag 1260e45458aeab2dd1bc862fb07096f514444aad refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/authoring/advance5.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r57504156db251a3ca6eb0949f66c08304b11eb87 -r1260e45458aeab2dd1bc862fb07096f514444aad
--- lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 57504156db251a3ca6eb0949f66c08304b11eb87)
+++ lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1260e45458aeab2dd1bc862fb07096f514444aad)
@@ -1,99 +1,176 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.assessment.AssessmentConstants"%>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-<c:set var="mode" value="${sessionMap.mode}" />
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" scope="request" />
+<c:set var="mode" value="${sessionMap.mode}" scope="request" />
+<c:set var="isAuthoringRestricted" value="${sessionMap.isAuthoringRestricted}" scope="request" />
+<c:set var="lamsUrl" scope="request"><lams:LAMSURL/></c:set>
 
 <lams:html>
-<lams:head>
+<head>
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	
 	<title><fmt:message key="label.author.title" /></title>
-	<%@ include file="/common/tabbedheader.jsp"%>
-	<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
-	 
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>
-	<script>
-        function init() {
-            var tag = document.getElementById("currentTab");
-		    if (tag.value != ""){
-		    	selectTab(tag.value);
-		    } else {
-	        	selectTab(1); //select the default tab;
-		    }
-        }     
-        
-        function doSelectTab(tabId) {
-	        // start optional tab controller stuff
-	        var tag = document.getElementById("currentTab");
-		    tag.value = tabId;
-		    // end optional tab controller stuff
-		    selectTab(tabId);
-        }
+	
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap4.min.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome/css/font-awesome.min.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery.tablesorter.theme.bootstrap.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery.tablesorter.custom.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/components-responsive.css">
+	<link rel="stylesheet" href="<lams:WebAppURL/>includes/css/assessment.css">
 
-        function validateForm() {
-            //check with a teacher whether he forgot to add questions to the question bank
-            var referenceCount = $("#referencesTable tr").length - 1;
+	<script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>	
+	<script src="<lams:LAMSURL/>includes/javascript/bootstrap4.bundle.min.js"></script>
+	<script src="<lams:LAMSURL/>includes/javascript/jquery.tablesorter.js"></script>
+	<script src="<lams:LAMSURL/>includes/javascript/jquery.tablesorter.pager.js"></script>
+	<script src="<lams:LAMSURL/>includes/javascript/common.js"></script> 
+	
+	<script>
+		// jQuery UI overrides Bootstrap's tooltip, so store it under another name
+		$.fn.bootstrapTooltip = $.fn.tooltip.noConflict();
+			
+	    function validateForm() {
+	        //check with a teacher whether he forgot to add questions to the question bank
+	        var referenceCount = $("#referencesTable tr").length - 1;
 			if ((referenceCount == 0) && !confirm("<fmt:message key="label.no.questions.in.question.bank"/>")) {
 				return false;
 			}
-
+	
 			var timeLimit = $('#relativeTimeLimit').val();
 			if (!timeLimit) {
 				$('#relativeTimeLimit').val(0);
 			}
-
+	
 			//serialize overallFeedbackForm
 	        $("#overallFeedbackList").val($('#advancedInputArea').contents().find('#overallFeedbackForm').serialize(true));
 	        	
 	        //enable checkbox to allow its value been submitted
 	        $("#display-summary").removeAttr("disabled", "disabled");
-
-        	return true;
-        }
-    </script>
-</lams:head>
-<body class="stripes" onLoad="init()">
-	<form:form action="updateContent.do" method="post" modelAttribute="assessmentForm" id="authoringForm" 
-			onsubmit="return validateForm();">
-		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 	
-		<c:set var="title"><fmt:message key="label.author.title" /></c:set>
-		<lams:Page title="${title}" type="navbar">
-		
-			<form:hidden path="assessment.contentId" />
-			<input type="hidden" name="mode" value="${mode}">
-			<form:hidden path="sessionMapID" />
-			<form:hidden path="contentFolderID" />
-			<form:hidden path="currentTab" id="currentTab" />
+	    	return true;
+	    }
+	    
+		$(document).ready(function(){
+			$('[data-toggle="tooltip"]').bootstrapTooltip();
+			  
+			$("#attemptsAllowedRadio").change(function() {
+				$("#passingMark").val("0");
+				$("#passingMark").prop("disabled", true);
+				$("#attemptsAllowed").prop("disabled", false);
+			});
+			
+			$("#passingMarkRadio").change(function() {
+				$("#attemptsAllowed").val("0");
+				$("#attemptsAllowed").prop("disabled", true);
+				$("#passingMark").prop("disabled", false);
+			});
+			
+			$("#display-summary").change(function(){
+				$('#display-summary-area').toggle('slow');
+				$('#allowQuestionFeedback').prop("checked", false);
+				$('#allowDiscloseAnswers').prop("checked", false);
+				$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').prop("checked", false).prop('disabled', false);
+				$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').parent().removeClass('text-muted');
+				$('#allowHistoryResponsesAfterAttempt').prop("checked", false);
+			});
 	
-			<lams:Tabs control="true" title="${title}" helpToolSignature="<%= AssessmentConstants.TOOL_SIGNATURE %>" helpModule="authoring">
-				<lams:Tab id="1" key="label.authoring.heading.basic" />
-				<lams:Tab id="2" key="label.authoring.heading.advance" />
-			</lams:Tabs>	
-		
-		 	<lams:TabBodyArea>
-		 		<lams:errors/>
-		 		
-				<!--  Set up tabs  -->
-		 		<lams:TabBodys>
-   					<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
- 					<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
-  				</lams:TabBodys>
-		
-				<!-- Button Row -->
-				<div id="saveCancelButtons">
-					<lams:AuthoringButton formID="authoringForm"
-						clearSessionActionUrl="/clearsession.do" toolSignature="<%=AssessmentConstants.TOOL_SIGNATURE%>"
-						toolContentID="${assessmentForm.assessment.contentId}"
-						accessMode="${mode}" defineLater="${mode=='teacher'}"
-						contentFolderID="${assessmentForm.contentFolderID}" />
-				</div>
-			</lams:TabBodyArea>
+			$('#allowDiscloseAnswers').change(function(){
+				if ($(this).prop('checked')) {
+					$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').prop('checked', false).prop('disabled', true);
+				} else {
+					$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').prop('disabled', false);
+				}
+				$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').parent().toggleClass('text-muted');
+			});
+			
+			$("#useSelectLeaderToolOuput").change(function() {
+				if ($(this).prop('checked')) {
+					$("#display-summary").prop("checked", true).prop("disabled", true);
+					$('#display-summary-area').show('slow');
+					$('#questionEtherpadEnabled').closest('.checkbox').show('slow');
+					$('#allowDiscloseAnswers').prop('disabled', false);
+				} else {
+					$("#display-summary").prop("disabled", false);
+					$('#questionEtherpadEnabled').prop("checked", false).closest('.checkbox').hide('slow');
+					$('#allowDiscloseAnswers').prop("checked", false).prop('disabled', true).change();
+				}		
+			}).change();
 	
-			<div id="footer"></div>
+			$("#enable-confidence-levels").change(function(){
+				$('#confidence-levels-type-area').toggle('slow');
+			});
+			
+			<c:if test="${assessmentForm.assessment.passingMark == 0}">$("#passingMark").prop("disabled", true);</c:if>
+			<c:if test="${assessmentForm.assessment.passingMark > 0}">$("#attemptsAllowed").prop("disabled", true);</c:if>
+			<c:if test="${assessmentForm.assessment.useSelectLeaderToolOuput}">$("#display-summary").prop("disabled", true);</c:if>
+			<c:if test="${assessmentForm.assessment.allowDiscloseAnswers}">
+				$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').prop('disabled', true);
+				$('#allowRightAnswersAfterQuestion, #allowWrongAnswersAfterQuestion').parent().addClass('text-muted');
+			</c:if>
+			<c:if test="${!assessmentForm.assessment.enableConfidenceLevels}">
+				$('#confidence-levels-type-area').css('display', 'none');
+			</c:if>
+			
+
+			$('#reflectInstructions').keyup(function(){
+				$('#reflectOnActivity').prop('checked', !isEmpty($(this).val().trim()));
+			});
+		});
+	</script>
+</head>
+
+<body class="component">
+<lams:PageComponent titleKey="label.author.title">
+	<c:if test="${isAuthoringRestricted}">
+		<lams:Alert id="edit-in-monitor-while-assessment-already-attempted" type="error" close="true">
+			<fmt:message key="label.edit.in.monitor.warning"/>
+		</lams:Alert>
+	</c:if>
 	
-		<!-- end page div -->
-		</lams:Page>
-	
+	<form:form action="updateContent.do" method="post" modelAttribute="assessmentForm" id="authoringForm" onsubmit="return validateForm()">
+		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
+		<input type="hidden" name="mode" value="${mode}">
+		
+		<form:hidden path="assessment.contentId" />
+		<form:hidden path="sessionMapID" />
+		<form:hidden path="contentFolderID" />
+
+        <div id="content">
+			<lams:Panel id="basic" collapsible="false" iconClass="fa-file-o" colorClass="green">
+				<jsp:include page="basic.jsp"/>
+			</lams:Panel>
+				
+           <lams:Panel id="questions" titleKey="label.authoring.basic.question.list.title" iconClass="fa-question-circle-o" colorClass="yellow" expanded="true">
+				<jsp:include page="questions.jsp"/>
+			</lams:Panel>
+			
+			<lams:Panel id="advanced" titleKey="label.authoring.heading.advance" iconClass="fa-gear" colorClass="purple" expanded="false">
+				<jsp:include page="advance.jsp"/>
+			</lams:Panel>
+			
+			<lams:Panel id="leader-selection" titleKey="label.select.leader" iconClass="fa-star-o" colorClass="yellow" expanded="false">
+				<jsp:include page="leader.jsp"/>
+			</lams:Panel>
+			
+			<lams:Panel id="feedback" titleKey="label.authoring.basic.general.feedback" iconClass="fa-comment-o" colorClass="blue" expanded="false">
+				<jsp:include page="feedback.jsp"/>
+			</lams:Panel>
+							
+			<lams:Panel id="reflection" titleKey="label.activity.completion"  icon="${lamsUrl}images/components/assess-icon7.svg"
+						colorClass="green2" expanded="false">
+				<jsp:include page="reflection.jsp"/>
+			</lams:Panel>
+			
+			<!-- Button Row -->
+			<lams:AuthoringButton formID="authoringForm"
+				clearSessionActionUrl="/clearsession.do" toolSignature="<%=AssessmentConstants.TOOL_SIGNATURE%>"
+				toolContentID="${assessmentForm.assessment.contentId}"
+				accessMode="${mode}" defineLater="${mode=='teacher'}"
+				contentFolderID="${assessmentForm.contentFolderID}" />
+		</div>
 	</form:form>
+</lams:PageComponent>
 </body>
-</lams:html>
+</lams:html>
\ No newline at end of file
Fisheye: Tag 1260e45458aeab2dd1bc862fb07096f514444aad refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/authoring/authoring5.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -radd24141d43ff78942c251760e1614925db89464 -r1260e45458aeab2dd1bc862fb07096f514444aad
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision add24141d43ff78942c251760e1614925db89464)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 1260e45458aeab2dd1bc862fb07096f514444aad)
@@ -1,189 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="sessionMapID" value="${assessmentForm.sessionMapID}" />
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-<c:set var="isAuthoringRestricted" value="${sessionMap.isAuthoringRestricted}" />
-<style>
-	#question-bank-div {
-		margin-top: 75px;
-	}
-    
-	#question-bank-heading a {
-		color:#333
-	}
-	
-	#referencesTable thead {
-		background-color: #f5f5f5;
-	}
-	#referencesTable th {
-		font-weight: 500;
-		font-style: normal;
-	}
-	
-	#add-question-div {
-		margin-top: -5px;
-	}
-</style>
 
-<script lang="javascript">
-	$(document).ready(function(){
-		reinitializePassingMarkSelect(true);
-		
-		//load question bank div
-		$('#question-bank-collapse').on('show.bs.collapse', function () {
-			$('#question-bank-collapse.contains-nothing').load(
-				"<lams:LAMSURL/>/searchQB/start.do",
-				{
-					returnUrl: "<c:url value='/authoring/importQbQuestion.do'/>?sessionMapID=${sessionMapID}",
-					toolContentId: ${sessionMap.toolContentID}
-				},
-				function() {
-					$(this).removeClass("contains-nothing");
-				}
-			);
-		})
-
-    	//handler for "delete" buttons
-    	$(document).on("click", '.delete-reference-link', function() {
-    		var	deletionConfirmed = confirm("<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>");
-
-    		if (deletionConfirmed) {
-    			var sequenceId = $('.reference-sequence-id', $(this).parents('tr')).val();
-
-    			$(questionListTargetDiv).load(
-    				"<c:url value="/authoring/removeQuestionReference.do"/>",
-    				{
-    					referenceSequenceId: sequenceId, 
-    					sessionMapID: "${sessionMapID}"
-    				},
-    				function(){
-    					reinitializePassingMarkSelect(false);
-    					refreshThickbox();
-    				}
-    			);
-    		};
-        });
-
-    	//handler for "maxMark" inputs
-    	$(document).on("change", '.max-mark-input', function() {
-    		var sequenceId = $('.reference-sequence-id', $(this).parents('tr')).val();
-    		
-			$.ajax({ 
-			    url: '<c:url value="/authoring/changeMaxMark.do"/>',
-				type: 'POST',
-				data: {
-					sessionMapID: "${sessionMapID}",
-					referenceSequenceId: sequenceId,
-					maxMark: this.value
-				}
-			});
-        });
-	});
-
-	//The panel of assessment list panel
-	var questionListTargetDiv = "#itemArea";
-	function initNewReferenceHref() {
-		var questionTypeDropdown = document.getElementById("questionType");
-		var questionType = questionTypeDropdown.value;
-		
-		var newQuestionInitHref = "<c:url value='/authoring/initNewReference.do'/>?sessionMapID=${sessionMapID}"
-			+ "&questionType=" + questionType 
-			+ "&KeepThis=true&TB_iframe=true&modal=true";
-		$("#newQuestionInitHref").attr("href", newQuestionInitHref);
-	};
-
-	//handler for "edit" buttons
-	function editReference(link) {
-		var sequenceId = $('.reference-sequence-id', $(link).parents('tr')).val();
-    	
-		var editHref = "<c:url value='/authoring/editReference.do'/>?sessionMapID=${sessionMapID}" 
-		+ "&referenceSequenceId=" + sequenceId 
-		+ "&KeepThis=true&TB_iframe=true&modal=true";
-		$(link).attr("href", editHref);
-    }
-	
-	function toggleQuestionRequired(icon){
-		var sequenceId = $('.reference-sequence-id', $(icon).parents('tr')).val();
-		
-		$.ajax({ 
-		    url: '<c:url value="/authoring/toggleQuestionRequired.do"/>',
-			type: 'POST',
-			dataType : 'text',
-			data: {
-				sessionMapID: "${sessionMapID}",
-				referenceSequenceId: sequenceId
-			},
-			success(isRequired) {
-				if (isRequired == 'true') {
-				 	$(icon).addClass('text-danger');
-				} else if (isRequired == 'false') {
-					$(icon).removeClass('text-danger');
-				}
-			}
-		});
-	}
-	
-	function refreshThickbox(){
-		tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
-	};
-	function reinitializePassingMarkSelect(isPageFresh){
-		var oldValue = (isPageFresh) ? "${assessmentForm.assessment.passingMark}" : $("#passingMark").val();
-		$('#passingMark').empty();
-		$('#passingMark').append( new Option("<fmt:message key='label.authoring.advance.passing.mark.none' />",0) );
-		
-		var sumMaxMark = 0;
-		$("[name^=maxMark]").each(function() {
-			sumMaxMark += eval(this.value);
-		});
-		
-		for (var i = 1; i<=sumMaxMark; i++) {
-			var isSelected = (oldValue == i);
-		    $('#passingMark').append( new Option(i, i, isSelected, isSelected) );
-		}
-	};
-	
-	function importQTI(){
-    	window.open('<lams:LAMSURL/>questions/questionFile.jsp?collectionChoice=true',
-			'QuestionFile','width=500,height=370,scrollbars=yes');
-    }
-	
- 	// this method is called by QTI questionChoice.jsp 
-    function saveQTI(formHTML, formName) {
-    	var form = $($.parseHTML(formHTML));
-    	// first, save questions in the QB
-		$.ajax({
-			url: '<lams:LAMSURL />imsqti/saveQTI.do?<csrf:token/>',
-			data: form.serializeArray(),
-			type: "POST",
-			dataType: 'text',
-			// the response is a comma-delimited list of QB question UIDs, for example 4,5,65 
-			success: function(qbQuestionUids) {
-				$.ajax({
-					type: "POST",
-					url: '<lams:WebAppURL />authoring/importQbQuestions.do',
-					data: {
-						// send QB question uids to MCQ authoring controller
-						'qbQuestionUids' : qbQuestionUids,
-						'sessionMapID'   : '${sessionMapID}'
-					},
-					dataType: 'html',
-					success: function(response) {
-						// question list gets refreshed
-						$(questionListTargetDiv).html(response);
-						refreshThickbox();
-					}
-				});
-			}
-		});
-    }
-</script>
-
-<c:if test="${isAuthoringRestricted}">
-	<lams:Alert id="edit-in-monitor-while-assessment-already-attempted" type="error" close="true">
-		<fmt:message key="label.edit.in.monitor.warning"/>
-	</lams:Alert>
-</c:if>
-
-<!-- Basic Tab Content -->
 <div class="form-group">
     <label for="assessment.title">
     	<fmt:message key="label.authoring.basic.title"/>
@@ -195,63 +11,9 @@
     <label for="assessment.instructions">
     	<fmt:message key="label.authoring.basic.instruction"/>
     </label>
-	<lams:CKEditor id="assessment.instructions" value="${assessmentForm.assessment.instructions}"
-			contentFolderID="${assessmentForm.contentFolderID}">
+	<lams:CKEditor id="assessment.instructions"
+				   value="${assessmentForm.assessment.instructions}"
+				   contentFolderID="${assessmentForm.contentFolderID}"
+				   classes="form-control">
 	</lams:CKEditor>
 </div>
-
-<div id="itemArea">
-	<c:set var="sessionMapID" value="${assessmentForm.sessionMapID}" />
-	<c:choose>
-		<c:when test="${isAuthoringRestricted}">
-			<%@ include file="/pages/authoring/parts/questionlistRestricted.jsp"%>
-		</c:when>
-		<c:otherwise>
-			<%@ include file="/pages/authoring/parts/questionlist.jsp"%>
-		</c:otherwise>
-	</c:choose>
-</div>
-
-<c:if test="${!isAuthoringRestricted}">
-	<!-- Dropdown menu for choosing a question type -->
-	<div id="add-question-div" class="form-inline form-group pull-right">
-		<select id="questionType" class="form-control input-sm">
-			<option selected="selected" value="1"><fmt:message key="label.authoring.basic.type.multiple.choice" /></option>
-			<option value="2"><fmt:message key="label.authoring.basic.type.matching.pairs" /></option>
-			<option value="3"><fmt:message key="label.authoring.basic.type.short.answer" /></option>
-			<option value="4"><fmt:message key="label.authoring.basic.type.numerical" /></option>
-			<option value="5"><fmt:message key="label.authoring.basic.type.true.false" /></option>
-			<option value="6"><fmt:message key="label.authoring.basic.type.essay" /></option>
-			<option value="7"><fmt:message key="label.authoring.basic.type.ordering" /></option>
-			<option value="8"><fmt:message key="label.authoring.basic.type.mark.hedging" /></option>
-			<option value="-1">
-				<fmt:message key="label.authoring.basic.type.random.question" />
-			</option>
-		</select>
-		
-		<a onclick="initNewReferenceHref();return false;" href="#nogo" class="btn btn-default btn-sm thickbox" id="newQuestionInitHref">  
-			<i class="fa fa-lg fa-plus-circle" aria-hidden="true" title="<fmt:message key="label.authoring.basic.add.question.to.pool" />"></i>
-		</a>
-		
-		<a href="#nogo" onClick="javascript:importQTI()" class="btn btn-default btn-sm loffset20">
-			<fmt:message key="label.authoring.basic.import.qti" /> 
-		</a>
-	</div>
-
-	<!-- Question Bank -->
-	<div class="panel-group" id="question-bank-div" role="tablist" aria-multiselectable="true"> 
-	    <div class="panel panel-default" >
-	        <div class="panel-heading collapsable-icon-left" id="question-bank-heading">
-	        	<span class="panel-title">
-			    	<a class="collapsed" role="button" data-toggle="collapse" href="#question-bank-collapse" aria-expanded="false" aria-controls="question-bank-collapse" >
-		          		<fmt:message key="label.authoring.basic.question.bank.title" />
-		        	</a>
-	      		</span>
-	        </div>
-	
-			<div id="question-bank-collapse" class="panel-body panel-collapse collapse contains-nothing" role="tabpanel" aria-labelledby="question-bank-heading">
-				<i class="fa fa-refresh fa-spin fa-2x fa-fw" style="margin: auto; display: block"></i>	
-			</div>
-		</div>
-	</div>
-</c:if>
Fisheye: Tag 1260e45458aeab2dd1bc862fb07096f514444aad refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/authoring/basic5.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/authoring/feedback.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/authoring/feedback.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/authoring/feedback.jsp	(revision 1260e45458aeab2dd1bc862fb07096f514444aad)
@@ -0,0 +1,7 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<input type="hidden" name="overallFeedbackList" id="overallFeedbackList" />
+<iframe id="advancedInputArea" name="advancedInputArea" 
+		style="width:100%; height:100%; border:0; display:block;" 
+		frameborder="no" scrolling="no" src="<c:url value='/authoring/initOverallFeedback.do'/>?sessionMapID=${assessmentForm.sessionMapID}">
+</iframe>
Fisheye: Tag 1260e45458aeab2dd1bc862fb07096f514444aad refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/authoring/feedback5.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/authoring/leader.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/authoring/leader.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/authoring/leader.jsp	(revision 1260e45458aeab2dd1bc862fb07096f514444aad)
@@ -0,0 +1,15 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<lams:Switch name="assessment.useSelectLeaderToolOuput" id="useSelectLeaderToolOuput"
+	useSpringForm="true"
+	labelKey="label.use.select.leader.tool.output"
+	tooltipKey="label.use.select.leader.tool.output.tooltip"
+	tooltipDescriptionKey="label.use.select.leader.tool.output.tooltip.description" />
+
+<c:if test="${sessionMap.isQuestionEtherpadEnabled}">
+	<lams:Switch name="assessment.questionEtherpadEnabled" id="questionEtherpadEnabled"
+		useSpringForm="true"
+		labelKey="label.authoring.advance.question.etherpad"
+		tooltipKey="label.authoring.advance.question.etherpad.tooltip"
+		tooltipDescriptionKey="label.authoring.advance.question.etherpad.tooltip.description" />
+</c:if>
Fisheye: Tag 1260e45458aeab2dd1bc862fb07096f514444aad refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/authoring/leader5.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -r1260e45458aeab2dd1bc862fb07096f514444aad
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 1260e45458aeab2dd1bc862fb07096f514444aad)
@@ -19,78 +19,76 @@
 			break;
 	}
 	if (qbMessage) {
-		alert(qbMessage);
+		$('#toast-question').toast('show').find('.toast-body').text(qbMessage);
 	}
 
 	$(document).ready(function(){
-		
 	    //init questions sorting
 	    <c:if test="${not empty sessionMap.questionReferences}">
-	    new Sortable($('#referencesTable tbody')[0], {
-		    animation: 150,
-		    direction: 'vertical',
-			store: {
-				set: function (sortable) {
-					//update all sequenceIds
-					for (var i = 0; i < sortable.el.rows.length; i++) {
-					 	var tr = sortable.el.rows[i];
-					 	var input = $("input[name^=sequenceId]", tr);
-					 	input.val(i);
-					 	var displayOrder = $(".reference-display-order", tr);
-					 	displayOrder.text(i + 1 + ")");
-					}
-
-					//prepare SequenceIds parameter
-					var serializedSequenceIds = "";
-					$("[name^=sequenceId]").each(function() {
-						serializedSequenceIds += "&" + this.name + "="  + this.value;
-					});
-
-					$.ajax({ 
-					    url: '<c:url value="/authoring/cacheReferencesOrder.do"/>',
-						type: 'POST',
-						data: {
-							sessionMapID: "${sessionMapID}",
-							sequenceIds: serializedSequenceIds
+		    new Sortable($('#referencesTable tbody')[0], {
+			    animation: 150,
+			    direction: 'vertical',
+				store: {
+					set: function (sortable) {
+						//update all sequenceIds
+						for (var i = 0; i < sortable.el.rows.length; i++) {
+						 	var tr = sortable.el.rows[i];
+						 	var input = $("input[name^=sequenceId]", tr);
+						 	input.val(i);
+						 	var displayOrder = $(".reference-display-order", tr);
+						 	displayOrder.text(i + 1 + ")");
 						}
-					});
-
-					//update names
-					$("[name^=sequenceId]").each(function() {
-						var newSequenceId = this.value;
-						//update name of the hidden input
-						this.name = "sequenceId" + newSequenceId;
-					});
+	
+						//prepare SequenceIds parameter
+						var serializedSequenceIds = "";
+						$("[name^=sequenceId]").each(function() {
+							serializedSequenceIds += "&" + this.name + "="  + this.value;
+						});
+	
+						$.ajax({ 
+						    url: '<c:url value="/authoring/cacheReferencesOrder.do"/>',
+							type: 'POST',
+							data: {
+								sessionMapID: "${sessionMapID}",
+								sequenceIds: serializedSequenceIds
+							}
+						});
+	
+						//update names
+						$("[name^=sequenceId]").each(function() {
+							var newSequenceId = this.value;
+							//update name of the hidden input
+							this.name = "sequenceId" + newSequenceId;
+						});
+					}
 				}
-			}
-		});
+			});
 		</c:if>
 	});
 </script>
 
-<div class="panel panel-default voffset5">
-	<table class="table table-condensed" id="referencesTable">
-		<thead>
-			<tr>
-				<th>
-					#
-				</th>
-				<th>
-					<fmt:message key="label.authoring.basic.list.header.question" />
-				</th>
-				<th colspan="4">
-					<fmt:message key="label.authoring.basic.list.header.mark" />
-				</th>
-			</tr>
-		</thead>	
-
+<table class="table table-sm" id="referencesTable">
+	<thead>
+		<tr>
+			<th>
+				#
+			</th>
+			<th>
+				<fmt:message key="label.authoring.basic.list.header.question" />
+			</th>
+			<th colspan="4">
+				<fmt:message key="label.authoring.basic.list.header.mark" />
+			</th>
+		</tr>
+	</thead>	
+	<tbody>
 		<c:forEach var="questionReference" items="${sessionMap.questionReferences}" varStatus="status">
 			<c:set var="question" value="${questionReference.question}" />
 			<tr>
-				<td class="reference-display-order">
+				<td class="reference-display-order align-middle">
 					${status.count})
 				</td>
-				<td>
+				<td class="align-middle">
 					<input type="hidden" name="sequenceId${questionReference.sequenceId}" value="${status.index}" class="reference-sequence-id">
 				
 					<c:choose>
@@ -103,12 +101,12 @@
 					</c:choose>
 					
 					<c:if test="${!questionReference.randomQuestion}">
-				        <span class='pull-right alert-info btn-xs loffset5 roffset5'>
+				        <span class='float-right badge badge-primary mx-2'>
 				       		v.&nbsp;${question.qbQuestion.version}
 				        </span>
 			        </c:if>
 			        
-			       	<span class='pull-right alert-info btn-xs'>
+			       	<span class='float-right badge badge-primary'>
 						<c:choose>
 							<c:when test="${questionReference.randomQuestion}">
 								<fmt:message key="label.authoring.basic.type.random.question" />
@@ -141,27 +139,32 @@
 	       			</span>
 				</td>
 				
-				<td width="70px" style="padding-right: 10px;">
-					<input name="maxMark" value="${questionReference.maxMark}" class="form-control input-sm max-mark-input">
+				<td class="align-middle" style="width: 70px; padding-right: 10px;">
+					<input name="maxMark" value="${questionReference.maxMark}" class="form-control form-control-sm max-mark-input">
 				</td>
 				
-				<td width="30px">
+				<td class="align-middle" style="width: 30px">
 					<i class="fa fa-xs fa-asterisk ${question.answerRequired ? 'text-danger' : ''}" 
+								role="button"
 								title="<fmt:message key="label.answer.required"/>" 
 								alt="<fmt:message key="label.answer.required"/>"
 								onClick="javascript:toggleQuestionRequired(this)"></i>
 				</td>
 				
-				<td width="30px">
-					<a class="thickbox roffset5x edit-reference-link" onclick="javascript:editReference(this);" style="color: black;"> 
-						<i class="fa fa-pencil"	title="<fmt:message key="label.authoring.basic.edit" />"></i>
+				<td class="align-middle" style="width: 30px">
+					<a class="edit-reference-link" onclick="javascript:editReference(this);" style="color: black;"> 
+						<i class="fa fa-pencil"	role="button" title="<fmt:message key="label.authoring.basic.edit" />"></i>
 					</a>
 				</td>
 
-				<td width="30px">
-					<i class="fa fa-times delete-reference-link" title="<fmt:message key="label.authoring.basic.delete" />"></i>
+				<td class="align-middle" style="width: 30px">
+					<i class="fa fa-times delete-reference-link" role="button" title="<fmt:message key="label.authoring.basic.delete" />"></i>
 				</td>
 			</tr>
 		</c:forEach>
-	</table>
-</div>
+	</tbody>
+</table>
+
+<div id="toast-question" class="toast toast-top" role="alert" aria-live="assertive" aria-atomic="true" data-delay="5000">
+  <div class="toast-body alert alert-info"></div>
+</div>
\ No newline at end of file
Fisheye: Tag 1260e45458aeab2dd1bc862fb07096f514444aad refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/authoring/parts/questionlist5.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp
===================================================================
diff -u -rf7837f2892736221011a0eb6cbef1027b6692224 -r1260e45458aeab2dd1bc862fb07096f514444aad
--- lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp	(.../questionlistRestricted.jsp)	(revision f7837f2892736221011a0eb6cbef1027b6692224)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp	(.../questionlistRestricted.jsp)	(revision 1260e45458aeab2dd1bc862fb07096f514444aad)
@@ -1,96 +1,94 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<div class="panel panel-default voffset5">
-	<table class="table table-condensed" id="referencesTable">
-		<tr>
-			<th>
-				#
-			</th>
-			<th>
-				<fmt:message key="label.authoring.basic.list.header.question" />
-			</th>
-			<th colspan="3">
-				<fmt:message key="label.authoring.basic.list.header.mark" />
-			</th>
-		</tr>	
+<table class="table table-sm" id="referencesTable">
+	<tr>
+		<th>
+			#
+		</th>
+		<th>
+			<fmt:message key="label.authoring.basic.list.header.question" />
+		</th>
+		<th colspan="3">
+			<fmt:message key="label.authoring.basic.list.header.mark" />
+		</th>
+	</tr>	
 
-		<c:forEach var="questionReference" items="${sessionMap.questionReferences}" varStatus="status">
-			<c:set var="question" value="${questionReference.question}" />
-			<tr>
-				<td>
-					${status.count})
-				</td>
-				<td>
-					<input type="hidden" name="sequenceId${questionReference.sequenceId}" value="${status.index}" class="reference-sequence-id">
+	<c:forEach var="questionReference" items="${sessionMap.questionReferences}" varStatus="status">
+		<c:set var="question" value="${questionReference.question}" />
+		<tr>
+			<td class="align-middle">
+				${status.count})
+			</td>
+			<td class="align-middle">
+				<input type="hidden" name="sequenceId${questionReference.sequenceId}" value="${status.index}" class="reference-sequence-id">
+			
+				<c:choose>
+					<c:when test="${questionReference.randomQuestion}">
+						<fmt:message key="label.authoring.basic.type.random.question" />
+					</c:when>
+					<c:otherwise>
+						<c:out value="${question.qbQuestion.name}" escapeXml="true"/>
+					</c:otherwise>
+				</c:choose>
 				
+				<c:if test="${!questionReference.randomQuestion}">
+					 <span class='float-right badge badge-primary mx-2'>
+				    	v.&nbsp;${question.qbQuestion.version}
+				    </span>
+		        </c:if>
+		        
+		       	 <span class='float-right badge badge-primary'>
 					<c:choose>
 						<c:when test="${questionReference.randomQuestion}">
 							<fmt:message key="label.authoring.basic.type.random.question" />
 						</c:when>
-						<c:otherwise>
-							<c:out value="${question.qbQuestion.name}" escapeXml="true"/>
-						</c:otherwise>
+						<c:when test="${question.type == 1}">
+							<fmt:message key="label.authoring.basic.type.multiple.choice" />
+						</c:when>
+						<c:when test="${question.type == 2}">
+							<fmt:message key="label.authoring.basic.type.matching.pairs" />
+						</c:when>
+						<c:when test="${question.type == 3}">
+							<fmt:message key="label.authoring.basic.type.short.answer" />
+						</c:when>
+						<c:when test="${question.type == 4}">
+							<fmt:message key="label.authoring.basic.type.numerical" />
+						</c:when>
+						<c:when test="${question.type == 5}">
+							<fmt:message key="label.authoring.basic.type.true.false" />
+						</c:when>
+						<c:when test="${question.type == 6}">
+							<fmt:message key="label.authoring.basic.type.essay" />
+						</c:when>
+						<c:when test="${question.type == 7}">
+							<fmt:message key="label.authoring.basic.type.ordering" />
+						</c:when>
+						<c:when test="${question.type == 8}">
+							<fmt:message key="label.authoring.basic.type.mark.hedging" />
+						</c:when>
 					</c:choose>
-					
-					<c:if test="${!questionReference.randomQuestion}">
-				        <span class='pull-right alert-info btn-xs loffset5 roffset5'>
-				       		v.&nbsp;${question.qbQuestion.version}
-				        </span>
-			        </c:if>
-			        
-			       	<span class='pull-right alert-info btn-xs'>
-						<c:choose>
-							<c:when test="${questionReference.randomQuestion}">
-								<fmt:message key="label.authoring.basic.type.random.question" />
-							</c:when>
-							<c:when test="${question.type == 1}">
-								<fmt:message key="label.authoring.basic.type.multiple.choice" />
-							</c:when>
-							<c:when test="${question.type == 2}">
-								<fmt:message key="label.authoring.basic.type.matching.pairs" />
-							</c:when>
-							<c:when test="${question.type == 3}">
-								<fmt:message key="label.authoring.basic.type.short.answer" />
-							</c:when>
-							<c:when test="${question.type == 4}">
-								<fmt:message key="label.authoring.basic.type.numerical" />
-							</c:when>
-							<c:when test="${question.type == 5}">
-								<fmt:message key="label.authoring.basic.type.true.false" />
-							</c:when>
-							<c:when test="${question.type == 6}">
-								<fmt:message key="label.authoring.basic.type.essay" />
-							</c:when>
-							<c:when test="${question.type == 7}">
-								<fmt:message key="label.authoring.basic.type.ordering" />
-							</c:when>
-							<c:when test="${question.type == 8}">
-								<fmt:message key="label.authoring.basic.type.mark.hedging" />
-							</c:when>
-						</c:choose>
-	       			</span>
-				</td>
-				
-				<td width="70px">
-					<input name="maxMark" value="${questionReference.maxMark}" class="form-control input-sm max-mark-input">
-				</td>
-				
-				<td width="30px">
-					<i class="fa fa-xs fa-asterisk ${question.answerRequired ? 'text-danger' : ''}" 
-								title="<fmt:message key="label.answer.required"/>" 
-								alt="<fmt:message key="label.answer.required"/>"
-								onClick="javascript:toggleQuestionRequired(this)"></i>
-				</td>
+       			</span>
+			</td>
+			
+			<td class="align-middle" style="width: 30px">
+				<input name="maxMark" value="${questionReference.maxMark}" class="form-control form-control-sm max-mark-input">
+			</td>
+			
+			<td class="align-middle" style="width: 30px">
+				<i class="fa fa-xs fa-asterisk ${question.answerRequired ? 'text-danger' : ''}" 
+							role="button"
+							title="<fmt:message key="label.answer.required"/>" 
+							alt="<fmt:message key="label.answer.required"/>"
+							onClick="javascript:toggleQuestionRequired(this)"></i>
+			</td>
 
-				<td width="30px" style="padding-right: 20px;">
-					<c:if test="${!questionReference.randomQuestion}">
-						<a class="thickbox roffset5x edit-reference-link" onclick="javascript:editReference(this);" style="color: black;"> 
-							<i class="fa fa-pencil"	title="<fmt:message key="label.authoring.basic.edit" />"></i>
-						</a>			
-					</c:if>
-				</td>
-			</tr>
-		</c:forEach>
-	</table>
-</div>
+			<td class="align-middle" style="width: 30px; padding-right: 20px;">
+				<c:if test="${!questionReference.randomQuestion}">
+					<a class="edit-reference-link" onclick="javascript:editReference(this);" style="color: black;"> 
+						<i class="fa fa-pencil"	title="<fmt:message key="label.authoring.basic.edit" />"></i>
+					</a>			
+				</c:if>
+			</td>
+		</tr>
+	</c:forEach>
+</table>
\ No newline at end of file
Fisheye: Tag 1260e45458aeab2dd1bc862fb07096f514444aad refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted5.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/authoring/questions.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/authoring/questions.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/authoring/questions.jsp	(revision 1260e45458aeab2dd1bc862fb07096f514444aad)
@@ -0,0 +1,219 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<script lang="javascript">
+	$(document).ready(function(){
+		reinitializePassingMarkSelect(true);
+		
+		//load question bank div
+		$('#question-bank-collapse').on('show.bs.collapse', function () {
+			$('#question-bank-collapse.contains-nothing').load(
+				"<lams:LAMSURL/>searchQB/start5.do",
+				{
+					returnUrl: "<c:url value='/authoring/importQbQuestion.do'/>?sessionMapID=${sessionMapID}",
+					toolContentId: ${sessionMap.toolContentID}
+				},
+				function() {
+					$(this).removeClass("contains-nothing");
+				}
+			);
+		});
+
+    	//handler for "delete" buttons
+    	$(document).on("click", '.delete-reference-link', function() {
+    		var	deletionConfirmed = confirm("<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>");
+
+    		if (deletionConfirmed) {
+    			var sequenceId = $('.reference-sequence-id', $(this).parents('tr')).val();
+
+    			$(questionListTargetDiv).load(
+    				"<c:url value="/authoring/removeQuestionReference.do"/>",
+    				{
+    					referenceSequenceId: sequenceId, 
+    					sessionMapID: "${sessionMapID}"
+    				},
+    				function(){
+    					reinitializePassingMarkSelect(false);
+    				}
+    			);
+    		};
+        });
+
+    	//handler for "maxMark" inputs
+    	$(document).on("change", '.max-mark-input', function() {
+    		var sequenceId = $('.reference-sequence-id', $(this).parents('tr')).val();
+    		
+			$.ajax({ 
+			    url: '<c:url value="/authoring/changeMaxMark.do"/>',
+				type: 'POST',
+				data: {
+					sessionMapID: "${sessionMapID}",
+					referenceSequenceId: sequenceId,
+					maxMark: this.value
+				}
+			});
+        });
+	});
+
+	//The panel of assessment list panel
+	var questionListTargetDiv = "#itemArea";
+	
+	function initNewReference() {
+		var questionType = $('#questionType').val(),
+			newQuestionInitUrl = "<c:url value='/authoring/initNewReference.do'/>?sessionMapID=${sessionMapID}"
+								  + "&questionType=" + questionType,
+			modal = $('#qb-question-authoring-modal');
+			
+		$('iframe', modal).attr('src', newQuestionInitUrl);
+		modal.modal('show');
+	};
+
+	//handler for "edit" buttons
+	function editReference(link) {
+		var sequenceId = $('.reference-sequence-id', $(link).parents('tr')).val(),
+			editUrl = "<c:url value='/authoring/editReference.do'/>?sessionMapID=${sessionMapID}" 
+						+ "&referenceSequenceId=" + sequenceId,
+			modal = $('#qb-question-authoring-modal');
+		
+		$('iframe', modal).attr('src', editUrl);
+		modal.modal('show');
+    }
+ 	
+	function refreshThickbox() {
+		// dummy method for current QB question authoring to work
+	}
+	
+	// for consistency with yet not rewritten QB question authoring
+	function tb_remove() {
+		$('#qb-question-authoring-modal').modal('hide');
+	}
+	
+	function toggleQuestionRequired(icon){
+		var sequenceId = $('.reference-sequence-id', $(icon).parents('tr')).val();
+		
+		$.ajax({ 
+		    url: '<c:url value="/authoring/toggleQuestionRequired.do"/>',
+			type: 'POST',
+			dataType : 'text',
+			data: {
+				sessionMapID: "${sessionMapID}",
+				referenceSequenceId: sequenceId
+			},
+			success(isRequired) {
+				if (isRequired == 'true') {
+				 	$(icon).addClass('text-danger');
+				} else if (isRequired == 'false') {
+					$(icon).removeClass('text-danger');
+				}
+			}
+		});
+	}
+	
+	function reinitializePassingMarkSelect(isPageFresh){
+		var oldValue = (isPageFresh) ? "${assessmentForm.assessment.passingMark}" : $("#passingMark").val();
+		$('#passingMark').empty();
+		$('#passingMark').append( new Option("<fmt:message key='label.authoring.advance.passing.mark.none' />",0) );
+		
+		var sumMaxMark = 0;
+		$("[name^=maxMark]").each(function() {
+			sumMaxMark += eval(this.value);
+		});
+		
+		for (var i = 1; i<=sumMaxMark; i++) {
+			var isSelected = (oldValue == i);
+		    $('#passingMark').append( new Option(i, i, isSelected, isSelected) );
+		}
+	};
+	
+	function importQTI(){
+    	window.open('<lams:LAMSURL/>questions/questionFile.jsp?collectionChoice=true',
+			'QuestionFile','width=500,height=370,scrollbars=yes');
+    }
+	
+ 	// this method is called by QTI questionChoice.jsp 
+    function saveQTI(formHTML, formName) {
+    	var form = $($.parseHTML(formHTML));
+    	// first, save questions in the QB
+		$.ajax({
+			url: '<lams:LAMSURL />imsqti/saveQTI.do?<csrf:token/>',
+			data: form.serializeArray(),
+			type: "POST",
+			dataType: 'text',
+			// the response is a comma-delimited list of QB question UIDs, for example 4,5,65 
+			success: function(qbQuestionUids) {
+				$.ajax({
+					type: "POST",
+					url: '<lams:WebAppURL />authoring/importQbQuestions.do',
+					data: {
+						// send QB question uids to MCQ authoring controller
+						'qbQuestionUids' : qbQuestionUids,
+						'sessionMapID'   : '${sessionMapID}'
+					},
+					dataType: 'html',
+					success: function(response) {
+						// question list gets refreshed
+						$(questionListTargetDiv).html(response);
+					}
+				});
+			}
+		});
+    }
+</script>
+
+<div id="questionlist">
+	<div id="itemArea">
+		<c:choose>
+			<c:when test="${isAuthoringRestricted}">
+				<%@ include file="/pages/authoring/parts/questionlistRestricted.jsp"%>
+			</c:when>
+			<c:otherwise>
+				<%@ include file="/pages/authoring/parts/questionlist.jsp"%>
+			</c:otherwise>
+		</c:choose>
+	</div>
+	
+	<c:if test="${!isAuthoringRestricted}">
+		<!-- Dropdown menu for choosing a question type -->
+		<div id="add-question-div" class="d-flex justify-content-end">
+			<select id="questionType" class="form-control form-control-select" style="width: inherit" 
+					aria-label="<fmt:message key="label.authoring.basic.question.list.title" />">
+					<option selected="selected" value="1"><fmt:message key="label.authoring.basic.type.multiple.choice" /></option>
+					<option value="2"><fmt:message key="label.authoring.basic.type.matching.pairs" /></option>
+					<option value="3"><fmt:message key="label.authoring.basic.type.short.answer" /></option>
+					<option value="4"><fmt:message key="label.authoring.basic.type.numerical" /></option>
+					<option value="5"><fmt:message key="label.authoring.basic.type.true.false" /></option>
+					<option value="6"><fmt:message key="label.authoring.basic.type.essay" /></option>
+					<option value="7"><fmt:message key="label.authoring.basic.type.ordering" /></option>
+					<option value="8"><fmt:message key="label.authoring.basic.type.mark.hedging" /></option>
+					<option value="-1">
+						<fmt:message key="label.authoring.basic.type.random.question" />
+					</option>
+			</select>
+			<button onclick="javscript:initNewReference()" type="button" class="btn btn-primary mx-2">  
+				<i class="fa fa-lg fa-plus-circle" aria-hidden="true" title="<fmt:message key="label.authoring.basic.add.question.to.pool" />"></i>
+			</button>
+			<button onClick="javascript:importQTI()" type="button" class="btn btn-primary">
+				<fmt:message key="label.authoring.basic.import.qti" /> 
+			</button>
+		</div>
+		
+		<!-- Question Bank -->
+	    <div class="card mt-5" >
+			<div class="card-header text-left collapsed collapsable-icon-left" role="button"
+					data-toggle="collapse" data-target="#question-bank-collapse" aria-expanded="false" aria-controls="question-bank-collapse">
+	       		<fmt:message key="label.authoring.basic.question.bank.title" />
+	        </div>
+			<div id="question-bank-collapse" class="card-body collapse contains-nothing" aria-labelledby="question-bank-heading">
+				<i class="fa fa-refresh fa-spin fa-2x fa-fw" style="margin: auto; display: block"></i>	
+			</div>
+		</div>
+		
+		<div id="qb-question-authoring-modal" class="modal p-3" tabindex="-1" data-backdrop="static" data-keyboard="false">
+			<div class="modal-content">
+				<div class="modal-body">
+		        	<iframe></iframe>
+		    	</div>
+			</div>
+		</div>
+		
+	</c:if>
+</div>
\ No newline at end of file
Fisheye: Tag 1260e45458aeab2dd1bc862fb07096f514444aad refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/authoring/questions5.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/authoring/reflection.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/authoring/reflection.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/authoring/reflection.jsp	(revision 1260e45458aeab2dd1bc862fb07096f514444aad)
@@ -0,0 +1,15 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<lams:OutcomeAuthor toolContentId="${assessmentForm.assessment.contentId}" />
+
+<lams:Switch name="assessment.reflectOnActivity" id="reflectOnActivity"
+	useSpringForm="true"
+	labelKey="advanced.reflectOnActivity"
+	tooltipKey="advanced.reflectOnActivity.tooltip"
+	tooltipDescriptionKey="advanced.reflectOnActivity.tooltip.description" />
+
+<div class="form-group row">
+	<div class="col-12">
+		<form:textarea path="assessment.reflectInstructions" rows="3" id="reflectInstructions" cssClass="form-control" />
+	</div>
+</div>
Fisheye: Tag 1260e45458aeab2dd1bc862fb07096f514444aad refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/authoring/reflection5.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?