Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2ba408421bb2e9ae92dc8f0c98c0aa2312a6842a -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2ba408421bb2e9ae92dc8f0c98c0aa2312a6842a)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -416,6 +416,10 @@
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>CKEditor</name>
        <path>/WEB-INF/tags/CKEditor.tag</path>
    	</tag-file>
@@ -446,27 +450,15 @@
    	<tag-file>
 	    <name>TSTable</name>
 		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>
+   	</tag-file>    
   	<tag-file>
 	    <name>Arrow</name>
 		<path>/WEB-INF/tags/Arrow.tag</path>
-   	</tag-file>  
-   	<tag-file>
-       <name>HybridTab</name>
-       <path>/WEB-INF/tags/HybridTab.tag</path>
    	</tag-file>
    	<tag-file>
-       <name>HybridTabHeader</name>
-       <path>/WEB-INF/tags/HybridTabHeader.tag</path>
-   	</tag-file>    
-   	<tag-file>
-       <name>HybridTabBody</name>
-       <path>/WEB-INF/tags/HybridTabBody.tag</path>
-   	</tag-file>
-   	<tag-file>
        <name>AdvancedAccordian</name>
        <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
-   	</tag-file>
+   	</tag-file>  
    	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
@@ -509,5 +501,13 @@
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
 	</tag-file>
+   	<tag-file>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_tool_daco/web/common/tabbedheader.jsp
===================================================================
diff -u -rbe37ea9b52fd18c106254805e3cc45a6581bdd87 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision be37ea9b52fd18c106254805e3cc45a6581bdd87)
+++ lams_tool_daco/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -11,7 +11,6 @@
 
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/dacoCommon.js'/>"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>    
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
Index: lams_tool_daco/web/includes/javascript/dacoAuthoring.js
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/includes/javascript/dacoAuthoring.js	(.../dacoAuthoring.js)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_daco/web/includes/javascript/dacoAuthoring.js	(.../dacoAuthoring.js)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -4,7 +4,6 @@
 	//Initial behavior
 	$(document).ready(function() {
 		defaultShowAdditionaOptionsArea();
-		resizeQuestionInputArea ();
 	});
 	
 	//Checks if the element exists and has an empty value
@@ -13,18 +12,6 @@
     	return (elem!=null && elem.value!="");
 	}
 	
-	//Resizes the question input area so it is visible on the screen.
-	function resizeQuestionInputArea (){
-		var obj = window.document.getElementById('questionInputArea');
-		if (!obj && window.parent) { 
-			 obj = window.parent.document.getElementById('questionInputArea');
-		}  
-		if (!obj) {
-			obj = window.top.document.getElementById('questionInputArea');
-		}
-		obj.style.height=obj.contentWindow.document.body.scrollHeight + 10 + 'px';
-	}
-	
 	//Checks if the additional options area has all the default values, so it may stay hidden
    function defaultShowAdditionaOptionsArea(){
     if (checkNonDefaultValue("max") 
@@ -45,7 +32,6 @@
 			else {
 				$('#toggleAdditionalOptionsAreaLink').text(msgShowAdditionalOptions);	
 			}
-			resizeQuestionInputArea();
 		});
 	}
 	
@@ -110,24 +96,36 @@
 	//Packs additional elements and submits the question form
 	function submitDacoQuestion(){
 	
-    var questionType = $("#questionType").val();
+		if ( typeof CKEDITOR !== 'undefined' ) {
+			for ( instance in CKEDITOR.instances )
+				CKEDITOR.instances[instance].updateElement();
+		}
+
+		var questionType = $("#questionType").val();
     
-	if(questionType==7 || questionType==8 || questionType==9){
-	  $("#answerOptionList").val($("#answerOptionsForm").serialize());
-	}
-	
-	else if (questionType == 10){
-	var longlatMapsString = "";
-	$("#longlatMaps option:selected").each(function (){
-		longlatMapsString += this.value + "&";
-	});
-	$("#longlatMapsSelected").val(longlatMapsString);
-   }
-   
-	$("#dacoQuestionForm").submit();
-  }
-	
+		if(questionType==7 || questionType==8 || questionType==9){
+			$("#answerOptionList").val($("#answerOptionsForm").serialize());
+		}
+		
+		else if (questionType == 10){
+			var longlatMapsString = "";
+			$("#longlatMaps option:selected").each(function (){
+				longlatMapsString += this.value + "&";
+			});
+			$("#longlatMapsSelected").val(longlatMapsString);
+		}
+
+	    $.ajax({
+	           type: $("#dacoQuestionForm").attr('method'),
+	           url: $("#dacoQuestionForm").attr('action'),
+	           data: $("#dacoQuestionForm").serialize(), // serializes the form's elements.
+	           success: function(data) {
+	               $('#questionInputArea').html(data);
+	           }
+	         });
+	}   
+
 	//Cancels a question adding procedure
 	function cancelDacoQuestion(){
-		window.hideQuestionInputArea ? window.hideQuestionInputArea() : window.top.hideQuestionInputArea();
+		window.hideQuestionInputArea ? window.hideQuestionInputArea() : window.parent.hideQuestionInputArea();
 	}
\ No newline at end of file
Index: lams_tool_daco/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r2ba408421bb2e9ae92dc8f0c98c0aa2312a6842a -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 2ba408421bb2e9ae92dc8f0c98c0aa2312a6842a)
+++ lams_tool_daco/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -8,11 +8,11 @@
 </script>
 
 <!-- Advance Tab Content -->
-<div class="form-group  voffset10">
-<label><fmt:message key="label.authoring.advanced.record" /></label><BR/>
+<div class="form-group form-inline voffset10">
+<label><strong></strong><fmt:message key="label.authoring.advanced.record" /></strong></label><BR/>
 <!-- Minimum number of records learner must provide -->
-<label for="minRecords"><fmt:message key="label.common.min" /></label> 
-<html:select property="daco.minRecords" styleClass="roffset5">
+<label for="daco.minRecords"><fmt:message key="label.common.min" /></label> 
+<html:select property="daco.minRecords" styleClass="roffset5 form-control">
 	<html:option value="0">
 		<fmt:message key="label.authoring.advanced.record.nolimit" />
 	</html:option>
@@ -23,7 +23,7 @@
 <label for="maxRecords" style="space-left"> <fmt:message key="label.common.max" /> </label> 
 <!-- Maximum number of records learner must provide -->
 <html:select
-	property="daco.maxRecords" styleClass="noBorder">
+	property="daco.maxRecords" styleClass="form-control">
 	<html:option value="0">
 		<fmt:message key="label.authoring.advanced.record.nolimit" />
 	</html:option>
@@ -33,29 +33,29 @@
 </html:select>
 </div>
 
-<div class="form-group">
-<html:checkbox property="daco.notifyTeachersOnLearnerEntry"
-	styleId="notifyTeachersOnLearnerEntry">
-</html:checkbox> <label for="notifyTeachersOnLearnerEntry">&nbsp;<fmt:message key="label.authoring.advanced.notify.onlearnerentry" /> </label></p>
+<div class="form-horizontal">
+<div class="checkbox">
+<label for="notifyTeachersOnLearnerEntry"><html:checkbox property="daco.notifyTeachersOnLearnerEntry" styleId="notifyTeachersOnLearnerEntry" />
+<fmt:message key="label.authoring.advanced.notify.onlearnerentry" /></label>
 </div>
 
-<div class="form-group">
-<html:checkbox property="daco.notifyTeachersOnRecordSumbit"
-	styleId="notifyTeachersOnRecordSubmit">
-</html:checkbox> <label for="notifyTeachersOnRecordSubmit">&nbsp;<fmt:message key="label.authoring.advanced.notify.onrecordsubmit" /> </label></p>
+<div class="checkbox">
+<label for="notifyTeachersOnRecordSubmit"><html:checkbox property="daco.notifyTeachersOnRecordSumbit" styleId="notifyTeachersOnRecordSubmit"/> 
+<fmt:message key="label.authoring.advanced.notify.onrecordsubmit" /> </label>
 </div>
 
-<div class="form-group">
-<html:checkbox property="daco.lockOnFinished" 
-	styleId="lockOnFinished">
-</html:checkbox> <label for="lockOnFinished">&nbsp;<fmt:message key="label.authoring.advanced.lock.on.finished" /> </label>
+<div class="checkbox">
+<label for="lockOnFinished"><html:checkbox property="daco.lockOnFinished" styleId="lockOnFinished" />
+<fmt:message key="label.authoring.advanced.lock.on.finished" /></label>
 </div>
