Index: lams_tool_laqa/web/authoring/conditions.jsp
===================================================================
diff -u -r55645d4b796f36715b66a70fce66406a986ee647 -r320934945c495ab0832be6fb547d83812ac3152a
--- lams_tool_laqa/web/authoring/conditions.jsp	(.../conditions.jsp)	(revision 55645d4b796f36715b66a70fce66406a986ee647)
+++ lams_tool_laqa/web/authoring/conditions.jsp	(.../conditions.jsp)	(revision 320934945c495ab0832be6fb547d83812ac3152a)
@@ -1,102 +1,60 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean"
-	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-<script lang="javascript">
-<!-- Common Javascript functions for LAMS -->
-
-	/**
-	 * Launches the popup window for the instruction files
-	 */
+<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<script type="text/javascript">
 	function showConditionMessage(url) {
-		var area=document.getElementById("conditionInputArea");
-		if(area != null){
-			area.style.width="650px";
-			area.style.height="100%";
-			area.src=url;
-			area.style.display="block";
-		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="none";
-		}
-		location.hash = "conditionInputArea";
+		$("#conditionInputArea").load(url, function() {
+			$(this).show();
+			$("#saveCancelButtons").hide();
+		});
 	}
 	function hideConditionMessage(){
-		var area=document.getElementById("conditionInputArea");
-		if(area != null){
-			area.style.width="0px";
-			area.style.height="0px";
-			area.style.display="none";
-		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="block";
-		}
+		$("#conditionInputArea").hide();
+		$("#saveCancelButtons").show();
 	}
-
+	
 	function editCondition(orderId,sessionMapID){
-		 var reqIDVar = new Date();
-		var url = "<c:url value="/authoring/editCondition.do?orderId="/>" + orderId +"&sessionMapID="+sessionMapID;;
+		var url = "<c:url value='/authoring/editCondition.do?orderId='/>"
+			  + orderId + "&sessionMapID=" + sessionMapID;
 		showConditionMessage(url);
 	}
-	//The panel of taskList list panel
-	var conditionListTargetDiv = "#conditionsArea";
-	function deleteCondition(orderId,sessionMapID){
-		var url = "<c:url value="/authoring/removeCondition.do"/>";
-	    var reqIDVar = new Date();
-		$(conditionListTargetDiv).load(
-			url,
-			{
-				orderId: orderId,
-				sessionMapID: sessionMapID
-			}
-		);
+	
+	function deleteCondition(orderId, sessionMapID){
+		$("#conditionsArea").load("<c:url value='/authoring/removeCondition.do'/>",{
+			'orderId' : orderId,
+			'sessionMapID' : sessionMapID
+		});
 	}
 	
 	function upCondition(orderId,sessionMapID){
-		var url = "<c:url value="/authoring/upCondition.do"/>";
-	    var reqIDVar = new Date();
-	    $(conditionListTargetDiv).load(
-			url,
-			{
-				orderId: orderId,
-				sessionMapID: sessionMapID
-			}
-		);
+		$("#conditionsArea").load("<c:url value='/authoring/upCondition.do'/>",{
+			'orderId' : orderId,
+			'sessionMapID' : sessionMapID
+		});
 	}
 	function downCondition(orderId,sessionMapID){
-		var url = "<c:url value="/authoring/downCondition.do"/>";
-	    var reqIDVar = new Date();
-		var param = "orderId=" + orderId + "&sessionMapID="+sessionMapID;;
-		$(conditionListTargetDiv).load(
-			url,
-			{
-				orderId: orderId,
-				sessionMapID: sessionMapID
-			}
-		);
+		$("#conditionsArea").load("<c:url value='/authoring/downCondition.do'/>",{
+			'orderId' : orderId,
+			'sessionMapID' : sessionMapID
+		});
 	}
+	
+	//Packs additional elements and submits the question form
+	function submitCondition(){
+		var form = $('#QaConditionForm');
+		$('#conditionInputArea').load(form.attr('action'), form.serialize());
+	} 
 
 </script>
 
 <!-- Conditions Tab Content -->
-
 <div id="conditionsArea">
 	<c:set var="sessionMapID" value="${formBean.httpSessionID}" />
 	<%@ include file="/authoring/conditionList.jsp"%>
 </div>
+ 
+ <div class="form-inline">
+	<a href="javascript:showConditionMessage('<html:rewrite page="/authoring/newConditionInit.do?sessionMapID=${formBean.httpSessionID}"/>');" 
+		class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.conditions.add.condition" /></a> 
+</div>
 
-<p class="small-space-bottom">
-	<a href="javascript:showConditionMessage('<html:rewrite page="/authoring/newConditionInit.do?sessionMapID=${formBean.httpSessionID}"/>');" class="button-add-item">
-	<fmt:message key="label.authoring.conditions.add.condition" /></a> 
-</p>
-
-
-<p>
-	<iframe
-		onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
-		id="conditionInputArea" name="conditionInputArea"
-		style="width:0px;height:0px;border:0px;display:none" frameborder="no"
-		scrolling="no">
-	</iframe>
-</p>
+<div id="conditionInputArea" name="conditionInputArea" class="voffset10"></div>
\ No newline at end of file