Index: lams_tool_notebook/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tiles-defs.xml,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_notebook/web/WEB-INF/tiles-defs.xml	18 Oct 2014 21:17:11 -0000	1.3.2.2
+++ lams_tool_notebook/web/WEB-INF/tiles-defs.xml	17 May 2016 10:20:13 -0000	1.3.2.3
@@ -26,71 +26,40 @@
 
 <tiles-definitions>
 	<!--  Begin: Layouts -->
-
-	<definition name="tiles:/layout:tab" path="/layouts/tabLayout.jsp">
-		<put name="header" value="tiles:/header:default" />
-		<put name="body" value="" />
+	<definition name="tiles:/layout" path="/layouts/layout.jsp">
+		<put name="header" value=""/>
 	</definition>
-
-	<definition name="tiles:/layout:learning" path="/layouts/learningLayout.jsp">
-		<put name="header" value="tiles:/header:learner" />
-		<put name="body" value="" />
-	</definition>
-
 	<!--  End: Layouts -->
 
 
-	<!-- Begin: Headers -->
-	<definition name="tiles:/header:default" path="/common/header.jsp">
-		<put name="headItems" value="/common/empty.jsp" type="page" />
-	</definition>
-	<definition name="tiles:/header:learner" path="/common/learnerheader.jsp">
-		<put name="headItems" value="/common/empty.jsp" type="page" />
-	</definition>
-	<!-- End: Headers -->
-
 	<!-- Begin: Authoring -->
-	<definition name="tiles:/authoring/main" extends="tiles:/layout:tab">
-		<put name="pageTitleKey" value="pageTitle.authoring" />
-		<put name="header" value="tiles:/header:authoring" type="definition" />
+	<definition name="tiles:/authoring/main" extends="tiles:/layout">
+		<put name="header" value="/pages/authoring/headItems.jsp" />
 		<put name="body" value="/pages/authoring/authoring.jsp" />
 	</definition>
-
-	<definition name="tiles:/header:authoring" extends="tiles:/header:default">
-		<put name="headItems" value="/pages/authoring/headItems.jsp" />
-	</definition>
 	<!-- End: Authoring -->
 
 
 	<!-- Begin: Learning -->
-	<definition name="tiles:/learning/main" extends="tiles:/layout:learning">
+	<definition name="tiles:/learning/main" extends="tiles:/layout">
 		<put name="body" value="/pages/learning/notebook.jsp" />
-		<put name="bodyMobile" value="/pages/learning/mobile/notebook.jsp"/>
 	</definition>
 
-	<definition name="tiles:/learning/submissionDeadline" extends="tiles:/layout:learning">
+	<definition name="tiles:/learning/submissionDeadline" extends="tiles:/layout">
 		<put name="body" value="/pages/learning/submissionDeadline.jsp" />
-		<put name="bodyMobile" value="/pages/learning/mobile/submissionDeadline.jsp"/>
 	</definition>
 	
-	<definition name="tiles:/learning/defineLater" extends="tiles:/layout:learning">
+	<definition name="tiles:/learning/defineLater" extends="tiles:/layout">
 		<put name="body" value="/pages/learning/defineLater.jsp" />
-		<put name="bodyMobile" value="/pages/learning/mobile/defineLater.jsp"/>
 	</definition>
 	<!-- End: Learning -->
 
 
 	<!-- Begin: Monitoring -->
-	<definition name="tiles:/monitoring/main" extends="tiles:/layout:tab">
-		<put name="pageTitleKey" value="pageTitle.monitoring" />
-		<put name="header" value="tiles:/header:monitoring/main" type="definition" />
+	<definition name="tiles:/monitoring/main" extends="tiles:/layout">
+		<put name="header" value="/pages/monitoring/headItems.jsp"/>
 		<put name="body" value="/pages/monitoring/monitoring.jsp" />
 	</definition>
-
-	<definition name="tiles:/header:monitoring/main" extends="tiles:/header:default">
-		<put name="headItems" value="/pages/monitoring/headItems.jsp" />
-	</definition>
-
 	<!-- End: Monitoring -->
 