+</div>
 
+<div class="checkbox">
+<label for="reflectOn"><html:checkbox property="daco.reflectOnActivity" styleId="reflectOn"/>
+<fmt:message key="label.authoring.advanced.reflectOnActivity" /> </label>
 <div class="form-group">
-<html:checkbox property="daco.reflectOnActivity" styleId="reflectOn">
-</html:checkbox> <label for="reflectOn">&nbsp;<fmt:message key="label.authoring.advanced.reflectOnActivity" /> </label>
-<BR/>
-<div class="form-group">
-<html:textarea property="daco.reflectInstructions" styleId="reflectInstructions" cols="50" rows="3"
-	onkeyup="javascript:turnOnReflect()" />
-</div>
\ No newline at end of file
+<html:textarea property="daco.reflectInstructions" styleId="reflectInstructions"  styleClass="form-control" cols="50" rows="3"
+	onkeyup="javascript:turnOnReflect()"/>
+</div>
+
+
Index: lams_tool_daco/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rc367db7b5c528a0daed19a7bf7b3088e3b1268bc -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision c367db7b5c528a0daed19a7bf7b3088e3b1268bc)
+++ lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -69,11 +69,13 @@
 		</lams:TabBodys>
 
 		<!-- Button Row -->
+		<div id="saveCancelButtons">
 		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
 			toolSignature="<%=DacoConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.daco.contentId}" 
 			 customiseSessionID="${formBean.sessionMapID}"
 			 contentFolderID="${formBean.contentFolderID}"
 			 cancelConfirmMsgKey="message.authoring.cancel.save" />
+		</div>
 	</lams:TabBodyArea>
  
 
Index: lams_tool_daco/web/pages/authoring/basic.jsp
===================================================================
diff -u -r2ba408421bb2e9ae92dc8f0c98c0aa2312a6842a -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 2ba408421bb2e9ae92dc8f0c98c0aa2312a6842a)
+++ lams_tool_daco/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -3,22 +3,23 @@
 <c:url var="showMessageURL" value='/authoring/newQuestion.do'>
 	<c:param name="sessionMapID" value="${formBean.sessionMapID}" />
 </c:url>
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/dacoAuthoring.js'/>"></script>
 
 <script type="text/javascript">
 	//Showes the add/edit question area
 	function showQuestionInputArea(url) {
-
-		var area=document.getElementById("questionInputArea");
-		if(area != null){
-			area.style.width="100%";
-			area.style.height="100%";
-			area.src=url;
-			area.style.display="block";
-		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="none";
-		}
+		$("#questionInputArea").load(url, function() {
+			var area=document.getElementById("questionInputArea");
+			if(area != null){
+				area.style.width="100%";
+				area.style.height="100%";
+				area.style.display="block";
+			}
+			var elem = document.getElementById("saveCancelButtons");
+			if (elem != null) {
+				elem.style.display="none";
+			}
+		} );
 	}
 	
 	//Hides the add/edit question area
@@ -37,7 +38,7 @@
 	
 	//Shows the add/edit question area for the corresponding question type
    function showQuestionInputAreaByType(url){
-	 var questionTypeDropdown=document.getElementById("questionType");
+	 var questionTypeDropdown=document.getElementById("questionTypeDropdown");
 	 showQuestionInputArea(url+"&questionType="+(questionTypeDropdown.selectedIndex + 1));
 }
 	
@@ -47,23 +48,19 @@
 		showQuestionInputArea(url);
 	}
 	
-	//Question list panel
-	var questionListTargetDiv = "questionListArea";
-		
 	function deleteQuestion(questionIndex,sessionMapID){
 		var url = "<c:url value='/authoring/removeQuestion.do'/>";
 		var param = "questionIndex=" + questionIndex +"&reqID="+(new Date()).getTime()+"&sessionMapID="+sessionMapID;;
 		deleteQuestionLoading();
-	    var myAjax = new Ajax.Updater(
-		    	questionListTargetDiv,
-		    	url,
-		    	{
-		    		method:'post',
-		    		parameters:param,
-		    		onComplete:deleteQuestionComplete,
-		    		evalScripts:true
-		    	}
-	    );
+		$.ajax({
+            type: 'post',
+            url: url,
+            data: param,
+            success: function(data) {
+            	$("#questionListArea").html(data);
+            	deleteQuestionComplete();
+            }
+        });
 	}
 	
 
@@ -74,39 +71,35 @@
 	function deleteQuestionComplete(){
 		hideBusy("#questionListArea");
 	}
-	function resizeOnMessageFrameLoad(){
-		var messageAreaFrame = document.getElementById("questionInputArea");
-		messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
-	}
 </script>
 
 <!-- Basic Tab Content -->
  <div class="form-group voffset10">
     <label for="daco.title"><fmt:message key="label.authoring.basic.title" /></label>
-    <html:text property="daco.title" style="width: 100%;"></html:text>
+    <html:text property="daco.title" style="width: 100%;" styleClass="form-control"></html:text>
  </div>
  <div class="form-group">
-    <label for="daco.title"><fmt:message key="label.authoring.basic.instruction" /></label>
+    <label for="daco.instructions"><fmt:message key="label.authoring.basic.instruction" /></label>
     <lams:CKEditor id="daco.instructions" value="${formBean.daco.instructions}" contentFolderID="${formBean.contentFolderID}"></lams:CKEditor>
  </div>
   
 <!-- Dropdown menu for choosing a question type -->
 <div id="questionListArea"><c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 <%@ include	file="/pages/authoring/parts/questionlist.jsp"%></div>
-<div><select id="questionType">
-	<option selected="selected"><fmt:message key="label.authoring.basic.textfield" /></option>
-	<option><fmt:message key="label.authoring.basic.textarea" /></option>
-	<option><fmt:message key="label.authoring.basic.number" /></option>
-	<option><fmt:message key="label.authoring.basic.date" /></option>
-	<option><fmt:message key="label.authoring.basic.file" /></option>
-	<option><fmt:message key="label.authoring.basic.image" /></option>
-	<option><fmt:message key="label.authoring.basic.radio" /></option>
-	<option><fmt:message key="label.authoring.basic.dropdown" /></option>
-	<option><fmt:message key="label.authoring.basic.checkbox" /></option>
-	<option><fmt:message key="label.authoring.basic.longlat" /></option>
-</select><html:link href="#" styleClass="btn btn-default btn-xs loffset5" onclick="javascript:showQuestionInputAreaByType('${showMessageURL }')">
+<div class="form-inline"><select id="questionTypeDropdown" class="form-control">
+	<option selected="selected"><fmt:message key="label.authoring.basic.textfield"/></option>
+	<option><fmt:message key="label.authoring.basic.textarea"/></option>
+	<option><fmt:message key="label.authoring.basic.number"/></option>
+	<option><fmt:message key="label.authoring.basic.date"/></option>
+	<option><fmt:message key="label.authoring.basic.file"/></option>
+	<option><fmt:message key="label.authoring.basic.image"/></option>
+	<option><fmt:message key="label.authoring.basic.radio"/></option>
+	<option><fmt:message key="label.authoring.basic.dropdown"/></option>
+	<option><fmt:message key="label.authoring.basic.checkbox"/></option>
+	<option><fmt:message key="label.authoring.basic.longlat"/></option>
+</select><html:link href="#" styleClass="btn btn-default btn-sm" onclick="javascript:showQuestionInputAreaByType('${showMessageURL }')">
 	<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.question.add" />
 </html:link></p></div>
 <a name="questionInputAreaAnchor"></a>
