Index: lams_tool_notebook/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/AdvancedAccordian.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/AdvancedAccordian.tag	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -0,0 +1,53 @@
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * AdvancedAccordian.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates the show/hide entry for the Advanced Settings in Montoring.
+	 * Wiki: 
+	 */
+%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default" >
+        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
+          	${title}
+        	</a>
+      		</span>
+        </div>
+
+        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
+		<jsp:doBody />
+		</div>
+	</div>
+</div>
+		
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/Arrow.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/Arrow.tag	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -0,0 +1,35 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%-- state = up: up arrow;  state = down: down arrow --%>
+<%@ attribute name="state" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="onclick" required="false" rtexprvalue="true"%>
+
+<c:choose>
+	<c:when test="${not empty title}">
+		<c:set var="fullTitle">title="${title}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullTitle" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${not empty onclick}">
+		<c:set var="fullOnclick">onclick="${onclick}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullOnclick" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${fn:containsIgnoreCase(state, 'up')}">
+		<i class="fa fa-long-arrow-up fa-pull-left" ${fullTitle} ${fullOnclick}></i>
+	</c:when>
+	<c:otherwise>
+		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullTitle} ${fullOnclick}></i>
+	</c:otherwise>
+</c:choose>
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -1,133 +1,133 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * AuthoringButton.tag
-  *	Author: Dapeng Ni
-  *	Description: Creates the save/cancel button for authoring page
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-
-<%@ attribute name="formID" required="true" rtexprvalue="true" %>
-<%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
-<%@ attribute name="toolContentID" required="true" rtexprvalue="true" %>
-<%@ attribute name="contentFolderID" required="true" rtexprvalue="true" %>
-<%@ attribute name="clearSessionActionUrl" required="true" rtexprvalue="true" %>
-
-<%-- Optional attribute --%>
-<%@ attribute name="accessMode" required="false" rtexprvalue="true" %>
-<%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
-<%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
-<%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
-<%@ attribute name="defineLater" required="false" rtexprvalue="true" %>
-<%@ attribute name="customiseSessionID" required="false" rtexprvalue="true" %>
-
-<%-- Default value for message key --%>
-<c:if test="${empty cancelButtonLabelKey}">
-	<c:set var="cancelButtonLabelKey" value="label.authoring.cancel.button" scope="request"/>
-</c:if>
-<c:if test="${empty saveButtonLabelKey}">
-	<c:set var="saveButtonLabelKey" value="label.authoring.save.button" scope="request"/>
-</c:if>
-<c:if test="${empty cancelConfirmMsgKey}">
-	<c:set var="cancelConfirmMsgKey" value="authoring.msg.cancel.save" scope="request"/>
-</c:if>
-<c:if test="${empty accessMode}">
-	<c:set var="accessMode" value="author" scope="request"/>
-</c:if>
-<c:if test="${not empty param.notifyCloseURL}">
-	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
-</c:if>
-
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
-
-<!-- begin tab content -->
-<script type="text/javascript">
-	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
-	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-		
-		//if defineLater is true close current window
-		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
-			closeWindow("defineLater");
-			
-		//show confirmation page otherwise
-		} else {
-			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
-		}
-	}
-    function doSubmit_Form_Only() {
-    	var form = document.getElementById("${formID}");
-    	//invoke onsubmit event if it's available, submit form afterwards
-    	if (form.onsubmit == null || (form.onsubmit != null) && form.onsubmit()) {
-    		form.submit();
-    	}
-    }
-    function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-    		closeWindow("cancel");
-    	}
-    }
-    function closeWindow(nextAction) {
-        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
-        // for both AuthoringButton.tag and authoringConfirm.jsp
-		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
-		if (notifyCloseURL == ""){
-			if (nextAction == "defineLater") {
-				refreshParentMonitoringWindow();
-			}
-			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
-			doAjaxCall(clearSessionUrl);
-		} else {
-			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
-				window.location.href = notifyCloseURL + '&action=' + nextAction;
-			} else if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else {
-				window.parent.opener.location.href = notifyCloseURL;
-			}
-		}
-    	
-    	//just for depress alert window when call window.close()
-    	//only available for IE browser
-    	var userAgent=navigator.userAgent;
-    	if(userAgent.indexOf('MSIE') != -1)
-        	window.opener = "authoring"
-    	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">
-			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
-		</html:link>
-</p>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * AuthoringButton.tag
+  *	Author: Dapeng Ni
+  *	Description: Creates the save/cancel button for authoring page
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="formID" required="true" rtexprvalue="true" %>
+<%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
+<%@ attribute name="toolContentID" required="true" rtexprvalue="true" %>
+<%@ attribute name="contentFolderID" required="true" rtexprvalue="true" %>
+<%@ attribute name="clearSessionActionUrl" required="true" rtexprvalue="true" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="accessMode" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="defineLater" required="false" rtexprvalue="true" %>
+<%@ attribute name="customiseSessionID" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty cancelButtonLabelKey}">
+	<c:set var="cancelButtonLabelKey" value="label.authoring.cancel.button" scope="request"/>
+</c:if>
+<c:if test="${empty saveButtonLabelKey}">
+	<c:set var="saveButtonLabelKey" value="label.authoring.save.button" scope="request"/>
+</c:if>
+<c:if test="${empty cancelConfirmMsgKey}">
+	<c:set var="cancelConfirmMsgKey" value="authoring.msg.cancel.save" scope="request"/>
+</c:if>
+<c:if test="${empty accessMode}">
+	<c:set var="accessMode" value="author" scope="request"/>
+</c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
+
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
+<!-- begin tab content -->
+<script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
+	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
+		
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
+		}
+	}
+    function doSubmit_Form_Only() {
+    	var form = document.getElementById("${formID}");
+    	//invoke onsubmit event if it's available, submit form afterwards
+    	if (form.onsubmit == null || (form.onsubmit != null) && form.onsubmit()) {
+    		form.submit();
+    	}
+    }
+    function doCancel() {
+    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			doAjaxCall(clearSessionUrl);
+		} else {
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+				window.location.href = notifyCloseURL + '&action=' + nextAction;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
+			} else {
+				window.parent.opener.location.href = notifyCloseURL;
+			}
+		}
+    	
+    	//just for depress alert window when call window.close()
+    	//only available for IE browser
+    	var userAgent=navigator.userAgent;
+    	if(userAgent.indexOf('MSIE') != -1)
+        	window.opener = "authoring"
+    	window.close();
+    }  				
+</script>	
+<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>
+		<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
Index: lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdc884b8e6274ebbc664d1ee940e565803445bb26 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
+++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -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",
Index: lams_tool_notebook/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/Comments.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/Comments.tag	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -0,0 +1,47 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
+<%@ attribute name="height" required="false" rtexprvalue="true"%>
+<%@ attribute name="width" required="false" rtexprvalue="true"%>
+<%@ attribute name="mode" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeAndDislike" required="false" rtexprvalue="true"%>
+<%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
+<%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
+<%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+
+
+<c:if test="${empty width}">
+	<c:set var="width" value="100%" />
+</c:if>
+
+<c:if test="${empty height}">
+	<c:set var="height" value="auto" />
+</c:if>
+
+<c:set var="modeStr" value=""/>
+<c:if test="${!empty mode}">
+	<c:set var="modeStr">&mode=${mode}</c:set>
+</c:if>
+
+<c:if test="${empty likeAndDislike}">
+	<c:set var="likeAndDislike" value="false" />
+</c:if>
+
+<c:if test="${empty readOnly}">
+	<c:set var="readOnly" value="false" />
+</c:if>
+
+<c:if test="${empty sortBy}">
+	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
+</c:if>
+
+<div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+<script>
+$(document).ready(function(){
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$('#commentFrame').load(url);
+});
+</script>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/CommentsAuthor.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/CommentsAuthor.tag	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -0,0 +1,51 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
+<%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+
+<c:if test="${empty allowCommentsVariableName}">
+	<c:set var="allowCommentsVariableName" value="allowComments" />
+</c:if>
+<c:if test="${empty allowCommentLabelKey}">
+	<c:set var="allowCommentLabelKey" value="advanced.allow.comments" />
+</c:if>
+<c:if test="${empty likeDislikeVariableName}">
+	<c:set var="likeDislikeVariableName" value="commentsLikeAndDislike" />
+</c:if>
+<c:if test="${empty likeOnlyCommentLabelKey}">
+	<c:set var="likeOnlyCommentLabelKey" value="advanced.comments.like.only" />
+</c:if>
+<c:if test="${empty likeDislikeLabelKey}">
+	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
+</c:if>
+
+<div class="checkbox">
+	<label>
+	<html:checkbox property="${allowCommentsVariableName}" value="1"
+		styleId="${allowCommentsVariableName}">
+	</html:checkbox>
+	<fmt:message key="${allowCommentLabelKey}"/>
+	</label>
+</div>
+<div class="loffset20" id="likedislike">
+		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+</div>
+
+<script>
+jQuery( document ).ready(function( $ ) {
+	if (! $("#${allowCommentsVariableName}").is(':checked')) {
+		$("#likedislike").hide();
+	}
+	$("#${allowCommentsVariableName}").click(function() {
+		$("#likedislike").toggle('slow');
+	});
+});
+</script>
+
+
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rce515395bb6d73f6ed359d00ba0809af714e0d38 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision ce515395bb6d73f6ed359d00ba0809af714e0d38)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -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>
+
+
+		
+			
Index: lams_tool_notebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -0,0 +1,54 @@
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * AdvancedAccordian.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
+	 * Wiki: 
+	 */
+%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default" >
+        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
+          	${title}
+        	</a>
+      		</span>
+        </div>
+
+
+		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
+		<jsp:doBody />
+		</div>
+	</div>
+</div>
+		
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/TSTable.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/TSTable.tag	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -0,0 +1,53 @@
+<%-- Tablesorter Table and Pager --%>
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="numColumns" required="true" rtexprvalue="true"%>
+<%@ attribute name="dataId" required="false" rtexprvalue="true"%>
+<%@ attribute name="tableClass" required="false" rtexprvalue="true"%>
+<%@ attribute name="pagerClass" required="false" rtexprvalue="true"%>
+<%@ attribute name="test" required="false" rtexprvalue="true"%>
+
+<c:if test="${empty tableClass}">
+	<c:set var="tableClass" value="tablesorter" />
+</c:if>
+
+<c:if test="${empty pagerClass}">
+	<c:set var="pagerClass" value="ts-pager" />
+</c:if>
+
+<c:if test="${empty dataId}">
+	<c:set var="dataId" value="" />
+</c:if>
+
+<table class="${tableClass}" ${dataId}>
+	<thead>
+		<tr>
+			<jsp:doBody />
+		</tr>
+	</thead>
+	<tfoot>
+		<tr>
+	    	<th colspan="${numColumns}" class="${pagerClass} form-horizontal">
+	        <button type="button" class="btn btn-xs first"><i class="fa fa-step-backward"></i></button>
+	        <button type="button" class="btn btn-xs prev"><i class="fa fa-backward"></i></button>
+	        <span class="pagedisplay"></span> <!-- this can be any element, including an input -->
+	        <button type="button" class="btn btn-xs next"><i class="fa fa-forward"></i></button>
+	        <button type="button" class="btn btn-xs last"><i class="fa fa-step-forward"></i></button>
+	        <select class="pagesize" title="Select page size">
+	      		<c:if test="${not empty test}"><option value="2">2</option></c:if>
+	      		<option selected="selected" value="10">10</option>
+	      		<option value="20">20</option>
+	      		<option value="30">30</option>
+	      		<option value="40">40</option>
+	      		<option value="50">50</option>
+	      		<option value="100">100</option>
+	        </select>
+	      </th>
+	    </tr>
+	</tfoot>
+	<tbody>
+	</tbody>
+</table>
+
+	
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
+++ lams_tool_notebook/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -1,85 +1,89 @@
-<%
-	 /****************************************************************
-	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-	 * =============================================================
-	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
-	 * 
-	 * This program is free software; you can redistribute it and/or modify
-	 * it under the terms of the GNU General Public License version 2.0
-	 * as published by the Free Software Foundation.
-	 * 
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 * 
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-	 * USA
-	 * 
-	 * http://www.gnu.org/licenses/gpl.txt
-	 * ****************************************************************
-	 */
-
-	/**
-	 * Tab.tag
-	 *	Author: Mitchell Seaton
-	 *	Description: Creates a tab element.
-	 * Wiki: 
-	 */
-%>
-<%@ tag body-content="empty"%>
-<%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="value" required="false" rtexprvalue="true"%>
-<%@ attribute name="key" required="false" rtexprvalue="true"%>
-<%@ attribute name="inactive" required="false" rtexprvalue="true"%>
-<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-
-<%-- Check if  bundle is set --%>
-<c:if test="${not empty bundle}">
-	<fmt:setBundle basename="${bundle}"/>
-</c:if>
-
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-
-<c:set var="tabTitle" value="${value}" />
-
-<%--
-	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-	this is handy if the page needs different logic on initialisation and user switching tabs
---%>
-
-<c:if test="${methodCall == null}">
-	<c:choose>
-		<c:when test="${dControl}">
-			<c:set var="methodCall" value="doSelectTab" />
-		</c:when>
-		<c:otherwise>
-			<c:set var="methodCall" value="selectTab" />
-		</c:otherwise>
-	</c:choose>
-</c:if>
-
-<c:if test="${key != null && value == null}">
-	<c:set var="tabTitle">
-		<fmt:message key="${key}" />
-	</c:set>
-</c:if>
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
-			onclick="${methodCall}(${id});return false;">
-			${tabTitle}
-		</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates a tab element within the Hybrid Tab Header.
+	 * Wiki: 
+	 */
+%>
+<%@ tag body-content="empty"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="value" required="false" rtexprvalue="true"%>
+<%@ attribute name="key" required="false" rtexprvalue="true"%>
+<%@ attribute name="inactive" required="false" rtexprvalue="true"%>
+<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+	this is handy if the page needs different logic on initialisation and user switching tabs
+	
+	-- 			onclick="${methodCall}(${id});return false;">
+	
+--%>
+
+<c:if test="${methodCall == null}">
+	<c:choose>
+		<c:when test="${dControl}">
+			<c:set var="methodCall" value="doSelectTab" />
+		</c:when>
+		<c:otherwise>
+			<c:set var="methodCall" value="selectTab" />
+		</c:otherwise>
+	</c:choose>
+</c:if>
+
+<c:if test="${key != null && value == null}">
+	<c:set var="tabTitle">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">class="active"</c:set>
+</c:if>
+	
+<c:set var="disabled" value=""/>
+<c:if test="${inactive}">
+	<c:set var="class">class="disabled"</c:set>
+</c:if>
+
+<li role="presentation" ${class}><a href="#t${id}" aria-controls="t${id}" role="tab" onclick="${methodCall}(${id});return false;">${tabTitle}</a></li>
Index: lams_tool_notebook/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_notebook/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -1,52 +1,44 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * TabBody.tag
- *	Author: Mitchell Seaton
- *	Description: Creates the body container for a tab element
- * Wiki: 
- */
-
-		%>
-<%@ tag body-content="scriptless"%>
-<%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="page" required="false" rtexprvalue="true"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-
-<!-- begin tab content -->
-<div class="box" id="tabbody${id}">
-	<c:choose>
-		<c:when test="${page != null}">
-			<jsp:include page="${page}" />
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
-
-</div>
-<!-- end tab content -->
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBody.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates the body container for a tab element
+ * Wiki: 
+ */
+
+%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="page" required="false" rtexprvalue="true"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">active</c:set>
+</c:if>
+
+<div role="tabpanel" class="tab-pane ${class}" id="t${id}"><jsp:include page="${page}"/></div>
Index: lams_tool_notebook/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/TabBodyArea.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/TabBodyArea.tag	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -0,0 +1,39 @@
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBodyArea.tag
+ *	Author: Fiona Malikoff
+ *	Description: Creates the panel body area for a nav bar screen
+ * Wiki: 
+ */
+
+%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
+<div class="panel-body panel-monitor-body">
+	 <jsp:doBody />
+</div>
+
+</div> <!--  close tab opened in TabHeader -->
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/TabBodys.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/TabBodys.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/TabBodys.tag	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -0,0 +1,37 @@
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBodys.tag
+ *	Author: Fiona Malikoff
+ *	Description: Create a tabbody list from nested TabBody tags.
+ * Wiki: 
+ */
+
+		%>
+<%@ tag body-content="scriptless"%>
+
+<!-- tab body holder table -->
+<div class="tab-content">
+	<jsp:doBody />
+</div>
Index: lams_tool_notebook/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
+++ lams_tool_notebook/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -1,59 +1,59 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * TabName Tag
- *	Author: Mitchell Seaton
- *	Description: Shortens name that are too long to fit inside a tab
- */
-
-		%>
-<%@ tag body-content="scriptless" %>
-
-<%@ attribute name="url" required="true" rtexprvalue="true"%>
-<%@ attribute name="highlight" required="false" rtexprvalue="true" %>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-function" prefix="fn"%>
-
-<c:set var="limit">12</c:set>
-<c:set var="fullname"><jsp:doBody/></c:set>
-<c:set var="titleValue" value=""/>
-
-<c:choose>
-	<c:when test="${fn:length(fullname) > limit}">
-			<c:set var="titleValue" value="${fullname}"/>
-			<c:set var="tabname" value="${fn:substring(fullname, 0, limit-2)}..."/>
-	</c:when>
-	<c:otherwise>
-		<c:set var="tabname" value="${fullname}"/>
-	</c:otherwise>
-</c:choose>
-
-<c:if test="${highlight eq true}">
-	<c:set var="classVar" value="tab-link-highlight" />
-</c:if>
-
-<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
-	<c:out value="${tabname}" escapeXml="false"/>	
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabName Tag
+ *	Author: Mitchell Seaton
+ *	Description: Shortens name that are too long to fit inside a tab
+ */
+
+		%>
+<%@ tag body-content="scriptless" %>
+
+<%@ attribute name="url" required="true" rtexprvalue="true"%>
+<%@ attribute name="highlight" required="false" rtexprvalue="true" %>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
+
+<c:set var="limit">12</c:set>
+<c:set var="fullname"><jsp:doBody/></c:set>
+<c:set var="titleValue" value=""/>
+
+<c:choose>
+	<c:when test="${fn:length(fullname) > limit}">
+			<c:set var="titleValue" value="${fullname}"/>
+			<c:set var="tabname" value="${fn:substring(fullname, 0, limit-2)}..."/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="tabname" value="${fullname}"/>
+	</c:otherwise>
+</c:choose>
+
+<c:if test="${highlight eq true}">
+	<c:set var="classVar" value="tab-link-highlight" />
+</c:if>
+
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
+	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_notebook/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -1,69 +1,92 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tabs.tag
- *	Author: Mitchell Seaton
- *	Description: Create a tab list from a input collection or nested Tab tags.
- * Wiki: 
- */
-
-		%>
-<%@ tag body-content="scriptless"%>
-<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%>
-<%@ attribute name="control" required="false" rtexprvalue="true"%>
-<%@ attribute name="useKey" required="false" rtexprvalue="true"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-<c:set var="dControl" value="false" scope="request" />
-<c:if test="${control}">
-	<c:set var="dControl" value="${control}" scope="request" />
-</c:if>
-
-<c:set var="dUseKey" value="false" scope="request" />
-<c:if test="${useKey}">
-	<c:set var="dUseKey" value="${useKey}" scope="request" />
-</c:if>
-
-<!-- tab holder table -->
-<div id="nav">
-	<c:choose>
-		<c:when test="${collection != null}">
-			<c:set var="count" value="0" />
-			<c:forEach var="tab" begin="0" items="${collection}">
-				<c:set var="count" value="${count+1}" />
-				<c:choose>
-					<c:when test="${dUseKey}">
-						<lams:Tab id="${count}" key="${tab}" />
-					</c:when>
-					<c:otherwise>
-						<lams:Tab id="${count}" value="${tab}" />
-					</c:otherwise>
-				</c:choose>
-			</c:forEach>
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
-</div>
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * Tabs.tag
+ *	Author: Fiona Malikoff
+ *	Description: Create a hybrid panel header that contains a nav bar that acts like tabs.
+ */
+
+%>
+<%@ attribute name="control" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpModule" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<c:set var="useActions" value="false" scope="request" />
+<c:if test="${not empty helpToolSignature or not empty helpModule or not empty refreshOnClickAction or not empty extraControl}">
+	<c:set var="useActions" value="true" scope="request" />
+</c:if>
+
+<c:set var="dControl" value="false" scope="request" />
+<c:if test="${control}">
+	<c:set var="dControl" value="${control}" scope="request" />
+</c:if>
+
+<!-- navbar combined with tabs -->
+<div class="panel panel-default panel-monitor-page">
+<div class="panel-heading navbar-heading">
+
+ 	<nav class="navbar navbar-default navbar-heading">
+	<div class="container-fluid">
+    	<!-- Brand and toggle get grouped for better mobile display -->
+		<div class="navbar-header">
+	      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1" aria-expanded="false">
+	        <span class="sr-only">Toggle navigation</span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	      </button>
+	      <span class="navbar-brand">${title}</span>
+		</div>
+		<div class="collapse navbar-collapse" id="navbar-collapse-1" role="navigation">
+         <ul class="nav navbar-nav" id="page-tabs">
+	         <li role="separator" class="divider"></li>
+	          <jsp:doBody />
+         </ul>
+         <c:if test="${useActions}">
+         <ul class="nav navbar-nav navbar-right" id="page-actions">
+		     <li role="separator" class="divider"></li>
+		     <c:if test="${not empty refreshOnClickAction}">
+             <li class="navbar-text" ><span onclick="${refreshOnClickAction}"><i class="fa fa-refresh"></i></span></li>
+             </c:if>
+             <c:if test="${not empty helpToolSignature or not empty helpModule}">
+             <li class="navbar-text" ><lams:help toolSignature="${helpToolSignature}" module="${helpModule}" style="small"/></li>
+             </c:if>
+             <c:if test="${not empty extraControl}">
+             <li class="navbar-text" >${extraControl}</li>
+             </c:if>
+         </ul>
+         </c:if>
+ 	    
+ 		</div>
+	 </div>
+     </nav>
+     <!-- /top nav -->
+</div>
+<!-- panel div closed by TabBodyArea -->
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_notebook/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -1,47 +1,49 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Standard Head Items
- *	Author: Fiona Malikoff
- *	Description: Includes all the standard head items e.g. the 
- * lams css files, sets the content type, standard javascript files.
- */
-%>
-<%@ tag body-content="empty"%>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-
-<lams:css style="main"/>
-
-<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * Standard Head Items
+ *	Author: Fiona Malikoff
+ *	Description: Includes all the standard head items e.g. the 
+ * lams css files, sets the content type, standard javascript files.
+ */
+%>
+<%@ tag body-content="empty"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<lams:css/>
+
+<script type="text/javascript" src="${lams}includes/javascript/common.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_notebook/web/WEB-INF/tiles-defs.xml
===================================================================
diff -u -r9c83d6e84da12d1d753d9a0588ecd4a1b49de1f7 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 9c83d6e84da12d1d753d9a0588ecd4a1b49de1f7)
+++ lams_tool_notebook/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -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
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -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 a0a249e0861e944d080689e4ebb853566cd40f2d 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 a0a249e0861e944d080689e4ebb853566cd40f2d 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 a0a249e0861e944d080689e4ebb853566cd40f2d 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 a0a249e0861e944d080689e4ebb853566cd40f2d 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 a0a249e0861e944d080689e4ebb853566cd40f2d 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 a0a249e0861e944d080689e4ebb853566cd40f2d 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 a0a249e0861e944d080689e4ebb853566cd40f2d 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 a0a249e0861e944d080689e4ebb853566cd40f2d 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
===================================================================
diff -u -r05db875c7974d705f89231416ff6dfe91a5e70f1 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/common/messages.jsp	(.../messages.jsp)	(revision 05db875c7974d705f89231416ff6dfe91a5e70f1)
+++ lams_tool_notebook/web/common/messages.jsp	(.../messages.jsp)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -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 a0a249e0861e944d080689e4ebb853566cd40f2d refers to a dead (removed) revision in file `lams_tool_notebook/web/layouts/defaultLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/layouts/layout.jsp
===================================================================
diff -u
--- lams_tool_notebook/web/layouts/layout.jsp	(revision 0)
+++ lams_tool_notebook/web/layouts/layout.jsp	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<%@ include file="/common/taglibs.jsp"%>
+<lams:html>
+	<lams:head>
+		<lams:headItems/>
+		<tiles:insert attribute="header" />
+	</lams:head>
+	<body class="stripes">
+		<tiles:insert attribute="body" />
+		<div class="footer"></div>					
+	</body>
+</lams:html>
Fisheye: Tag a0a249e0861e944d080689e4ebb853566cd40f2d 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 a0a249e0861e944d080689e4ebb853566cd40f2d 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 a0a249e0861e944d080689e4ebb853566cd40f2d 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
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_notebook/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -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
===================================================================
diff -u -r9ad7805407672e72dfc83fb0ba49ccafb0d43d6f -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 9ad7805407672e72dfc83fb0ba49ccafb0d43d6f)
+++ lams_tool_notebook/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -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
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_notebook/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -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
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_notebook/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -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
===================================================================
diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59)
+++ lams_tool_notebook/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -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
===================================================================
diff -u -re64f3e306f3139c78e8917240c33ea232e75e848 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/pages/authoring/conditions.jsp	(.../conditions.jsp)	(revision e64f3e306f3139c78e8917240c33ea232e75e848)
+++ lams_tool_notebook/web/pages/authoring/conditions.jsp	(.../conditions.jsp)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -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
===================================================================
diff -u -re64f3e306f3139c78e8917240c33ea232e75e848 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision e64f3e306f3139c78e8917240c33ea232e75e848)
+++ lams_tool_notebook/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -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 a0a249e0861e944d080689e4ebb853566cd40f2d 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 a0a249e0861e944d080689e4ebb853566cd40f2d 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 a0a249e0861e944d080689e4ebb853566cd40f2d 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
===================================================================
diff -u -r2dfd3f56bbd83737bed4d05cd9a8437c15267115 -ra0a249e0861e944d080689e4ebb853566cd40f2d
--- lams_tool_notebook/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision 2dfd3f56bbd83737bed4d05cd9a8437c15267115)
+++ lams_tool_notebook/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
@@ -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