Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r86c25c80d92701a94c3161575c76c363891402ad
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 86c25c80d92701a94c3161575c76c363891402ad)
@@ -1,22 +1,20 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[authoringForm.sessionMapID]}" />
 
-<c:set var="sessionMap" value="${sessionScope[authoringForm.httpSessionID]}" />
-
 <script type="text/javascript">
-	
 	$(document).ready(function() {
 		
 		$("#useSelectLeaderToolOuput").click(function() {
-			if (document.forms.authoringForm.useSelectLeaderToolOuput.checked) {
+			if (document.forms.authoringForm["qa.useSelectLeaderToolOuput"].checked) {
 				//uncheck checkboxes
-				document.forms.authoringForm.showOtherAnswers.checked = false;
+				document.forms.authoringForm["qa.showOtherAnswers"].checked = false;
 				//disable checkboxes
-				document.forms.authoringForm.showOtherAnswers.disabled = true;
+				document.forms.authoringForm["qa.showOtherAnswers"].disabled = true;
 				
 				$("#show-other-answers-options").hide('slow');
 			} else {
 				//enable checkboxes
-				document.forms.authoringForm.showOtherAnswers.disabled = false;
+				document.forms.authoringForm["qa.showOtherAnswers"].disabled = false;
 			}	
 		});
 		
@@ -37,11 +35,11 @@
 		 
 		//initial state
 		
-		if (${authoringForm.showOtherAnswers == 0}) {
+		if (${!authoringForm.qa.showOtherAnswers}) {
 			$("#show-other-answers-options").hide();
 		}
 		
-		if (${authoringForm.reflect == 0}) {
+		if (${!authoringForm.qa.reflect}) {
 			$("#reflectionInstructions").hide();
 		}
 		
@@ -55,15 +53,14 @@
 	    $('#reflectionSubject').keyup(function(){
 	    	$('#reflect').prop('checked', !isEmpty($(this).val()));
 	    });
+	    
 	});
-	
-	
 </script>
 
 <lams:SimplePanel titleKey="label.select.leader">
 	<div class="checkbox">
 		<label for="useSelectLeaderToolOuput">
-			<form:checkbox path="useSelectLeaderToolOuput" id="useSelectLeaderToolOuput" value="1" />
+			<form:checkbox path="qa.useSelectLeaderToolOuput" id="useSelectLeaderToolOuput"/>
 			<fmt:message key="label.use.select.leader.tool.output" />
 		</label>
 	</div>
@@ -73,85 +70,83 @@
 
 	<div class="checkbox">
 		<label for="questionsSequenced">
-			<form:checkbox path="questionsSequenced" id="questionsSequenced" value="1" />
+			<form:checkbox path="qa.questionsSequenced" id="questionsSequenced"/>
 			<fmt:message key="radiobox.questionsSequenced" />
 		</label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="allowRichEditor">
-			<form:checkbox path="allowRichEditor" id="allowRichEditor" value="1" />
+			<form:checkbox path="qa.allowRichEditor" id="allowRichEditor"/>
 			<fmt:message key="label.allowRichEditor" />
 		</label>
 	</div>
 	
 	<div class="checkbox">
 		<label for="noReeditAllowed">
-			<form:checkbox path="noReeditAllowed" id="noReeditAllowed" value="1" />
+			<form:checkbox path="qa.noReeditAllowed" id="noReeditAllowed"/>
 			<fmt:message key="label.no.reedit.allowed" />
 		</label>
 	</div>
 
 	<div class="checkbox">
 		<label for="showOtherAnswers">
-			<form:checkbox path="showOtherAnswers" id="showOtherAnswers" value="1" disabled="${authoringForm.useSelectLeaderToolOuput}"/>
+			<form:checkbox path="qa.showOtherAnswers" id="showOtherAnswers" disabled="${authoringForm.qa.useSelectLeaderToolOuput}"/>
 			<fmt:message key="label.learner.answer" />
 		</label>
 	</div>
 
 	<div class="loffset20" id="show-other-answers-options">
 		<div class="checkbox">
 			<label for="usernameVisible">
-				<form:checkbox path="usernameVisible" id="usernameVisible" value="1" />
+				<form:checkbox path="qa.usernameVisible" id="usernameVisible"/>
 				<fmt:message key="label.show.names" />
 			</label>
 		</div>
 		
 		<div class="checkbox">
 			<label for="allowRateAnswers">
-				<form:checkbox path="allowRateAnswers" id="allowRateAnswers" value="1" />
+				<form:checkbox path="qa.allowRateAnswers" id="allowRateAnswers"/>
 				<fmt:message key="label.authoring.allow.rate.answers" />
 			</label>
 		</div>
 	
-		<div id="criterias-holder" <c:if test="${authoringForm.allowRateAnswers == 0}"> style="display:none;"</c:if>>
-		<lams:AuthoringRatingCriteria criterias="${sessionMap.ratingCriterias}" hasRatingLimits="true"
-			upLabel="label.authoring.up" downLabel="label.authoring.down" />
-		</div>
-		
+		<div id="criterias-holder" <c:if test="${!authoringForm.qa.allowRateAnswers}"> style="display:none;"</c:if>>
+			<lams:AuthoringRatingCriteria criterias="${sessionMap.ratingCriterias}" hasRatingLimits="true"
+				upLabel="label.authoring.up" downLabel="label.authoring.down" 
+				formContentPrefix="qa"/>
+		</div>	
 	</div>
 	
 </lams:SimplePanel>
 	
 <lams:SimplePanel titleKey="label.notifications">
-
 	<div class="checkbox">
 		<label for="notifyTeachersOnResponseSubmit">
-			<form:checkbox path="notifyTeachersOnResponseSubmit" id="notifyTeachersOnResponseSubmit" value="1" />
+			<form:checkbox path="qa.notifyTeachersOnResponseSubmit" id="notifyTeachersOnResponseSubmit"/>
 			<fmt:message key="label.notify.teachers.on.response.submit" />
 		</label>
 	</div>
-	
 </lams:SimplePanel>
 
 <lams:OutcomeAuthor toolContentId="${authoringForm.toolContentID}" />
 
 <lams:SimplePanel titleKey="label.activity.completion">
 	<div class="checkbox">
 		<label for="lockWhenFinished">
-			<form:checkbox path="lockWhenFinished" id="lockWhenFinished" value="1" disabled="${authoringForm.noReeditAllowed == 1}"/>
+			<form:checkbox path="qa.lockWhenFinished" id="lockWhenFinished" disabled="${authoringForm.qa.noReeditAllowed}"/>
 			<fmt:message key="label.lockWhenFinished" />
 		</label>
 	</div>
 
 	<div class="checkbox">
 		<label for="reflect">
-			<form:checkbox path="reflect" id="reflect" value="1" />
+			<form:checkbox path="qa.reflect" id="reflect"/>
 			<fmt:message key="label.reflect" />
 		</label>
 	</div>
 	
 	<div id="reflectionInstructions" class="form-group">
-		<form:textarea path="reflectionSubject" id="reflectionSubject" cssClass="form-control" cols="30" rows="3"	/>
+		<form:textarea path="qa.reflectionSubject" id="reflectionSubject" cssClass="form-control" cols="30" rows="3"	/>
 	</div>
 </lams:SimplePanel>