Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java,v
diff -u -r1.41.2.3 -r1.41.2.4
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	11 May 2016 07:35:35 -0000	1.41.2.3
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	19 May 2016 10:23:59 -0000	1.41.2.4
@@ -56,12 +56,6 @@
 /**
  * @author Manpreet Minhas
  * @author Steve Ni
- *
- *
- *
- *
- *
- *
  */
 public class AuthoringAction extends LamsDispatchAction {
     private Logger log = Logger.getLogger(AuthoringAction.class);
@@ -95,6 +89,7 @@
 
 	SessionMap sessionMap = new SessionMap();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+	sessionMap.put(AttributeNames.PARAM_MODE, mode);
 
 	Long contentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
@@ -120,9 +115,8 @@
 	authForm.initContentValue(persistContent);
 	// session map
 	authForm.setSessionMapID(sessionMap.getSessionID());
-	// current tab
-	authForm.setCurrentTab(request.getParameter("currentTab"));
 	authForm.setContentFolderID(contentFolderID);
+	
 
 	return mapping.findForward("success");
     }
Index: lams_tool_sbmt/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_sbmt/web/WEB-INF/struts-config.xml	27 Apr 2016 13:22:34 -0000	1.1.2.1
+++ lams_tool_sbmt/web/WEB-INF/struts-config.xml	19 May 2016 10:23:59 -0000	1.1.2.2
@@ -191,16 +191,6 @@
       />
     </action>
 
-   <!-- ========== Action Mapping Definitions ============================== -->
-		<action path="/definelater" type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction" 
-				name="SbmtAuthoringForm" 
-				scope="request" 
-				input="/authoring/definelater.jsp"
-				parameter="dispatch" 
-				validate="false">
-			<forward name="success" path="/authoring/definelater.jsp"/>
-			<forward name="forbidden" path="/authoring/definelaterforbid.jsp"/>
-		</action>
 		<!--  ========= Reflection =============== -->
 		<action path="/learning/newReflection"
 			type="org.lamsfoundation.lams.tool.sbmt.web.ReflectAction"
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/AdvancedAccordian.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/Arrow.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.21 -r1.21.2.1
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	23 Jul 2013 17:52:34 -0000	1.21
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	19 May 2016 10:23:59 -0000	1.21.2.1
@@ -122,12 +122,12 @@
     	window.close();
     }  				
 </script>	
-<p id="saveCancelButtons" >
-		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
-			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
+<div id="saveCancelButtons" >
+		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
-</p>
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
+		</html:link>
+</div>
 <!-- end tab content -->
\ No newline at end of file
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingCriteria.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.1 -r1.14.2.2
--- lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	3 Sep 2014 13:19:26 -0000	1.14.2.1
+++ lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	19 May 2016 10:23:59 -0000	1.14.2.2
@@ -10,7 +10,12 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 <%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%>
+<%@ attribute name="method" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty method}">
+	<c:set var="method" value="inline" />
+</c:if>
+
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -19,6 +24,10 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
+<c:if test="${fn:containsIgnoreCase(method,'Inline')}">
+	<c:set var="toolbarSet">${toolbarSet}Inline</c:set>
+</c:if>
+
 <c:if test="${empty displayExpanded}">
 	<c:set var="displayExpanded" value="true" />
 </c:if>
@@ -33,10 +42,10 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
-	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
+	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
 </c:if>
 