-</tiles-definitions>
+</tiles-definitions>
\ No newline at end of file
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/urlrewrite.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/validation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/validator-rules.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_notebook/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_notebook/web/WEB-INF/tags/Arrow.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.18 -r1.18.2.1
Binary files differ
Index: lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.15.2.1 -r1.15.2.2
--- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	3 Sep 2014 13:19:28 -0000	1.15.2.1
+++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	17 May 2016 10:20:12 -0000	1.15.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_notebook/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_notebook/web/WEB-INF/tags/CommentsAuthor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	6 Mar 2016 08:20:22 -0000	1.1.2.2
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	17 May 2016 10:20:12 -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_notebook/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_notebook/web/WEB-INF/tags/TSTable.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/WEB-INF/tags/Tab.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Tab.tag,v
diff -u -r1.4 -r1.4.12.1
Binary files differ
Index: lams_tool_notebook/web/WEB-INF/tags/TabBody.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/TabBody.tag,v
diff -u -r1.3 -r1.3.14.1
Binary files differ
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_notebook/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_notebook/web/WEB-INF/tags/TabBodys.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/WEB-INF/tags/TabName.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/TabName.tag,v
diff -u -r1.5 -r1.5.2.1
Binary files differ
Index: lams_tool_notebook/web/WEB-INF/tags/Tabs.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Tabs.tag,v
diff -u -r1.3 -r1.3.14.1
Binary files differ
Index: lams_tool_notebook/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.8.2.1 -r1.8.2.2
Binary files differ
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	24 Feb 2016 12:35:35 -0000	1.3.2.3
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	17 May 2016 10:20:13 -0000	1.3.2.4
@@ -178,7 +178,7 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+      
       <attribute>
          <description>Output stylesheet based on the user preferences.</description>
          <name>style</name>
@@ -408,10 +408,18 @@
        <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>TabName</name>
        <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>
@@ -438,8 +446,24 @@
    	<tag-file>
 	    <name>Page</name>
 		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>
+   	<tag-file>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>    
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
    	</tag-file>  
    	<tag-file>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
