Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r229b32d50e848e3b5377fdbc8ac8af6d60c1e79b -r320934945c495ab0832be6fb547d83812ac3152a
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 229b32d50e848e3b5377fdbc8ac8af6d60c1e79b)
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 320934945c495ab0832be6fb547d83812ac3152a)
@@ -1,10 +1,8 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
-<script language="JavaScript" type="text/JavaScript">
+<script type="text/javascript">
 	
-	jQuery( document ).ready(function( $ ) {
-		
+	$(document).ready(function() {
 		$("#useSelectLeaderToolOuput").click(function() {
 			if (document.QaAuthoringForm.useSelectLeaderToolOuput.checked) {
 				//uncheck checkboxes
@@ -32,7 +30,7 @@
 		}
 		
 	    $('#allow-rate-answers').click(function() {
-	        $("#criterias-holder").toggle("slow");
+	    	$(".rating-criteria-tag").toggle("slow");
 	    });
 	    
 	    $('#no-reedit-allowed').click(function() {
@@ -41,114 +39,92 @@
 	    	}
 	        $("#lockWhenFinished").prop("disabled", $(this).is(':checked'));
 	    });
-		
+	    
+	    $('#reflectionSubject').keyup(function(){
+	    	$('#reflect').prop('checked', !isEmpty($(this).val()));
+	    });
 	});
-	
 </script>
 
-<p>
-	<html:checkbox property="useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput" styleClass="noBorder"/>
+<div class="checkbox">
 	<label for="useSelectLeaderToolOuput">
+		<html:checkbox property="useSelectLeaderToolOuput" styleId="useSelectLeaderToolOuput" value="1" />
 		<fmt:message key="label.use.select.leader.tool.output" />
 	</label>
-</p>
+</div>
 
-<p class="small-space-top">
-	<html:checkbox property="showOtherAnswers" value="1" styleId="showOtherAnswers"
-		styleClass="noBorder" disabled="${formBean.useSelectLeaderToolOuput}"/>
+<div class="checkbox">
 	<label for="showOtherAnswers">
+		<html:checkbox property="showOtherAnswers" styleId="showOtherAnswers" value="1" disabled="${formBean.useSelectLeaderToolOuput}"/>
 		<fmt:message key="label.learner.answer" />
 	</label>
-</p>
+</div>
 
-<div style="padding-left: 20px;" id="show-other-answers-options">
 
-	<p>
-		<html:checkbox property="usernameVisible" value="1" styleId="usernameVisible" styleClass="noBorder"/>
+
+<div class="loffset20" id="show-other-answers-options">
+	<div class="checkbox">
 		<label for="usernameVisible">
+			<html:checkbox property="usernameVisible" styleId="usernameVisible" value="1" />
 			<fmt:message key="label.show.names" />
 		</label>
-	</p>
-
-	<p>
-		<html:checkbox property="allowRateAnswers" value="1" styleId="allow-rate-answers" styleClass="noBorder"/>
-		<label for="allow-rate-answers">
+	</div>
+	
+	<div class="checkbox">
+		<label for="allowRateAnswers">
+			<html:checkbox property="allowRateAnswers" styleId="allowRateAnswers" value="1" />
 			<fmt:message key="label.authoring.allow.rate.answers" />
 		</label>
-	</p>
-	
-	<div>
-		<div style="margin-left:20px;">
-			<div id="criterias-holder" <c:if test="${formBean.allowRateAnswers == 0}"> style="display:none;"</c:if>>
-				<lams:AuthoringRatingCriteria criterias="${sessionMap.ratingCriterias}" hasRatingLimits="true"
-					upLabel="label.authoring.up" downLabel="label.authoring.down"/>
-			</div>
-		</div>
 	</div>
-	
+
+	<div class="loffset20">
+		<lams:AuthoringRatingCriteria criterias="${sessionMap.ratingCriterias}" hasRatingLimits="true"
+			upLabel="label.authoring.up" downLabel="label.authoring.down" />
+	</div>
 </div>
 
-<p class="small-space-top">
-	<html:checkbox property="notifyTeachersOnResponseSubmit" value="1" styleClass="noBorder" styleId="notifyTeachersOnResponseSubmit"/>
+<div class="checkbox">
 	<label for="notifyTeachersOnResponseSubmit">
+		<html:checkbox property="notifyTeachersOnResponseSubmit" styleId="notifyTeachersOnResponseSubmit" value="1" />
 		<fmt:message key="label.notify.teachers.on.response.submit" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="reflect" value="1" styleClass="noBorder" styleId="reflect"/>
+<div class="checkbox">
 	<label for="reflect">
+		<html:checkbox property="reflect" styleId="reflect" value="1" />
 		<fmt:message key="label.reflect" />
 	</label>
-</p>
-<p>
-	<html:textarea cols="30" rows="3" property="reflectionSubject" styleId="reflectInstructions"></html:textarea>
-</p>
+</div>
 
-<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("reflect");
-	function turnOnRefect(){
-		if(isEmpty(ra.value)){
-		//turn off	
-			rao.checked = false;
-		}else{
-		//turn on
-			rao.checked = true;		
-		}
-	}
+<div class="form-group">
+	<html:textarea property="reflectionSubject" styleId="reflectionSubject" styleClass="form-control" cols="30" rows="3"	/>
+</div>
 
-	ra.onkeyup=turnOnRefect;
-//-->
-</script>
-
-<p>
-	<html:checkbox property="questionsSequenced" value="1" styleId="questionsSequenced" styleClass="noBorder"/>
+<div class="checkbox">
 	<label for="questionsSequenced">
+		<html:checkbox property="questionsSequenced" styleId="questionsSequenced" value="1" />
 		<fmt:message key="radiobox.questionsSequenced" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="noReeditAllowed" value="1" styleId="no-reedit-allowed" styleClass="noBorder"/>
-	<label for="no-reedit-allowed">
+<div class="checkbox">
+	<label for="noReeditAllowed">
+		<html:checkbox property="noReeditAllowed" styleId="noReeditAllowed" value="1" />
 		<fmt:message key="label.no.reedit.allowed" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="lockWhenFinished" value="1" styleId="lockWhenFinished" styleClass="noBorder"
-		disabled="${formBean.noReeditAllowed == 1}"/>
+<div class="checkbox">
 	<label for="lockWhenFinished">
+		<html:checkbox property="lockWhenFinished" styleId="lockWhenFinished" value="1" disabled="${formBean.noReeditAllowed == 1}"/>
 		<fmt:message key="label.lockWhenFinished" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="allowRichEditor" value="1" styleId="allowRichEditor" styleClass="noBorder"/>
+<div class="checkbox">
 	<label for="allowRichEditor">
+		<html:checkbox property="allowRichEditor" styleId="allowRichEditor" value="1" />
 		<fmt:message key="label.allowRichEditor" />
 	</label>
-</p>
+</div>
\ No newline at end of file