@@ -59,10 +68,9 @@
 	    var editor = CKEDITOR.instances["${id}"];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.replace( "${id}", {
+		var instance = CKEDITOR.${method}( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
-				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/Comments.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/CommentsAuthor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	6 Mar 2016 08:19:07 -0000	1.1.2.2
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	19 May 2016 10:23:59 -0000	1.1.2.3
@@ -12,25 +12,38 @@
 <div class="row no-gutter">
 	<div class="col-xs-12">
 		<div class="container" id="content">
+		
+		<c:choose>
+		<c:when test='${type == "navbar"}'>
+			<jsp:doBody />
+		</c:when> 
+		<c:otherwise>
 			<div class="panel panel-default panel-${type}-page">
-				<div class="panel-heading">
-					<c:if test="${not empty title}">
+				<c:if test="${not empty title}">
+					<div class="panel-heading">
 						<div class="panel-title panel-${type}-title">
 							<c:out value="${title}" escapeXml="true" />
 							<c:if test="${not empty titleHelpURL}">
 								<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
 							</c:if>
 						</div>
-					</c:if>
-					<c:if test="${not empty headingContent}">
-						<c:out value="${headingContent}" escapeXml="true" />
-					</c:if>
-				</div>
+						<c:if test="${not empty headingContent}">
+							<c:out value="${headingContent}" escapeXml="true" />
+						</c:if>
+					</div>
+				</c:if>
 				<div class="panel-body panel-${type}-body">
 					<jsp:doBody />
 				</div>
 			</div>
+		</c:otherwise>
+		</c:choose>
+			
 		</div>
 		<!-- End content container -->
 	</div>
 </div>
+
+
+		
+			
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/Rating.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/RestrictedUsageAccordian.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/TSTable.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/WEB-INF/tags/Tab.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Tab.tag,v
diff -u -r1.12 -r1.12.12.1
Binary files differ
Index: lams_tool_sbmt/web/WEB-INF/tags/TabBody.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/TabBody.tag,v
diff -u -r1.6 -r1.6.14.1
Binary files differ
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/TabBodyArea.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/TabBodys.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/WEB-INF/tags/TabName.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/TabName.tag,v
diff -u -r1.5 -r1.5.2.1
Binary files differ
Index: lams_tool_sbmt/web/WEB-INF/tags/Tabs.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Tabs.tag,v
diff -u -r1.8 -r1.8.14.1
Binary files differ
Index: lams_tool_sbmt/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.8.2.1 -r1.8.2.2
--- lams_tool_sbmt/web/WEB-INF/tags/headItems.tag	10 Feb 2016 10:01:38 -0000	1.8.2.1
+++ lams_tool_sbmt/web/WEB-INF/tags/headItems.tag	19 May 2016 10:23:59 -0000	1.8.2.2
@@ -41,7 +41,9 @@
 	<lams:WebAppURL />
 </c:set>
 
-<lams:css style="main"/>
+<lams:css/>
 
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/advance.jsp,v
diff -u -r1.16.2.1 -r1.16.2.2
--- lams_tool_sbmt/web/authoring/advance.jsp	31 Jan 2016 23:50:15 -0000	1.16.2.1
+++ lams_tool_sbmt/web/authoring/advance.jsp	19 May 2016 10:23:59 -0000	1.16.2.2
@@ -1,92 +1,72 @@
 <%@include file="/common/taglibs.jsp"%>
 
-<!-- Advance Tab Content -->
 
-<p class="small-space-top">
-	<html:checkbox property="lockOnFinished" styleClass="noBorder" styleId="lockOnFinished">
-	</html:checkbox>
+<!-- ========== Advanced Tab ========== -->
+
+<script type="text/javascript">
+	$(document).ready(function(){
+		$('#limitUpload').change(function(){
+			var enabled = $(this).is(':checked');
+			$('#limitUploadNumber').prop('disabled', !enabled);
+		}).change();
+		
+		$('#reflectInstructions').keyup(function(){
+			var checked = $(this).val() != null && $(this).val().trim() != '';
+			$('#reflectOnActivity').prop('checked', checked)
+		});
+	});
+</script>
+
+<div class="checkbox">
 	<label for="lockOnFinished">
+		<html:checkbox property="lockOnFinished" styleId="lockOnFinished" />
 		<fmt:message key="label.authoring.advance.lock.on.finished" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="limitUpload" styleId="limitUpload"
-		styleClass="noBorder" onclick="limitUploadChange()">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="limitUpload">
+		<html:checkbox property="limitUpload" styleId="limitUpload" />
 		<fmt:message key="label.limit.number.upload" />
 	</label>
+</div>
 
-	<html:select property="limitUploadNumber" styleId="limitUploadNumber">
-		<html:option value="1">1</html:option>
-		<html:option value="2">2</html:option>
-		<html:option value="3">3</html:option>
-		<html:option value="4">4</html:option>
-		<html:option value="5">5</html:option>
-	</html:select>
-</p>
+<html:select property="limitUploadNumber" styleId="limitUploadNumber" styleClass="roffset5 form-control">
+	<html:option value="1">1</html:option>
+	<html:option value="2">2</html:option>
+	<html:option value="3">3</html:option>
+	<html:option value="4">4</html:option>
+	<html:option value="5">5</html:option>
+</html:select>
 
-<p>
-	<html:checkbox property="notifyLearnersOnMarkRelease" styleId="notifyLearnersOnMarkRelease"
-		styleClass="noBorder">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="notifyLearnersOnMarkRelease">
+		<html:checkbox property="notifyLearnersOnMarkRelease" styleId="notifyLearnersOnMarkRelease" />
 		<fmt:message key="label.authoring.advanced.notify.mark.release" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="notifyTeachersOnFileSubmit" styleId="notifyTeachersOnFileSubmit"
-		styleClass="noBorder">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="notifyTeachersOnFileSubmit">
+		<html:checkbox property="notifyTeachersOnFileSubmit" styleId="notifyTeachersOnFileSubmit" />
 		<fmt:message key="label.authoring.advanced.notify.onfilesubmit" />
 	</label>
-</p>
-<p>
-	<html:checkbox property="reflectOnActivity" styleClass="noBorder"
-		styleId="reflectOn">
-	</html:checkbox>
-	<label for="reflectOn">
+</div>
+
+<div class="checkbox">
+	<label for="notifyLearnersOnMarkRelease">
+		<html:checkbox property="notifyLearnersOnMarkRelease" styleId="notifyLearnersOnMarkRelease" />
+		<fmt:message key="label.authoring.advanced.notify.mark.release" />
+	</label>
+</div>
+
+<div class="checkbox">
+	<label for="reflectOnActivity">
+		<html:checkbox property="reflectOnActivity" styleId="reflectOnActivity" />
 		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:textarea property="reflectInstructions"
-		styleId="reflectInstructions" cols="50" rows="4" />
-
-</p>
-<script type="text/javascript">
-	function limitUploadChange(){
-		var lu = document.getElementById("limitUpload");
-		var lun = document.getElementById("limitUploadNumber");
-		if(lu.checked){
-			lun.disabled = false;
-		}else{
-			lun.disabled = true;
-		}
-	}
-	//initial set
-	limitUploadChange();
-</script>
-
-<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("reflectOn");
-	function turnOnRefect(){
-		if(isEmpty(ra.value)){
-		//turn off	
-			rao.checked = false;
-		}else{
-		//turn on
-			rao.checked = true;		
-		}
-	}
-
-	ra.onkeyup=turnOnRefect;
-//-->
-</script>
+<div class="form-group">
+	<html:textarea property="reflectInstructions" styleId="reflectInstructions" styleClass="form-control" cols="50" rows="4" />
+</div>
\ No newline at end of file
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/authoring.jsp,v
diff -u -r1.45.2.2 -r1.45.2.3
--- lams_tool_sbmt/web/authoring/authoring.jsp	26 Feb 2016 07:17:19 -0000	1.45.2.2
+++ lams_tool_sbmt/web/authoring/authoring.jsp	19 May 2016 10:23:59 -0000	1.45.2.3
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
             
-
 <%@include file="/common/taglibs.jsp"%>
 <c:set var="lams">
 	<lams:LAMSURL />
@@ -15,81 +14,59 @@
 	
 	<lams:headItems />
 	<title><fmt:message key="activity.title" /></title>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	
 	<script type="text/javascript">
-        function init(){
-            var tag = document.getElementById("currentTab");
-	    	if(tag.value != "")
-	    		selectTab(tag.value);
-            else
-                selectTab(1); //select the default tab;
-            
-        }     
-        
         function doSelectTab(tabId) {
-        	// start optional tab controller stuff
-        	var tag = document.getElementById("currentTab");
-	    	tag.value = tabId;
-	    	// end optional tab controller stuff
 	    	selectTab(tabId);
         } 
-        
-        function doSubmit(method) {
-        	document.getElementById("authoringForm").dispatch.value=method;
-        	document.getElementById("authoringForm").submit();
-        }
-        
     </script>
 
 </lams:head>
-<body class="stripes" onLoad="init()">
-	<div id="page">
+<body class="stripes">
+<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
+	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	
+	<html:hidden property="mode" value="${sessionMap.mode}" />
+	<html:hidden property="dispatch" value="updateContent" />
+	<html:hidden property="sessionMapID" />
+	<html:hidden property="toolContentID" />
+	<html:hidden property="contentFolderID" />
+	
+<lams:Page title="${title}" type="navbar">
+	
+	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= SbmtConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+		<lams:Tab id="1" key="label.authoring.heading.basic" />
+		<c:if test="${sessionMap.mode == 'author'}">
+			<lams:Tab id="2" key="label.authoring.heading.advance" />
+		</c:if>
+	</lams:Tabs> 
+	
+	<lams:TabBodyArea>
+		<%@ include file="/common/messages.jsp"%>
 
-
-		<h1>
-			<fmt:message key="label.authoring.heading" />
-		</h1>
-		<div id="header">
-			<lams:Tabs control="true">
-				<lams:Tab id="1" key="label.authoring.heading.basic" />
-				<lams:Tab id="2" key="label.authoring.heading.advance" />
-			</lams:Tabs>
-		</div>
-
-		<div id="content">
-
-			<%@ include file="/common/messages.jsp"%>
-
-			<lams:help toolSignature="<%= SbmtConstants.TOOL_SIGNATURE %>" module="authoring"/>
-			
-			<html:form action="authoring" method="post" styleId="authoringForm" enctype="multipart/form-data">
-				<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-			
-				<input type="hidden" name="mode" value="author">
-				<html:hidden property="sessionMapID" />
-				<html:hidden property="toolContentID" />
-				<html:hidden property="contentFolderID" />
-				<html:hidden property="currentTab" styleId="currentTab" />
-				<html:hidden property="dispatch" value="updateContent" />
-
-				<!-- tab content 1 (Basic) -->
-				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
-				<!-- end of content (Basic) -->
-
-				<!-- tab content 2 (Advanced) -->
+	     <lams:TabBodys>
+			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+			<c:if test="${sessionMap.mode == 'author'}">
 				<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
-				<!-- end of content (Advanced) -->
+			</c:if>
+	    </lams:TabBodys>
 
-				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
-					toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" 
-					customiseSessionID="${formBean.sessionMapID}" 
-					contentFolderID="${formBean.contentFolderID}"/>
-			</html:form>
-		</div>
-		<div id="footer"></div>
-	</div>
-	<!--closes page-->
+
+		<lams:AuthoringButton formID="authoringForm"
+			clearSessionActionUrl="/clearsession.do"
+			toolSignature="<%=SbmtConstants.TOOL_SIGNATURE%>"
+			accessMode="${sessionMap.mode}"
+			defineLater="${sessionMap.mode == 'teacher'}"
+			toolContentID="${formBean.toolContentID}"
+			customiseSessionID="${formBean.sessionMapID}" 
+			contentFolderID="${formBean.contentFolderID}" />
+	</lams:TabBodyArea>
+	
+	<div id="footer"></div>
+	
+</lams:Page>
+</html:form>
 </body>
-</lams:html>
+</lams:html>
\ No newline at end of file
Index: lams_tool_sbmt/web/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/basic.jsp,v
diff -u -r1.12 -r1.12.2.1
--- lams_tool_sbmt/web/authoring/basic.jsp	7 Apr 2014 20:18:44 -0000	1.12
+++ lams_tool_sbmt/web/authoring/basic.jsp	19 May 2016 10:23:59 -0000	1.12.2.1
@@ -1,26 +1,14 @@
-<%@include file="/common/taglibs.jsp"%>
-<c:set var="formBean"
-	value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<%@ include file="/common/taglibs.jsp"%>
 
-<!-- Basic Tab Content -->
-<table cellpadding="0">
-	<tr>
-		<td>
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.title"></fmt:message>
-			</div>
-			<html:text property="title" style="width: 99%;" maxlength="255"></html:text>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.instruction"></fmt:message>
-			</div>
-			<lams:CKEditor id="instructions"
-				value="${formBean.instructions}"
-				contentFolderID="${formBean.contentFolderID}">
-			</lams:CKEditor>
-		</td>
-	</tr>
-</table>
+<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
+
+<!-- ========== Basic Tab ========== -->
+<div class="form-group">
+    <label for="title"><fmt:message key="label.authoring.basic.title"/></label>
+    <html:text property="title" styleClass="form-control"></html:text>
+</div>
+<div class="form-group">
+    <label for="instructions"><fmt:message key="label.authoring.basic.instruction" /></label>
+    <lams:CKEditor id="instructions" value="${formBean.instructions}" contentFolderID="${sessionMap.contentFolderID}"></lams:CKEditor>
+</div>
\ No newline at end of file
Fisheye: Tag 1.13.2.2 refers to a dead (removed) revision in file `lams_tool_sbmt/web/authoring/definelater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.7.2.2 refers to a dead (removed) revision in file `lams_tool_sbmt/web/authoring/definelaterforbid.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?