-<p><iframe onload="javascript:this.style.height=resizeOnMessageFrameLoad();window.location.hash = '#questionInputArea';" id="questionInputArea"
-	name="questionInputArea" style="width: 0px; height: 0px; border: 0px; display: none" frameborder="no" scrolling="no"> </iframe></p>
+<p><div onload="javascript:window.location.hash = '#questionInputArea';" id="questionInputArea"
+	name="questionInputArea"> </div></p>
Index: lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp
===================================================================
diff -u -r3032e0bfac4c505a0d5c985c0985c553241fbc71 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	(.../addcheckbox.jsp)	(revision 3032e0bfac4c505a0d5c985c0985c553241fbc71)
+++ lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp	(.../addcheckbox.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -35,58 +35,46 @@
 
 	<p><fmt:message key="label.authoring.basic.radio.help" /></p>
 
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
+	<%@ include file="description.jsp"%>
 
-	<div class="form-group">
-    	<label for="description"><fmt:message key="label.authoring.basic.description" /></label>
-		<lams:CKEditor id="description" value="${formBean.description}" 
-			contentFolderID="${sessionMap.contentFolderID}"
-	                width="100%"
-	                resizeParentFrameName="questionInputArea">
-		</lams:CKEditor>
-	</div>
-  
-	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message
-		key="label.authoring.basic.additionaloptions.show" /> </a>
-
-	<div id="additionalOptionsArea" class="voffset5 form-inline" style="display: none;">
+	<!--  Options -->  
+	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="visible-xs-block visible-lg-block btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<div id="additionalOptionsArea" style="display: none;">
+ 		<div class="form-inline">
 		<div class="form-group">
-	    	<label for=min><fmt:message key="label.authoring.basic.min.select" />&nbsp;
-		<html:text styleId="min" property="min" size="10" />
+    	<label for="min"><fmt:message key="label.authoring.basic.min.select" /></label>
+		<html:text styleId="min" property="min" size="10" styleClass="form-control"/>
 		</div>
-		
 		<div class="form-group">
-	    	<label for="max"><fmt:message key="label.authoring.basic.max.select" />&nbsp;
-		<html:text styleId="max" property="max" size="10" />
+    	<label for="max"><fmt:message key="label.authoring.basic.max.select" /></label>
+		<html:text styleId="max" property="max" size="10" styleClass="form-control"/>
 		</div>
-		
 		<div class="form-group">
-	    	<label for="questionRequired"><html:checkbox property="questionRequired" styleId="questionRequired" styleClass="noBorder">&nbsp;
-			<fmt:message key="label.authoring.basic.required" />
-		</html:checkbox>
+    	<label for="summary"><fmt:message key="label.common.summary" /></label>
+		<html:select property="summary" styleClass="form-control">
+			<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
+			<html:option value="2"><fmt:message key="label.common.summary.average" /></html:option>
+			<html:option value="3"><fmt:message key="label.common.summary.count" /></html:option>
+		</html:select>
 		</div>
+		<div class="checkbox">
+		    <label>
+	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+		    </label>
+	  	</div>
+	  	</div>
 	</div>
-	
-	<div class="form-group voffset5">
-    	<label for="summary"><fmt:message key="label.common.summary" />
-	<html:select property="summary" styleClass="noBorder">
-		<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
-		<html:option value="2"><fmt:message key="label.common.summary.average" /></html:option>
-		<html:option value="3"><fmt:message key="label.common.summary.count" /></html:option>
-	</html:select>
-	</div>
+	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="visible-sm-block visible-md-block btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+ 	<!--  end options -->
+  
 </html:form>
 
 <!-- Answer options -->
 
 <%@ include file="answeroptions.jsp"%>
 
-<div class="voffset5">
-	<a href="#" onclick="javascript:submitDacoQuestion()" class="btn btn-default btn-sm"> <fmt:message
-		key="label.authoring.basic.checkbox.add" /> </a>
-	<a href="#" onclick="javascript:cancelDacoQuestion()" class="btn btn-default btn-sm loffset5"> <fmt:message key="label.common.cancel" /> </a>
-</div>
+<c:set var="addButtonMessageKey" value="label.authoring.basic.checkbox.add" />
+<%@ include file="buttons.jsp"%>
 
 </div>
 </div>
Index: lams_tool_daco/web/pages/authoring/parts/adddate.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/parts/adddate.jsp	(.../adddate.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_daco/web/pages/authoring/parts/adddate.jsp	(.../adddate.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -5,7 +5,7 @@
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
-	<lams:css style="main" />
+	<lams:css />
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
@@ -16,39 +16,40 @@
 </lams:head>
 <body class="tabpart">
 
+<div class="panel panel-default">
+<div class="panel-heading">
+	<div class="panel-title"><fmt:message key="label.authoring.basic.date" /></div>
+</div>
+
+<div class="panel-body">
+
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="4" />
 	<html:hidden property="questionIndex" />
 
-	<h2 class="no-space-left"><fmt:message key="label.authoring.basic.date" /></h2>
-	<div><fmt:message key="label.authoring.basic.date.help" /></div>
-	<div class="field-name space-top"><fmt:message key="label.authoring.basic.description" /></div>
+	<%@ include file="description.jsp"%>
 
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
-	<lams:CKEditor id="description" value="${formBean.description}" 
-		contentFolderID="${sessionMap.contentFolderID}"
-                width="100%"
-                resizeParentFrameName="questionInputArea">
-	</lams:CKEditor>
-	<div class="space-bottom-top"><a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()"><fmt:message
-		key="label.authoring.basic.additionaloptions.show" /> </a><br />
+	<!--  Options -->  
+	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<div id="additionalOptionsArea" style="display: none;">
+		<div class="checkbox">
+		    <label>
+	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+		    </label>
+	  	</div>
 	</div>
-
-	<div id="additionalOptionsArea" style="display: none;"><html:checkbox property="questionRequired"
-		styleId="questionRequired" styleClass="noBorder">
-		<fmt:message key="label.authoring.basic.required" />
-	</html:checkbox></div>
+ 	<!--  end options -->
+	
 </html:form>
 
-<lams:ImgButtonWrapper>
-	<a href="#" onclick="javascript:submitDacoQuestion()" class="button-add-item"><fmt:message
-		key="label.authoring.basic.date.add" /> </a>
-	<a href="#" onclick="javascript:cancelDacoQuestion()" class="button space-left"><fmt:message key="label.common.cancel" /> </a>
-</lams:ImgButtonWrapper>
+<c:set var="addButtonMessageKey" value="label.authoring.basic.date.add" />
+<%@ include file="buttons.jsp"%>
 
+</div>
+</div>
+
 </body>
 </lams:html>
Index: lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -5,7 +5,7 @@
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
-	<lams:css style="main" />
+	<lams:css />
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var removeAnswerOptionUrl = "<c:url value='/authoring/removeAnswerOption.do'/>";
@@ -18,6 +18,13 @@
 </lams:head>
 <body class="tabpart">
 
+<div class="panel panel-default">
+<div class="panel-heading">
+	<div class="panel-title"><fmt:message key="label.authoring.basic.dropdown" /></div>
+</div>
+
+<div class="panel-body">
+
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
@@ -26,43 +33,42 @@
 	<html:hidden property="questionIndex" />
 	<input type="hidden" id="answerOptionList" name="answerOptionList" />
 
-	<h2 class="no-space-left"><fmt:message key="label.authoring.basic.dropdown" /></h2>
-	<div><fmt:message key="label.authoring.basic.radio.help" /></div>
+	<p><fmt:message key="label.authoring.basic.radio.help" /></p>
 
-	<div class="field-name space-top"><fmt:message key="label.authoring.basic.description" /></div>
-
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
-	<lams:CKEditor id="description" value="${formBean.description}" 
-		contentFolderID="${sessionMap.contentFolderID}"
-                width="100%"
-                resizeParentFrameName="questionInputArea">
-	</lams:CKEditor>
-	<div class="space-bottom-top"><a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()"><fmt:message
-		key="label.authoring.basic.additionaloptions.show" /> </a><br />
+	<%@ include file="description.jsp"%>
+  
+  	<!--  Options -->  
+	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<div id="additionalOptionsArea" style="display: none;">
+ 		<div class="form-inline">
+		<div class="form-group">
+    	<label for="summary"><fmt:message key="label.common.summary" /></label>
+		<html:select property="summary" styleClass="form-control">
+			<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
+			<html:option value="2"><fmt:message key="label.common.summary.average" /></html:option>
+			<html:option value="3"><fmt:message key="label.common.summary.count" /></html:option>
+		</html:select>
+		</div>
+		<div class="checkbox">
+		    <label>
+	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+		    </label>
+	  	</div>
+	  	</div>
 	</div>
-
-	<div id="additionalOptionsArea" style="display: none;"><html:checkbox property="questionRequired"
-		styleId="questionRequired" styleClass="noBorder">
-		<fmt:message key="label.authoring.basic.required" />
-	</html:checkbox>
-
-	<div class="field-name space-top"><fmt:message key="label.common.summary" /></div>
-	<html:select property="summary" styleClass="noBorder">
-	<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
-		<html:option value="2"><fmt:message key="label.common.summary.average" /></html:option>
-		<html:option value="3"><fmt:message key="label.common.summary.count" /></html:option>
-	</html:select></div>
+ 	<!--  end options -->
+	
 </html:form>
 
 <!-- Answer options -->
 
 <%@ include file="answeroptions.jsp"%>
 
-<lams:ImgButtonWrapper>
-	<a href="#" onclick="javascript:submitDacoQuestion()" class="button-add-item"><fmt:message
-		key="label.authoring.basic.dropdown.add" /> </a>
-	<a href="#" onclick="javascript:cancelDacoQuestion()" class="button space-left"><fmt:message key="label.common.cancel" /> </a>
-</lams:ImgButtonWrapper>
+<c:set var="addButtonMessageKey" value="label.authoring.basic.dropdown.add" />
+<%@ include file="buttons.jsp"%>
+
+</div>
+</div>
+
 </body>
 </lams:html>
Index: lams_tool_daco/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_daco/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -5,7 +5,7 @@
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
-	<lams:css style="main" />
+	<lams:css/>
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
@@ -16,39 +16,43 @@
 </lams:head>
 <body class="tabpart">
 
+<div class="panel panel-default">
+<div class="panel-heading">
+	<div class="panel-title"><fmt:message key="label.authoring.basic.file" /></div>
+</div>
+
+<div class="panel-body">
+
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="5" />
 	<html:hidden property="questionIndex" />
 
-	<h2 class="no-space-left"><fmt:message key="label.authoring.basic.file" /></h2>
-	<div><fmt:message key="label.authoring.basic.file.help" /></div>
+	<p><fmt:message key="label.authoring.basic.file.help" /></p>
 
-	<div class="field-name space-top"><fmt:message key="label.authoring.basic.description" /></div>
-
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
-	<lams:CKEditor id="description" value="${formBean.description}" 
-		contentFolderID="${sessionMap.contentFolderID}"
-                width="100%"
-                resizeParentFrameName="questionInputArea">
-	</lams:CKEditor>
-	<div class="space-bottom-top"><a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()"><fmt:message
-		key="label.authoring.basic.additionaloptions.show" /> </a><br />
+	<%@ include file="description.jsp"%>
+  
+	<!--  Options -->  
+	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<div id="additionalOptionsArea" style="display: none;">
+		<div class="checkbox">
+		    <label>
+	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+		    </label>
+	  	</div>
 	</div>
-
-	<div id="additionalOptionsArea" style="display: none;"><html:checkbox property="questionRequired"
-		styleId="questionRequired" styleClass="noBorder">
-		<fmt:message key="label.authoring.basic.required" />
-	</html:checkbox></div>
+ 	<!--  end options -->
+	
 </html:form>
 
-<lams:ImgButtonWrapper>
-	<a href="#" onclick="javascript:submitDacoQuestion()" class="button-add-item"><fmt:message
-		key="label.authoring.basic.file.add" /> </a>
-	<a href="#" onclick="javascript:cancelDacoQuestion()" class="button space-left"><fmt:message key="label.common.cancel" /> </a>
-</lams:ImgButtonWrapper>
+<c:set var="addButtonMessageKey" value="label.authoring.basic.file.add" />
+<%@ include file="buttons.jsp"%>
+
+
+</div>
+</div>
+
 </body>
 </lams:html>
Index: lams_tool_daco/web/pages/authoring/parts/addimage.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_daco/web/pages/authoring/parts/addimage.jsp	(.../addimage.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -5,7 +5,7 @@
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
-	<lams:css style="main" />
+	<lams:css/>
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
@@ -16,37 +16,41 @@
 </lams:head>
 <body class="tabpart">
 
+<div class="panel panel-default">
+<div class="panel-heading">
+	<div class="panel-title"><fmt:message key="label.authoring.basic.image" /></div>
+</div>
+
+<div class="panel-body">
+
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="6" />
 	<html:hidden property="questionIndex" />
 
-	<h2 class="no-space-left"><fmt:message key="label.authoring.basic.image" /></h2>
-	<div><fmt:message key="label.authoring.basic.image.help" /></div>
+	<p><fmt:message key="label.authoring.basic.image.help" /></p>
 
-	<div class="field-name space-top"><fmt:message key="label.authoring.basic.description" /></div>
-
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
-	<lams:CKEditor id="description" value="${formBean.description}" contentFolderID="${sessionMap.contentFolderID}"
-				   resizeParentFrameName="questionInputArea"></lams:CKEditor>
-	<div class="space-bottom-top"><a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()"><fmt:message
-		key="label.authoring.basic.additionaloptions.show" /> </a><br />
+	<%@ include file="description.jsp"%>
+  
+	<!--  Options -->  
+	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<div id="additionalOptionsArea" style="display: none;">
+		<div class="checkbox">
+		    <label>
+	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+		    </label>
+	  	</div>
 	</div>
-
-	<div id="additionalOptionsArea" style="display: none;"><html:checkbox property="questionRequired"
-		styleId="questionRequired" styleClass="noBorder">
-		<fmt:message key="label.authoring.basic.required" />
-	</html:checkbox></div>
+ 	<!--  end options -->
 </html:form>
 
-<lams:ImgButtonWrapper>
-	<a href="#" onclick="javascript:submitDacoQuestion()" class="button-add-item"><fmt:message
-		key="label.authoring.basic.image.add" /> </a>
-	<a href="#" onclick="javascript:cancelDacoQuestion()" class="button space-left"><fmt:message key="label.common.cancel" /> </a>
-</lams:ImgButtonWrapper>
+<c:set var="addButtonMessageKey" value="label.authoring.basic.image.add" />
+<%@ include file="buttons.jsp"%>
 
+</div>
+</div>
+
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_daco/web/pages/authoring/parts/additionalOptions.jsp
===================================================================
diff -u
--- lams_tool_daco/web/pages/authoring/parts/additionalOptions.jsp	(revision 0)
+++ lams_tool_daco/web/pages/authoring/parts/additionalOptions.jsp	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -0,0 +1,19 @@
+	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+
+ 	<div id="additionalOptionsArea" class="form-inline" style="display: none;">
+	
+		${additionalOptions} 
+
+		${summary}
+
+ 		<div class="checkbox">
+		    <label>
+	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+		    </label>
+	  	</div>
+	</div>
+
+ 	<div id="additionalOptionsArea" class="form-inline" style="display: none;">
+	
+	
+	
\ No newline at end of file
Index: lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -7,7 +7,7 @@
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
-	<lams:css style="main" />
+	<lams:css />
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
@@ -18,6 +18,14 @@
 
 </lams:head>
 <body class="tabpart">
+
+<div class="panel panel-default">
+<div class="panel-heading">
+	<div class="panel-title"><fmt:message key="label.authoring.basic.longlat" /></div>
+</div>
+
+<div class="panel-body">
+
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
@@ -26,29 +34,28 @@
 	<html:hidden property="questionIndex" />
 	<input type="hidden" id="longlatMapsSelected" name="longlatMapsSelected" />
 
-	<h2 class="no-space-left"><fmt:message key="label.authoring.basic.longlat" /></h2>
-	<div><fmt:message key="label.authoring.basic.longlat.help" /></div>
+	<p><fmt:message key="label.authoring.basic.longlat.help" /></p>
 
-	<div class="field-name space-top"><fmt:message key="label.authoring.basic.description" /></div>
-
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
-	<lams:CKEditor id="description" value="${formBean.description}" 
-		contentFolderID="${sessionMap.contentFolderID}"
-                width="100%"
-                resizeParentFrameName="questionInputArea">
-	</lams:CKEditor>
-	<div class="space-bottom-top"><a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()"><fmt:message
-		key="label.authoring.basic.additionaloptions.show" /> </a><br />
+	<%@ include file="description.jsp"%>
+  
+	<!--  Options -->  
+	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<div id="additionalOptionsArea" style="display: none;">
+ 		<div class="form-inline">
+		<div class="checkbox">
+		    <label>
+	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+		    </label>
+	  	</div>
+	  	</div>
 	</div>
-	<div id="additionalOptionsArea" style="display: none;"><html:checkbox property="questionRequired"
-		styleId="questionRequired" styleClass="noBorder">
-		<fmt:message key="label.authoring.basic.required" />
-	</html:checkbox></div>
-	<div class="space-top" style="vertical-align: top">
-	<div class="field-name space-right" style="float: left;"><fmt:message key="label.authoring.basic.longlat.maps" /></div>
-	<select id="longlatMaps" name="longlatMaps" multiple="multiple" size="<%=DacoConstants.LONGLAT_MAPS_LIST.length %>">
+ 	<!--  end options -->
 
+	<div class="voffset5">
+	<form-group>
+	<label for="longlatMaps"><fmt:message key="label.authoring.basic.longlat.maps" /></label>
+	<select id="longlatMaps" name="longlatMaps" multiple="multiple" size="<%=DacoConstants.LONGLAT_MAPS_LIST.length %>" class="form-control">
+
 		<c:forEach var="map" items="<%=DacoConstants.LONGLAT_MAPS_LIST %>">
 			<option value="<c:out  value='${map}'/>"
 				<c:forEach var="selectedMap" items="${longlatMapsSelected}">
@@ -59,14 +66,16 @@
 			>${map}</option>
 		</c:forEach>
 	</select>
+	</form-group>
 	</div>
 
-
 </html:form>
-<lams:ImgButtonWrapper>
-	<a href="#" onclick="javascript:submitDacoQuestion()" class="button-add-item"><fmt:message
-		key="label.authoring.basic.longlat.add" /> </a>
-	<a href="#" onclick="javascript:cancelDacoQuestion()" class="button space-left"><fmt:message key="label.common.cancel" /> </a>
-</lams:ImgButtonWrapper>
+
+<c:set var="addButtonMessageKey" value="label.authoring.basic.longlat.add" />
+<%@ include file="buttons.jsp"%>
+
+</div>
+</div>
+
 </body>
 </lams:html>
Index: lams_tool_daco/web/pages/authoring/parts/addnumber.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	(.../addnumber.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_daco/web/pages/authoring/parts/addnumber.jsp	(.../addnumber.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -5,7 +5,7 @@
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
-	<lams:css style="main" />
+	<lams:css/>
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
@@ -16,52 +16,62 @@
 </lams:head>
 <body class="tabpart">
 
+<div class="panel panel-default">
+<div class="panel-heading">
+	<div class="panel-title"><fmt:message key="label.authoring.basic.number" /></div>
+</div>
+
+<div class="panel-body">
+
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="3" />
 	<html:hidden property="questionIndex" />
 
-	<h2 class="no-space-left"><fmt:message key="label.authoring.basic.number" /></h2>
-	<div><fmt:message key="label.authoring.basic.number.help" /></div>
-	<div class="field-name space-top"><fmt:message key="label.authoring.basic.description" /></div>
+	<p><fmt:message key="label.authoring.basic.number.help" /></p>
 
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
-	<lams:CKEditor id="description" value="${formBean.description}" 
-		contentFolderID="${sessionMap.contentFolderID}"
-                width="100%"
-                resizeParentFrameName="questionInputArea">
-	</lams:CKEditor>
-	<div class="space-bottom-top"><a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()"><fmt:message
-		key="label.authoring.basic.additionaloptions.show" /> </a><br />
-	</div>
-
+	<%@ include file="description.jsp"%>
+  
+  	<!--  Options -->  
+	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="visible-xs-block visible-lg-block btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
 	<div id="additionalOptionsArea" style="display: none;">
+ 		<div class="form-inline">
+		<div class="form-group">
+    	<label for=min><fmt:message key="label.common.min" /></label>
+		<html:text styleId="min" property="min" size="10" styleClass="form-control"/>
+		</div>
+		<div class="form-group">
+    	<label for="max"><fmt:message key="label.common.max" /></label>
+		<html:text styleId="max" property="max" size="10" styleClass="form-control"/>
+		</div>
+		<div class="form-group">
+    	<label for="summary"><fmt:message key="label.common.summary" /></label>
+		<html:select property="summary" styleClass="form-control">
+			<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
+			<html:option value="1"><fmt:message key="label.common.summary.sum" /></html:option>
+			<html:option value="2"><fmt:message key="label.common.summary.average" /></html:option>
+			<html:option value="3"><fmt:message key="label.common.summary.count" /></html:option>
+		</html:select>
+		</div>
+		<div class="checkbox">
+		    <label>
+	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+		    </label>
+	  	</div>
+	  	</div>
+	</div>	
+	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="visible-sm-block visible-md-block btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+ 	<!--  end options -->
+  
+ </html:form>
 
-	<div class="field-name"><fmt:message key="label.common.min" /></div>
-	<html:text styleId="min" property="min" size="10" />
-	<div class="field-name space-top"><fmt:message key="label.common.max" /></div>
-	<html:text styleId="max" property="max" size="10" />
-	<div class="field-name space-top"><fmt:message key="label.authoring.basic.number.digitsdecimal" /></div>
-	<html:text styleId="digitsDecimal" property="digitsDecimal" size="10" />
-	<div class="space-top"><html:checkbox property="questionRequired" styleId="questionRequired" styleClass="noBorder">
-		<fmt:message key="label.authoring.basic.required" />
-	</html:checkbox></div>
-	<div class="field-name space-top"><fmt:message key="label.common.summary" /></div>
-	<html:select property="summary" styleClass="noBorder">
-	<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
-		<html:option value="1"><fmt:message key="label.common.summary.sum" /></html:option>
-		<html:option value="2"><fmt:message key="label.common.summary.average" /></html:option>
-		<html:option value="3"><fmt:message key="label.common.summary.count" /></html:option>
-	</html:select></div>
-</html:form>
-<lams:ImgButtonWrapper>
-	<a href="#" onclick="javascript:submitDacoQuestion()" class="button-add-item"><fmt:message
-		key="label.authoring.basic.number.add" /> </a>
-	<a href="#" onclick="javascript:cancelDacoQuestion()" class="button space-left"><fmt:message key="label.common.cancel" /> </a>
-</lams:ImgButtonWrapper>
+<c:set var="addButtonMessageKey" value="label.authoring.basic.number.add" />
+<%@ include file="buttons.jsp"%>
 
+</div>
+</div>
+
 </body>
 </lams:html>
Index: lams_tool_daco/web/pages/authoring/parts/addradio.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/parts/addradio.jsp	(.../addradio.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_daco/web/pages/authoring/parts/addradio.jsp	(.../addradio.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -5,7 +5,7 @@
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
-	<lams:css style="main" />
+	<lams:css />
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var removeAnswerOptionUrl = "<c:url value='/authoring/removeAnswerOption.do'/>";
@@ -18,6 +18,13 @@
 </lams:head>
 <body class="tabpart">
 
+<div class="panel panel-default">
+<div class="panel-heading">
+	<div class="panel-title"><fmt:message key="label.authoring.basic.radio" /></div>
+</div>
+
+<div class="panel-body">
+
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
@@ -26,43 +33,43 @@
 	<html:hidden property="questionIndex" />
 	<input type="hidden" id="answerOptionList" name="answerOptionList" />
 
-	<h2 class="no-space-left"><fmt:message key="label.authoring.basic.radio" /></h2>
-	<div><fmt:message key="label.authoring.basic.radio.help" /></div>
+	<p><fmt:message key="label.authoring.basic.radio.help" /></p>
 
-	<div class="field-name space-top"><fmt:message key="label.authoring.basic.description" /></div>
+	<%@ include file="description.jsp"%>
 
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
-	<lams:CKEditor id="description" value="${formBean.description}" 
-		contentFolderID="${sessionMap.contentFolderID}"
-                width="100%"
-                resizeParentFrameName="questionInputArea">
-	</lams:CKEditor>
-	<div class="space-bottom-top"><a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()"><fmt:message
-		key="label.authoring.basic.additionaloptions.show" /> </a><br />
+  	<!--  Options -->  
+	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<div id="additionalOptionsArea" style="display: none;">
+ 		<div class="form-inline">
+		<div class="form-group">
+    	<label for="summary"><fmt:message key="label.common.summary" /></label>
+    	<label for="summary"><fmt:message key="label.common.summary" />&nbsp;
+		<html:select property="summary"  styleClass="form-control">
+			<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
+			<html:option value="2" ><fmt:message key="label.common.summary.average" /></html:option>
+			<html:option value="3" ><fmt:message key="label.common.summary.count" /></html:option>
+		</html:select>
+		</div>
+		<div class="checkbox">
+		    <label>
+	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+		    </label>
+	  	</div>
+	  	</div>
 	</div>
+ 	<!--  end options -->
 
-	<div id="additionalOptionsArea" style="display: none;"><html:checkbox property="questionRequired"
-		styleId="questionRequired" styleClass="noBorder">
-		<fmt:message key="label.authoring.basic.required" />
-	</html:checkbox>
+ </html:form>
 
-	<div class="field-name space-top"><fmt:message key="label.common.summary" /></div>
-	<html:select property="summary" styleClass="noBorder">
-	<html:option value="0" styleId="noSummaryOption"><fmt:message key="label.common.summary.none" /></html:option>
-		<html:option value="2"><fmt:message key="label.common.summary.average" /></html:option>
-		<html:option value="3"><fmt:message key="label.common.summary.count" /></html:option>
-	</html:select></div>
-</html:form>
-
 <!-- Answer options -->
 
 <%@ include file="answeroptions.jsp"%>
 
-<lams:ImgButtonWrapper>
-	<a href="#" onclick="javascript:submitDacoQuestion()" class="button-add-item"><fmt:message
-		key="label.authoring.basic.radio.add" /> </a>
-	<a href="#" onclick="javascript:cancelDacoQuestion()" class="button space-left"><fmt:message key="label.common.cancel" /> </a>
-</lams:ImgButtonWrapper>
+<c:set var="addButtonMessageKey" value="label.authoring.basic.radio.add" />
+<%@ include file="buttons.jsp"%>
+
+</div>
+</div>
+
 </body>
 </lams:html>
Index: lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	(.../addtextarea.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp	(.../addtextarea.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -5,7 +5,7 @@
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
-	<lams:css style="main" />
+	<lams:css/>
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
@@ -16,46 +16,48 @@
 </lams:head>
 <body class="tabpart">
 
+<div class="panel panel-default">
+<div class="panel-heading">
+	<div class="panel-title"><fmt:message key="label.authoring.basic.textarea" /></div>
+</div>
+
+<div class="panel-body">
+
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 <html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="dacoQuestionForm">
 	<html:hidden property="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="2" />
 	<html:hidden property="questionIndex" />
 	
-	<h2 class="no-space-left"><fmt:message key="label.authoring.basic.textarea" /></h2>
-<div><fmt:message key="label.authoring.basic.textarea.help" /></div>
+	<p><fmt:message key="label.authoring.basic.textarea.help" /></p>
 	
-	<div class="field-name space-top"><fmt:message key="label.authoring.basic.description" /></div>
+	<%@ include file="description.jsp"%>
+ 
+   	<!--  Options -->  
+	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
+	<div id="additionalOptionsArea" style="display: none;">
+ 		<div class="form-inline">
+ 		<div class="form-group">
+    	<label for="max"><fmt:message key="label.authoring.basic.max.word" /></label>
+ 		<html:text styleId="max" property="max" size="10"  styleClass="form-control"/>
+		</div>
+		<div class="checkbox">
+		    <label>
+	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+		    </label>
+	  	</div>
+	  	</div>
+	</div>
+ 	<!--  end options -->
+  	
+</html:form>
 
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
-	<lams:CKEditor id="description" value="${formBean.description}"
-		contentFolderID="${sessionMap.contentFolderID}"
-		width="100%"
-		resizeParentFrameName="questionInputArea">
-	</lams:CKEditor>
-	
-	<div class="space-bottom-top"><a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()"><fmt:message
-		key="label.authoring.basic.additionaloptions.show" /> </a><br /></div>
+<c:set var="addButtonMessageKey" value="label.authoring.basic.textarea.add" />
+<%@ include file="buttons.jsp"%>
 
-	<div id="additionalOptionsArea" style="display:none;">
+</div>
+</div>
 
-	<div class="field-name"><fmt:message key="label.authoring.basic.max.word" /></div>
-	<html:text styleId="max" property="max" size="10" />
-	<div class="space-top">
-	<html:checkbox property="questionRequired" styleId="questionRequired"
-		styleClass="noBorder">
-		<fmt:message key="label.authoring.basic.required" />
-	</html:checkbox>
-	</div></div>
-	</html:form>
-<lams:ImgButtonWrapper>
-	<a href="#" onclick="javascript:submitDacoQuestion()" class="button-add-item"><fmt:message
-		key="label.authoring.basic.textarea.add" /> </a>
-	<a href="#" onclick="javascript:cancelDacoQuestion()" class="button space-left"><fmt:message key="label.common.cancel" />
-	</a>
-</lams:ImgButtonWrapper>
-
 </body>
 </lams:html>
Index: lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	(.../addtextfield.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp	(.../addtextfield.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -5,7 +5,7 @@
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
-	<lams:css style="main" />
+	<lams:css/>
 	<!-- To use in external script files. -->
 	<script type="text/javascript">
 	   var msgShowAdditionalOptions = "<fmt:message key='label.authoring.basic.additionaloptions.show' />";
@@ -16,7 +16,13 @@
 </lams:head>
 <body class="tabpart">
 
+<div class="panel panel-default">
+<div class="panel-heading">
+	<div class="panel-title"><fmt:message key="label.authoring.basic.textfield" /></div>
+</div>
 
+<div class="panel-body">
+
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
 
@@ -25,38 +31,33 @@
 	<input type="hidden" id="questionType" name="questionType" value="1" />
 	<html:hidden property="questionIndex" />
 
-	<h2 class="no-space-left"><fmt:message key="label.authoring.basic.textfield" /></h2>
-	<div><fmt:message key="label.authoring.basic.textfield.help" /></div>
+	<p><fmt:message key="label.authoring.basic.textfield.help" /></p>
 
-	<div class="field-name space-top"><fmt:message key="label.authoring.basic.description" /></div>
-
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
-	<lams:CKEditor id="description" value="${formBean.description}" 
-		contentFolderID="${sessionMap.contentFolderID}"
-                width="100%"
-                resizeParentFrameName="questionInputArea">
-	</lams:CKEditor>
-
-	<div class="space-bottom-top"><a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()"><fmt:message
-		key="label.authoring.basic.additionaloptions.show" /> </a><br />
-	</div>
-
+	<%@ include file="description.jsp"%>
+  	
+  	<!--  Options -->  
+	<a id="toggleAdditionalOptionsAreaLink" href="javascript:toggleAdditionalOptionsArea()" class="btn btn-default btn-xs pull-right"><fmt:message key="label.authoring.basic.additionaloptions.show" /> </a>
 	<div id="additionalOptionsArea" style="display: none;">
-
-	<div class="field-name"><fmt:message key="label.authoring.basic.max.char" /></div>
-	<html:text styleId="max" property="max" size="10" />
-	<div class="space-top"><html:checkbox property="questionRequired" styleId="questionRequired" styleClass="noBorder">
-		<fmt:message key="label.authoring.basic.required" />
-	</html:checkbox></div>
+ 		<div class="form-inline">
+ 		<div class="form-group">
+    	<label for=max><fmt:message key="label.authoring.basic.max.char" /></label>
+		<html:text styleId="max" property="max" size="10"  styleClass="form-control"/>
+		</div>
+		<div class="checkbox">
+		    <label>
+	 	      <html:checkbox property="questionRequired" styleId="questionRequired"/>&nbsp;<fmt:message key="label.authoring.basic.required" />
+		    </label>
+	  	</div>
+	  	</div>
 	</div>
+ 	<!--  end options -->
+  			
 </html:form>
 
-<lams:ImgButtonWrapper>
-	<a href="#" onclick="javascript:submitDacoQuestion()" class="button-add-item"><fmt:message
-		key="label.authoring.basic.textfield.add" /> </a>
-	<a href="#" onclick="javascript:cancelDacoQuestion()" class="button space-left"><fmt:message key="label.common.cancel" /> </a>
-</lams:ImgButtonWrapper>
+<c:set var="addButtonMessageKey" value="label.authoring.basic.textfield.add" />
+<%@ include file="buttons.jsp"%>
 
+</div>
+</div>
 </body>
 </lams:html>
Index: lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp
===================================================================
diff -u -rc367db7b5c528a0daed19a7bf7b3088e3b1268bc -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp	(.../answeroptions.jsp)	(revision c367db7b5c528a0daed19a7bf7b3088e3b1268bc)
+++ lams_tool_daco/web/pages/authoring/parts/answeroptions.jsp	(.../answeroptions.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -4,20 +4,24 @@
 <c:set var="listSize" value="${fn:length(answerOptionList)}" />
 <c:set var="ordinal"><fmt:message key="label.authoring.basic.answeroption.ordinal"/></c:set>
 
-<div id="answerOptionsArea" class="space-bottom-top">
+<div id="answerOptionsArea" class="voffset5">
 <form id="answerOptionsForm"><input type="hidden" id="answerOptionCount" name="answerOptionCount" value="${listSize}"/>
-<div class="field-name"><fmt:message key="label.authoring.basic.answeroption" /></div>
-<a href="#" onclick="javascript:addAnswerOption()" class="btn btn-default btn-sm pull-left"><fmt:message
-	key="label.authoring.basic.answeroption.add" /></a>
+
+<div class="form-group"><label><fmt:message key="label.authoring.basic.answeroption" /></label>
+<a href="#" onclick="javascript:addAnswerOption()" class="btn btn-default btn-xs loffset5">
+	<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.answeroption.add" />
+</a>
+
+<%-- This image is shown when answer options are downloaded from a server. --%>
+<img src="${ctxPath}/includes/images/indicator.gif"
+	style="display:none;" id="answerOptionsArea_Busy" name="answerOptionsArea_Busy"/>
+
 	
-		<%-- This image is shown when answer options are downloaded from a server. --%>
-		<img src="${ctxPath}/includes/images/indicator.gif"
-			style="display:none;" id="answerOptionsArea_Busy" name="answerOptionsArea_Busy"/>
-<table class="table table-condensed">
+<table class="table table-condensed table-no-border table-nonfluid">
 	<c:forEach var="item" items="${answerOptionList}" varStatus="status">
 		<tr>
 			<td width="3px">${fn:substring(ordinal,status.index,status.index+1)})</td>
-			<td><input type="text" name="answerOptionItemDesc${status.index+1}" id="answerOptionItemDesc${status.index+1}" size="60" value="<c:out  value='${item}'/>"></td>
+			<td><input type="text" name="answerOptionItemDesc${status.index+1}" id="answerOptionItemDesc${status.index+1}" size="60" value="<c:out  value='${item}'/>" class="form-control"></td>
 
 			<td class="arrows">
 			<!-- Don't display up icon if first line -->
@@ -36,10 +40,12 @@
 		</tr>
 	</c:forEach>
 </table> 
+</div>
+
 </form>
 </div>
 
 <%-- This script will adjust question input area height according to the new answer option count. --%>
-<script type="text/javascript">
+<!-- <script type="text/javascript">
 	resizeQuestionInputArea ();
-</script>
\ No newline at end of file
+</script> -->
\ No newline at end of file
Index: lams_tool_daco/web/pages/authoring/parts/buttons.jsp
===================================================================
diff -u
--- lams_tool_daco/web/pages/authoring/parts/buttons.jsp	(revision 0)
+++ lams_tool_daco/web/pages/authoring/parts/buttons.jsp	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -0,0 +1,4 @@
+<div class="voffset5">
+	<a href="#" onclick="javascript:submitDacoQuestion()" class="btn btn-default btn-xs"> <fmt:message key="${addButtonMessageKey}" /> </a>
+	<a href="#" onclick="javascript:cancelDacoQuestion()" class="btn btn-default btn-xs loffset5"> <fmt:message key="label.common.cancel" /> </a>
+</div>
Index: lams_tool_daco/web/pages/authoring/parts/description.jsp
===================================================================
diff -u
--- lams_tool_daco/web/pages/authoring/parts/description.jsp	(revision 0)
+++ lams_tool_daco/web/pages/authoring/parts/description.jsp	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -0,0 +1,11 @@
+	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
+	<div class="form-group">
+    	<label for="description"><fmt:message key="label.authoring.basic.description" /></label>
+		<lams:CKEditor id="description" value="${formBean.description}" 
+			contentFolderID="${sessionMap.contentFolderID}"
+	                width="100%"
+	                resizeParentFrameName="questionInputArea">
+		</lams:CKEditor>
+	</div>
+  
Index: lams_tool_daco/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -rd55722236d2f82c6bb0c46a30cbc39c22ac01943 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
+++ lams_tool_daco/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -71,19 +71,7 @@
 
 <%-- This script will work when a new question is submited in order to refresh "Question List" panel. --%>
 <script type="text/javascript">
-	var win = null;
-	try {
-		if (window.parent && window.parent.hideQuestionInputArea) {
-			win = window.parent;
-		} else if (window.top && window.top.hideQuestionInputArea) {
-			win = window.top;
-		}
-	} catch(err) {
-		// mute cross-domain iframe access errors
-	}
-	if (win) {
-		win.hideQuestionInputArea();
-		var obj = win.document.getElementById('questionListArea');
-		obj.innerHTML= document.getElementById("questionList").innerHTML;
-	}
+	hideQuestionInputArea();
+	var obj = document.getElementById('questionListArea');
+	obj.innerHTML= document.getElementById("questionList").innerHTML;
 </script>
\ No newline at end of file
Index: lams_tool_daco/web/pages/learning/addRecord.jsp
===================================================================
diff -u -r303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision 303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f)
+++ lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -95,10 +95,10 @@
 									depending on the maximum number of characters the teacher provided
 								--%>
 								<c:when test="${question.max!=null}">
-									<html:text property="answer[${answerIndex}]" size="60" maxlength="${question.max}" />
+									<html:text property="answer[${answerIndex}]" size="60" maxlength="${question.max}"  styleClass="form-control"/>
 								</c:when>
 								<c:otherwise>
-									<html:text property="answer[${answerIndex}]" size="60" />
+									<html:text property="answer[${answerIndex}]" size="60"  styleClass="form-control"/>
 								</c:otherwise>
 							</c:choose>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
@@ -108,7 +108,7 @@
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
 							</c:if>
-							<html:textarea property="answer[${answerIndex}]" cols="60" rows="3" />
+							<html:textarea property="answer[${answerIndex}]" cols="60" rows="3"  styleClass="form-control"/>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
 						<c:when test="${question.type==3}"><%-- Number --%>
@@ -126,33 +126,40 @@
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
 							</c:if>
-							<html:text property="answer[${answerIndex}]" size="10" />
+							<html:text property="answer[${answerIndex}]" size="10"  styleClass="form-control"/>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
 						<c:when test="${question.type==4}"><%-- Date can be entered in three textfields --%>
 							<div class="hint"><fmt:message key="label.learning.date.hint" /></div>
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
 							</c:if>
-							<label><fmt:message key="label.learning.date.day" /></label>
-							<html:text property="answer[${answerIndex}]" size="3" />&nbsp;
-							
+							<span class="form-inline">
+								<div class="form-group">
+								<label><fmt:message key="label.learning.date.day" /></label>
+								<html:text property="answer[${answerIndex}]" size="3"  styleClass="form-control"/>&nbsp;
+								</div>
+								
+								<div class="form-group">
+								<c:set var="answerIndex" value="${answerIndex+1}" />
+								<label><fmt:message key="label.learning.date.month" /></label>
+								<html:text property="answer[${answerIndex}]" size="3"  styleClass="form-control"/>&nbsp;
+								</div>
+								
+								<div class="form-group">
+								<c:set var="answerIndex" value="${answerIndex+1}" />
+								<label><fmt:message key="label.learning.date.year" /></label>
+								<html:text property="answer[${answerIndex}]" size="5"  styleClass="form-control"/>
+								</div>
+							</span>							
 							<c:set var="answerIndex" value="${answerIndex+1}" />
-							<label><fmt:message key="label.learning.date.month" /></label>
-							<html:text property="answer[${answerIndex}]" size="3" />&nbsp;
-							
-							<c:set var="answerIndex" value="${answerIndex+1}" />
-							<label><fmt:message key="label.learning.date.year" /></label>
-							<html:text property="answer[${answerIndex}]" size="5" />
-							
-							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
 						<c:when test="${question.type==5}"><%-- File --%>
 							<div class="hint"><fmt:message key="label.learning.file.hint" /></div>
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
 							</c:if>
-							<html:file styleId="file-${fileNumber+1}" property="file[${fileNumber}]" size="50" />
+							<html:file styleId="file-${fileNumber+1}" property="file[${fileNumber}]" size="50"/>
 							<c:set var="fileNumber" value="${fileNumber+1}" />
 						</c:when>
 						<c:when test="${question.type==6}"><%-- Image --%>
@@ -170,7 +177,8 @@
 							</c:if>
 							<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
 							<%-- It displays for example A) instead of 1) --%>
-							${fn:substring(ordinal,status.index,status.index+1)}) <html:radio property="answer[${answerIndex}]" value="${status.index+1}">&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/></html:radio><br />
+							${fn:substring(ordinal,status.index,status.index+1)}) 
+							<html:radio property="answer[${answerIndex}]" value="${status.index+1}"><label>&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/></label></html:radio><br />
 							</c:forEach>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
@@ -179,8 +187,8 @@
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
 							</c:if>
-							<html:select property="answer[${answerIndex}]">
-							<html:option value="0"><fmt:message key="label.learning.dropdown.select" /></html:option>
+							<html:select property="answer[${answerIndex}]"  styleClass="form-control">
+							<html:option value="0"><fmt:message key="label.learning.dropdown.select"/></html:option>
 							<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
 								<html:option value="${status.index+1}"><c:out value="${answerOption.answerOption}" escapeXml="true"/></html:option>
 							</c:forEach>
@@ -194,10 +202,10 @@
 							</c:if>
 							<html:hidden  styleId="checkbox-${questionStatus.index+1}" property="answer[${answerIndex}]" />
 							<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
-							${fn:substring(ordinal,status.index,status.index+1)})
-							<input type="checkbox" id="checkbox-${questionStatus.index+1}-${status.index+1}" value="${status.index+1}">
-								<c:out value="${answerOption.answerOption}" escapeXml="true"/>
-							</input><br />
+							${fn:substring(ordinal,status.index,status.index+1)}) 
+							<input type="checkbox" id="checkbox-${questionStatus.index+1}-${status.index+1}" value="${status.index+1}"/>
+							<label><c:out value="${answerOption.answerOption}" escapeXml="true"/>
+							</label><br/>
 							</c:forEach>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
@@ -207,27 +215,28 @@
 								</td>
 								<td>
 							</c:if>
-							<table class="alternative-color-inner-table">
-								<tr>
-									<td width="80px">
-									<label><fmt:message key="label.learning.longlat.longitude" /></label>
-									</td>
-									<td>
-									<html:text property="answer[${answerIndex}]" size="10" />
-									<label><fmt:message key="label.learning.longlat.longitude.unit" /></label><br />
-									</td>									
-								</tr>
-								<c:set var="answerIndex" value="${answerIndex+1}" />
-								<tr>
-									<td>
-									<label><fmt:message key="label.learning.longlat.latitude" /></label>
-									</td>
-									<td>
-									<html:text property="answer[${answerIndex}]" size="10" />
-									<label><fmt:message key="label.learning.longlat.latitude.unit" /></label><br />
-									</td>
-								</tr>
-							</table>
+								<div class="form-horizontal">
+									<div class="form-group  no-gutter">
+									<label class="col-sm-2 control-label"><fmt:message key="label.learning.longlat.longitude" /></label>
+									<div class="col-sm-2">
+									<html:text property="answer[${answerIndex}]" size="10"  styleClass="form-control "/>
+									</div>
+									<div class="col-sm-1">
+									<p class="form-control-static"><fmt:message key="label.learning.longlat.longitude.unit" /></p>
+									</div>								
+									</div>
+									<c:set var="answerIndex" value="${answerIndex+1}" />
+												
+									<div class="form-group  no-gutter">
+									<label class="col-sm-2 control-label"><fmt:message key="label.learning.longlat.latitude" /></label>
+									<div class="col-sm-2">
+									<html:text property="answer[${answerIndex}]" size="10"  styleClass="form-control"/>
+									</div>
+									<div class="col-sm-1">
+									<p class="form-control-static"><fmt:message key="label.learning.longlat.latitude.unit" /></p>
+									</div>
+									</div>
+								</div>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
 					</c:choose>
Index: lams_tool_daco/web/pages/learning/listRecords.jsp
===================================================================
diff -u -rd55722236d2f82c6bb0c46a30cbc39c22ac01943 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/learning/listRecords.jsp	(.../listRecords.jsp)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
+++ lams_tool_daco/web/pages/learning/listRecords.jsp	(.../listRecords.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -183,7 +183,7 @@
 														<c:if test="${answer.answer==status.index+1}">
 														checked="checked"
 														</c:if>
-														>
+														>&nbsp;
 														<c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
 													</c:forEach>
 												</c:when>
@@ -203,11 +203,11 @@
 												</c:when>
 												<c:when test="${question.type==9}">
 													<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
-														<input type="checkbox" disabled="disabled" id="${elementIdPrefix}checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${status.index+1}"><c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
+														<input type="checkbox" disabled="disabled" id="${elementIdPrefix}checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${status.index+1}">&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
 													</c:forEach>
 												</c:when>
 												<c:when test="${question.type==10}">
-													<table class="alternative-color-inner-table">
+													<table class="table table-condensed table-no-border table-nonfluid">
 														<tr>
 															<td width="80px">
 																<label><fmt:message key="label.learning.longlat.longitude" /></label>
@@ -257,4 +257,4 @@
 		</c:choose> <!--  end vertical/horizontal -->
 	</c:otherwise> 
 </c:choose>
-</div>
+</div>
\ No newline at end of file
Index: lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp
===================================================================
diff -u -rbe37ea9b52fd18c106254805e3cc45a6581bdd87 -r756d63ed6f0fe8da2cbd61b5420f49def38d7590
--- lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	(.../listRecordsHorizontalPart.jsp)	(revision be37ea9b52fd18c106254805e3cc45a6581bdd87)
+++ lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	(.../listRecordsHorizontalPart.jsp)	(revision 756d63ed6f0fe8da2cbd61b5420f49def38d7590)
@@ -161,12 +161,13 @@
 												<input type="text" size="10" readonly="readonly" value="<c:out  value='${answer.answer}'/>"/>
 											</c:when>
  											<c:when test="${question.type==4}">
-<%-- 												<c:set var="date">
+												<c:set var="date">
 													<c:if test="${not empty answer.answer}">
-														<lams:Date value="${fn:trim(answer.answer)}" type="date" style="medium"/>
-													</c:if>
+														<fmt:parseDate pattern="EEE MMM dd HH:mm:ss zzz yyyy" value="${answer.answer}" var="parsedDate" />
+														<lams:Date value="${parsedDate}" type="date" style="medium"/>
+														</c:if>
 												</c:set>
- --%>												<input type="text" size="20" readonly="readonly" value="${date}" />
+												<input type="text" size="20" readonly="readonly" value="${date}" />
 											</c:when>
 											<c:when test="${question.type==5 || question.type==6}">
 												<c:choose>
@@ -175,12 +176,12 @@
 													</c:when>
 													<c:otherwise>
 														<fmt:message key="label.learning.file.uploaded" />
-														<a href="<c:url value='/download/?uuid=${answer.fileUuid}&preferDownload=true'/>">${answer.fileName}</a>
+														<a href="<c:url value='/download/?uuid=${answer.fileUuid}&preferDownload=true'/>">&nbsp;${answer.fileName}</a>
 													</c:otherwise>
 												</c:choose>
 											</c:when>
 											<c:when test="${question.type==7}">
-												<table class="alternative-color-inner-table">
+												<table class="table table-condensed table-no-border table-nonfluid">
 													<tr>
 														<td>
 															<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
@@ -192,7 +193,7 @@
 																<c:if test="${answer.answer==status.index+1}">
 																checked="checked"
 																</c:if>
-																>
+																>&nbsp;
 																<c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
 															</c:forEach>
 														</td>
@@ -207,29 +208,29 @@
 													<c:otherwise>
 														<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
 															<c:if test="${status.index+1==answer.answer}">
-																<fmt:message key="label.learning.dropdown.selected" /> <c:out value="${answerOption.answerOption}" escapeXml="true"/>
+																<fmt:message key="label.learning.dropdown.selected" />&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/>
 															</c:if>
 														</c:forEach>
 													</c:otherwise>
 												</c:choose>
 											</c:when>
 											<c:when test="${question.type==9}">
-												<table class="alternative-color-inner-table">
+												<table class="table table-condensed table-no-border table-nonfluid">
 													<tr>
 														<td>
 															<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
 																<c:if test="${status.index>0 && (status.index%3==0)}">
 																	</td>
 																	<td>
 																</c:if>
-																<input type="checkbox" disabled="disabled" id="checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${status.index+1}"><c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
+																<input type="checkbox" disabled="disabled" id="checkbox-record${recordStatus.index+1}-question${questionStatus.index+1}-${status.index+1}">&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/></input><br />
 															</c:forEach>
 														</td>
 													</tr>
 												</table>
 											</c:when>
 											<c:when test="${question.type==10}">
-												<table class="alternative-color-inner-table">
+												<table class="table table-condensed table-no-border table-nonfluid">
 													<tr>
 														<td width="80px">
 														<label><fmt:message key="label.learning.longlat.longitude" /></label>