@@ -481,5 +505,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>
Fisheye: Tag 1.1.14.1 refers to a dead (removed) revision in file `lams_tool_notebook/web/common/empty.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.14.1 refers to a dead (removed) revision in file `lams_tool_notebook/web/common/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.2.2 refers to a dead (removed) revision in file `lams_tool_notebook/web/common/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5.2.2 refers to a dead (removed) revision in file `lams_tool_notebook/web/common/learnerheader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.14.1 refers to a dead (removed) revision in file `lams_tool_notebook/web/common/message.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/common/messages.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/common/messages.jsp,v
diff -u -r1.2 -r1.2.10.1
--- lams_tool_notebook/web/common/messages.jsp	9 Dec 2008 05:40:32 -0000	1.2
+++ lams_tool_notebook/web/common/messages.jsp	17 May 2016 10:20:12 -0000	1.2.10.1
@@ -1,8 +1,8 @@
 <%-- Error Messages --%>
 <logic:messagesPresent>
-	<p class="warning">
+	<lams:Alert id="errorMessages" type="danger" close="false">
         <html:messages id="error">
-            <c:out value="${error}" escapeXml="false"/><br/>
+            <c:out value="${error}" escapeXml="false"/>
         </html:messages>
-	</p>
-</logic:messagesPresent>
\ No newline at end of file
+    </lams:Alert>
+</logic:messagesPresent>
Fisheye: Tag 1.5.14.2 refers to a dead (removed) revision in file `lams_tool_notebook/web/layouts/defaultLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_notebook/web/layouts/layout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.14.2 refers to a dead (removed) revision in file `lams_tool_notebook/web/layouts/learningLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3.2.2 refers to a dead (removed) revision in file `lams_tool_notebook/web/layouts/mobileLearningLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5.14.2 refers to a dead (removed) revision in file `lams_tool_notebook/web/layouts/tabLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/pages/authoring/addCondition.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/addCondition.jsp,v
diff -u -r1.6.2.4 -r1.6.2.5
--- lams_tool_notebook/web/pages/authoring/addCondition.jsp	26 Feb 2016 07:17:18 -0000	1.6.2.4
+++ lams_tool_notebook/web/pages/authoring/addCondition.jsp	17 May 2016 10:20:13 -0000	1.6.2.5
@@ -1,58 +1,37 @@
-<!DOCTYPE html>
-		
 <%@ include file="/common/taglibs.jsp"%>
 
-<lams:html>
-	<lams:head>
-		<%@ include file="/common/taglibs.jsp"%>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		<div class="panel-title">
+			<fmt:message key="label.authoring.conditions.add.condition" />
+		</div>
+	</div>
 
-		<c:set var="tool">
-			<lams:WebAppURL />
-		</c:set>
-		<title>
-			<fmt:message key="activity.title" />
-		</title>
-		<lams:headItems />
-		<lams:css style="main" />
-		
-		<script type="text/javascript"> 
-			function callHideConditionMessage() {
-				try {
-					if (window.parent && window.parent.hideConditionMessage) {
-						window.parent.hideConditionMessage();
-					} else if (window.top && window.top.hideConditionMessage) {
-						window.top.hideConditionMessage();
-					}
-				} catch(err) {
-					// mute cross-domain iframe access errors
-				}
-			}
-		</script>
-	</lams:head>
-	<body class="tabpart">
+	<div class="panel-body">
+
 		<!-- Basic Info Form-->
 		<%@ include file="/common/messages.jsp"%>
-		<html:form action="/authoring/saveOrUpdateCondition" method="post" styleId="notebookConditionForm" focus="displayName" >
+		<html:form action="/authoring/saveOrUpdateCondition" method="post"
+			styleId="notebookConditionForm" focus="displayName">
 			<html:hidden property="orderId" />
-			<h2 class="no-space-left">
-				<fmt:message key="label.authoring.conditions.add.condition" />
-			</h2>
 
-			<div class="field-name">
-            	<fmt:message key="label.authoring.conditions.condition.name" />
+			<div class="form-group">
+				<label for="displayName"><fmt:message
+						key="label.authoring.conditions.condition.name" /> *</label>
+				<html:text tabindex="1" property="displayName" size="51"
+					styleClass="form-control" />
 			</div>
-			<div class="small-space-bottom">
-         		<html:text property="displayName" size="51"/>
-			</div>
+
 			<%-- Text search form fields are being included --%>
-			<lams:TextSearch wrapInFormTag="false" sessionMapID="${sessionMapID}"  />
+			<lams:TextSearch wrapInFormTag="false" sessionMapID="${sessionMapID}" />
 		</html:form>
 
-		<lams:ImgButtonWrapper>
-			<a href="javascript:;" onclick="javascript:notebookConditionForm.submit();" class="button-add-item"><fmt:message
-					key="button.save" /> </a>
-			<a href="javascript:;" onclick="javascript:callHideConditionMessage()"
-				class="button space-left"><fmt:message key="label.cancel" /> </a>
-		</lams:ImgButtonWrapper>
-	</body>
-</lams:html>
+		<div class="voffset5">
+			<a href="#" onclick="submitCondition()"
+				class="btn btn-default btn-xs"><fmt:message key="label.save" />
+			</a> <a href="#" onclick="hideConditionMessage()"
+				class="btn btn-default btn-xs"><fmt:message key="button.cancel" />
+			</a>
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_notebook/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/advanced.jsp,v
diff -u -r1.5 -r1.5.14.1
--- lams_tool_notebook/web/pages/authoring/advanced.jsp	18 Oct 2006 03:18:47 -0000	1.5
+++ lams_tool_notebook/web/pages/authoring/advanced.jsp	17 May 2016 10:20:13 -0000	1.5.14.1
@@ -2,19 +2,16 @@
 
 <!-- ========== Advanced Tab ========== -->
 
-<p class="small-space-top">
-	<html:checkbox property="lockOnFinished" value="1"
-		styleClass="noBorder" styleId="lockOnFinished"></html:checkbox>
+<div class="checkbox">
 	<label for="lockOnFinished">
+		<html:checkbox property="lockOnFinished" styleId="lockOnFinished" />
 		<fmt:message key="advanced.lockOnFinished" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="allowRichEditor" value="1"
-		styleClass="noBorder" styleId="allowRichEditor"></html:checkbox>
+<div class="checkbox">
 	<label for="allowRichEditor">
+		<html:checkbox property="allowRichEditor" styleId="allowRichEditor" />
 		<fmt:message key="advanced.allowRichEditor" />
 	</label>
-</p>
-
+</div>
Index: lams_tool_notebook/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/authoring.jsp,v
diff -u -r1.9 -r1.9.2.1
--- lams_tool_notebook/web/pages/authoring/authoring.jsp	17 Jan 2014 22:10:27 -0000	1.9
+++ lams_tool_notebook/web/pages/authoring/authoring.jsp	17 May 2016 10:20:13 -0000	1.9.2.1
@@ -1,69 +1,46 @@
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.tool.notebook.util.NotebookConstants"%>
 
-<%@ page
-	import="org.lamsfoundation.lams.tool.notebook.util.NotebookConstants"%>
-
-<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)%>" />
+<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="currentTab" styleId="currentTab" />
+	<html:hidden property="dispatch" value="updateContent" />
+	<html:hidden property="sessionMapID" />
+	
+<lams:Page title="${title}" type="navbar">
 
-	<c:set var="defineLater" value="no" />
-	<c:if test="${sessionMap.mode == 'teacher'}">
-		<c:set var="defineLater" value="yes" />
-	</c:if>
-
-	<div id="header">
-
-		<!--  TITLE KEY PAGE GOES HERE -->
-		<lams:Tabs control="true">
-			<lams:Tab id="1" key="button.basic" />
-			<c:if test="${sessionMap.mode == 'author'}">
-				<lams:Tab id="2" key="button.advanced" />
-				<lams:Tab id="3" key="button.conditions" />
-			</c:if>
-		</lams:Tabs>
-
-	</div>
-	<!--closes header-->
-
-	<div id="content">
-		<html:hidden property="currentTab" styleId="currentTab" />
-		<html:hidden property="dispatch" value="updateContent" />
-		<html:hidden property="sessionMapID" />
-
-		<div id="message" style="text-align: center;">
-			<logic:messagesPresent>
-				<p class="warning">
-				        <html:messages id="error">
-				            <c:out value="${error}" escapeXml="false"/><br/>
-				        </html:messages>
-				</p>
-			</logic:messagesPresent>			
-		</div>
-
-		<lams:help toolSignature="<%=NotebookConstants.TOOL_SIGNATURE%>"
-			module="authoring" />
-
-		<%-- Page tabs --%>
-		<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-		<c:if test="${sessionMap.mode == 'author'}">
+	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= NotebookConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+		<lams:Tab id="1" key="button.basic" />
+		<lams:Tab id="2" key="button.advanced" />
+		<lams:Tab id="3" key="button.conditions" />
+	</lams:Tabs>  
+	
+	<lams:TabBodyArea>
+		<%@ include file="/common/messages.jsp"%>
+	   
+	    <!--  Set up tabs  -->
+	     <lams:TabBodys>
+			<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
 			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-			<lams:TabBody id="3" titleKey="button.conditions"
-				page="conditions.jsp" />
-		</c:if>
+			<lams:TabBody id="3" titleKey="button.conditions" page="conditions.jsp" />
+	    </lams:TabBodys>
 
+
 		<lams:AuthoringButton formID="authoringForm"
-			clearSessionActionUrl="/clearsession.do" toolSignature="lantbk11"
-			cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
+			clearSessionActionUrl="/clearsession.do"
+			toolSignature="<%=NotebookConstants.TOOL_SIGNATURE%>"
+			cancelButtonLabelKey="button.cancel"
+			saveButtonLabelKey="button.save"
 			toolContentID="${sessionMap.toolContentID}"
-			accessMode="${sessionMap.mode}" defineLater="${defineLater}"
 			customiseSessionID="${sessionMap.sessionID}" 
 			contentFolderID="${sessionMap.contentFolderID}" />
-	</div>
+	</lams:TabBodyArea>
+	
+	<div id="footer"></div>
+	
+</lams:Page>
 </html:form>
 
-<div id="footer"></div>
-
Index: lams_tool_notebook/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/basic.jsp,v
diff -u -r1.5 -r1.5.2.1
--- lams_tool_notebook/web/pages/authoring/basic.jsp	6 Oct 2010 10:15:53 -0000	1.5
+++ lams_tool_notebook/web/pages/authoring/basic.jsp	17 May 2016 10:20:13 -0000	1.5.2.1
@@ -1,28 +1,14 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="formBean"
-	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<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="sessionMapID" value="${formBean.sessionMapID}" />
 
 <!-- ========== Basic Tab ========== -->
-<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%;"></html:text>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.instructions"></fmt:message>
-			</div>
-			<lams:CKEditor id="instructions"
-				value="${formBean.instructions}"
-				contentFolderID="${sessionMap.contentFolderID}"></lams:CKEditor>
-		</td>
-	</tr>
-</table>
+<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.instructions" /></label>
+    <lams:CKEditor id="instructions" value="${formBean.instructions}" contentFolderID="${sessionMap.contentFolderID}"></lams:CKEditor>
+</div>
Index: lams_tool_notebook/web/pages/authoring/conditionList.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/conditionList.jsp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- lams_tool_notebook/web/pages/authoring/conditionList.jsp	24 Apr 2015 10:00:47 -0000	1.4.2.2
+++ lams_tool_notebook/web/pages/authoring/conditionList.jsp	17 May 2016 10:20:13 -0000	1.4.2.3
@@ -1,17 +1,13 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
 
 <div id="conditionList">
-	<h2 class="spacer-left">
-		<fmt:message key="label.authoring.conditions.list.title" />
-	</h2>
+	<div>
+		<img src="<html:rewrite page='/images/indicator.gif' />" style="display:none" id="conditionListArea_Busy" />
+	</div>	
 	
-	<table class="alternative-color" id="conditionTable" cellspacing="0">
+	<table class="table table-striped table-condensed" id="conditionTable" >
 		<tr>
 			<th width="14%" align="left">
 				<fmt:message key="label.authoring.conditions.order" />
@@ -39,62 +35,31 @@
 					${condition.displayName}
 				</td>
 
-				<td width="40px" align="center">
+				<td class="arrows" style="width:5%">
+					<!-- Don't display up icon if first line -->
 					<c:if test="${not status.first}">
-						<img src="<html:rewrite page='/images/up.gif'/>"
-							border="0" title="<fmt:message key="label.authoring.up"/>"
-							onclick="upCondition(${status.index},'${sessionMapID}')">
-						<c:if test="${status.last}">
-							<img
-								src="<html:rewrite page='/images/down_disabled.gif'/>"
-								border="0" title="<fmt:message key="label.authoring.down"/>">
-						</c:if>
-					</c:if>
-
+		 				<lams:Arrow state="up" title="<fmt:message key='label.authoring.up'/>" onclick="upCondition(${status.index},'${sessionMapID}')"/>
+		 			</c:if>
+					<!-- Don't display down icon if last line -->
 					<c:if test="${not status.last}">
-						<c:if test="${status.first}">
-							<img
-								src="<html:rewrite page='/images/up_disabled.gif'/>"
-								border="0" title="<fmt:message key="label.authoring.up"/>">
-						</c:if>
-
-						<img src="<html:rewrite page='/images/down.gif'/>"
-							border="0" title="<fmt:message key="label.authoring.down"/>"
-							onclick="downCondition(${status.index},'${sessionMapID}')">
-					</c:if>
+						<lams:Arrow state="down" title="<fmt:message key='label.authoring.down'/>" onclick="downCondition(${status.index},'${sessionMapID}')"/>
+		 			</c:if>
 				</td>
 				
-				<td width="20px">
-					<img src="${tool}images/edit.gif"
-						title="<fmt:message key="label.authoring.edit" />"
-						onclick="editCondition(${status.index},'${sessionMapID}')" />
-                </td>
-                
-				<td width="20px">
-					<img src="${tool}images/cross.gif"
-						title="<fmt:message key="link.delete" />"
-						onclick="deleteCondition(${status.index},'${sessionMapID}')" />
-				</td>
+				<td align="center" style="width:5%"><i class="fa fa-pencil"	title="<fmt:message key="label.authoring.edit" />"
+					onclick="editCondition(${status.index},'${sessionMapID}')"></i></td>
+					
+				<td  align="center" style="width:5%"><i class="fa fa-times"	title="<fmt:message key="link.delete" />" 
+					onclick="deleteCondition(${status.index},'${sessionMapID}')"></i></td>
+
 			</tr>
 		</c:forEach>
 	</table>
 </div>
 
-<%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
+<%-- This script will works when a new Condition submit in order to refresh "Condition List" panel. --%>
 <script type="text/javascript">
-	var win = null;
-	try {
-		if (window.parent && window.parent.hideConditionMessage) {
-			win = window.parent;
-		} else if (window.top && window.top.hideConditionMessage) {
-			win = window.top;
-		}
-	} catch(err) {
-		// mute cross-domain iframe access errors
-	}
-	if (win) {
-		win.hideConditionMessage();
-		var obj = win.document.getElementById('conditionsArea');
-		obj.innerHTML= document.getElementById("conditionList").innerHTML;
-	}
+	hideConditionMessage();
+	var obj = document.getElementById('conditionsArea');
+	obj.innerHTML= document.getElementById("conditionList").innerHTML;
 </script>
Index: lams_tool_notebook/web/pages/authoring/conditions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/conditions.jsp,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_notebook/web/pages/authoring/conditions.jsp	4 Oct 2008 02:47:52 -0000	1.1
+++ lams_tool_notebook/web/pages/authoring/conditions.jsp	17 May 2016 10:20:13 -0000	1.1.12.1
@@ -1,110 +1,61 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean"
-	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 <script type="text/javascript">
-<!-- Common Javascript functions for LAMS -->
-
-	/**
-	 * Launches the popup window for the instruction files
-	 */
 	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();
-		var param = "orderId=" + orderId +"&sessionMapID="+sessionMapID;
-	    var myAjax = new Ajax.Updater(
-		    	conditionListTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		evalScripts:true
-		    	}
-	    );
+
+	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();
-		var param = "orderId=" + orderId + "&sessionMapID="+sessionMapID;
-	    var myAjax = new Ajax.Updater(
-		    	conditionListTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		evalScripts:true
-		    	}
-	    );
+		$("#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;
-	    var myAjax = new Ajax.Updater(
-		    	conditionListTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		evalScripts:true
-		    	}
-	    );
+		$("#conditionsArea").load("<c:url value='/authoring/downCondition.do'/>",{
+			'orderId' : orderId,
+			'sessionMapID' : sessionMapID
+		});
 	}
-
+	
+	//Packs additional elements and submits the question form
+	function submitCondition(){
+		var form = $('#notebookConditionForm');
+		$('#conditionInputArea').load(form.attr('action'), form.serialize());
+	} 
 </script>
 
+
 <!-- Conditions Tab Content -->
 
 <div id="conditionsArea">
 	<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 	<%@ include file="/pages/authoring/conditionList.jsp"%>
 </div>
+ 
+ <div class="form-inline">
+	<a href="javascript:showConditionMessage('<html:rewrite page="/authoring/newConditionInit.do?sessionMapID=${formBean.sessionMapID}"/>');" 
+		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.sessionMapID}"/>');" 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>
Index: lams_tool_notebook/web/pages/authoring/headItems.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/headItems.jsp,v
diff -u -r1.3 -r1.3.12.1
--- lams_tool_notebook/web/pages/authoring/headItems.jsp	4 Oct 2008 02:47:52 -0000	1.3
+++ lams_tool_notebook/web/pages/authoring/headItems.jsp	17 May 2016 10:20:13 -0000	1.3.12.1
@@ -1,10 +1,3 @@
-<%@ include file="/common/taglibs.jsp"%>
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-<script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
\ No newline at end of file
+<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/authoring.js"></script>
\ No newline at end of file
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/web/pages/learning/mobile/defineLater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5.2.3 refers to a dead (removed) revision in file `lams_tool_notebook/web/pages/learning/mobile/notebook.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/web/pages/learning/mobile/submissionDeadline.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/pages/monitoring/headItems.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/headItems.jsp,v
diff -u -r1.3 -r1.3.14.1
--- lams_tool_notebook/web/pages/monitoring/headItems.jsp	8 Sep 2006 08:08:27 -0000	1.3
+++ lams_tool_notebook/web/pages/monitoring/headItems.jsp	17 May 2016 10:20:12 -0000	1.3.14.1
@@ -1,9 +1,3 @@
-<%@ include file="/common/taglibs.jsp"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-
-<script type="text/javascript"
-	src="${tool}includes/javascript/monitoring.js">
-</script>
\ No newline at end of file
+<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/monitoring.js"></script>
\ No newline at end of file