Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/AdvancedAccordian.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/Arrow.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.20 -r1.20.2.1
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	23 Jul 2013 17:54:22 -0000	1.20
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	25 May 2016 12:46:56 -0000	1.20.2.1
@@ -122,12 +122,12 @@
     	window.close();
     }  				
 </script>	
-<p id="saveCancelButtons" >
-		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
-			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
+<div id="saveCancelButtons" >
+		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
-</p>
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
+		</html:link>
+</div>
 <!-- end tab content -->
\ No newline at end of file
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/AuthoringRatingCriteria.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14.2.1 -r1.14.2.2
--- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	3 Sep 2014 13:19:20 -0000	1.14.2.1
+++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	25 May 2016 12:46:56 -0000	1.14.2.2
@@ -10,7 +10,12 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 <%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%>
+<%@ attribute name="method" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty method}">
+	<c:set var="method" value="inline" />
+</c:if>
+
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -19,6 +24,10 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
+<c:if test="${fn:containsIgnoreCase(method,'Inline')}">
+	<c:set var="toolbarSet">${toolbarSet}Inline</c:set>
+</c:if>
+
 <c:if test="${empty displayExpanded}">
 	<c:set var="displayExpanded" value="true" />
 </c:if>
@@ -33,10 +42,10 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
-	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
+	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
 </c:if>
 
@@ -59,10 +68,9 @@
 	    var editor = CKEDITOR.instances["${id}"];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.replace( "${id}", {
+		var instance = CKEDITOR.${method}( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
-				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/Comments.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/CommentsAuthor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_chat/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	6 Mar 2016 08:14:52 -0000	1.1.2.2
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	25 May 2016 12:46:56 -0000	1.1.2.3
@@ -12,25 +12,38 @@
 <div class="row no-gutter">
 	<div class="col-xs-12">
 		<div class="container" id="content">
+		
+		<c:choose>
+		<c:when test='${type == "navbar"}'>
+			<jsp:doBody />
+		</c:when> 
+		<c:otherwise>
 			<div class="panel panel-default panel-${type}-page">
-				<div class="panel-heading">
-					<c:if test="${not empty title}">
+				<c:if test="${not empty title}">
+					<div class="panel-heading">
 						<div class="panel-title panel-${type}-title">
 							<c:out value="${title}" escapeXml="true" />
 							<c:if test="${not empty titleHelpURL}">
 								<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
 							</c:if>
 						</div>
-					</c:if>
-					<c:if test="${not empty headingContent}">
-						<c:out value="${headingContent}" escapeXml="true" />
-					</c:if>
-				</div>
+						<c:if test="${not empty headingContent}">
+							<c:out value="${headingContent}" escapeXml="true" />
+						</c:if>
+					</div>
+				</c:if>
 				<div class="panel-body panel-${type}-body">
 					<jsp:doBody />
 				</div>
 			</div>
+		</c:otherwise>
+		</c:choose>
+			
 		</div>
 		<!-- End content container -->
 	</div>
 </div>
+
+
+		
+			
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/Rating.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/RestrictedUsageAccordian.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/TSTable.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_chat/web/WEB-INF/tags/Tab.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Tab.tag,v
diff -u -r1.7 -r1.7.12.1
Binary files differ
Index: lams_tool_chat/web/WEB-INF/tags/TabBody.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/TabBody.tag,v
diff -u -r1.6 -r1.6.14.1
Binary files differ
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/TabBodyArea.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/TabBodys.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_chat/web/WEB-INF/tags/TabName.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/TabName.tag,v
diff -u -r1.5 -r1.5.2.1
Binary files differ
Index: lams_tool_chat/web/WEB-INF/tags/Tabs.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Tabs.tag,v
diff -u -r1.6 -r1.6.14.1
Binary files differ
Index: lams_tool_chat/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.13.2.1 -r1.13.2.2
Binary files differ
Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	24 Feb 2016 12:36:24 -0000	1.3.2.3
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	25 May 2016 12:46:57 -0000	1.3.2.4
@@ -178,7 +178,7 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+      
       <attribute>
          <description>Output stylesheet based on the user preferences.</description>
          <name>style</name>
@@ -408,18 +408,34 @@
        <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>
    	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
-   	</tag-file>   	
+   	</tag-file>   
    	<tag-file>
+       <name>AuthoringRatingCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file>    		
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
@@ -438,8 +454,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 +513,13 @@
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
 	</tag-file>
+   	<tag-file>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_tool_chat/web/layouts/defaultLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/layouts/defaultLayout.jsp,v
diff -u -r1.11.14.1 -r1.11.14.2
--- lams_tool_chat/web/layouts/defaultLayout.jsp	26 Feb 2016 07:17:56 -0000	1.11.14.1
+++ lams_tool_chat/web/layouts/defaultLayout.jsp	25 May 2016 12:46:57 -0000	1.11.14.2
@@ -4,16 +4,6 @@
 <lams:html>
 	<tiles:insert attribute="header" />
 	<body class="stripes">
-
-			<div id="content">
-				<tiles:useAttribute name="pageTitleKey" ignore="true"/>
-				<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
-				<h1>
-					<fmt:message key="${pTitleKey}" />
-				</h1>
-				<tiles:insert attribute="body" />
-			</div>
-			<div id="footer"></div>
-
+		<tiles:insert attribute="body" />
 	</body>
 </lams:html>
Index: lams_tool_chat/web/layouts/tabLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/layouts/tabLayout.jsp,v
diff -u -r1.8.14.1 -r1.8.14.2
--- lams_tool_chat/web/layouts/tabLayout.jsp	26 Feb 2016 07:17:56 -0000	1.8.14.1
+++ lams_tool_chat/web/layouts/tabLayout.jsp	25 May 2016 12:46:57 -0000	1.8.14.2
@@ -4,13 +4,6 @@
 <lams:html>
 	<tiles:insert attribute="header" />
 	<body class="stripes" onload="init();">
-		<div id="page">
-			<tiles:useAttribute name="pageTitleKey" />
-			<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
-			<h1>
-				<fmt:message key="${pTitleKey}" />
-			</h1>
-			<tiles:insert attribute="body" />
-		</div>
+		<tiles:insert attribute="body" />
 	</body>
 </lams:html>
Index: lams_tool_chat/web/pages/authoring/addCondition.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/authoring/addCondition.jsp,v
diff -u -r1.5.2.3 -r1.5.2.4
--- lams_tool_chat/web/pages/authoring/addCondition.jsp	26 Feb 2016 07:17:56 -0000	1.5.2.3
+++ lams_tool_chat/web/pages/authoring/addCondition.jsp	25 May 2016 12:46:56 -0000	1.5.2.4
@@ -13,21 +13,20 @@
 		</title>
 		<link href="${tool}includes/css/chat.css" rel="stylesheet" type="text/css">
 		<lams:headItems />
-		<lams:css style="main" />
-		
-		<script type="text/javascript"> 
-			function callHideConditionMessage() {
-				if (window.hideConditionMessage) {
-					window.hideConditionMessage();
-				} else if (window.parent && window.parent.hideConditionMessage) {
-					window.parent.hideConditionMessage();
-				} else if (window.top && window.top.hideConditionMessage) {
-					window.top.hideConditionMessage();
-				}
-			}
-		</script>
+		<lams:css/>
 	</lams:head>
-	<body class="tabpart">
+	
+	<body>
+	
+	<div class="panel panel-default">
+	<div class="panel-heading">
+		<div class="panel-title">
+			<fmt:message key="label.authoring.conditions.add.condition" />
+		</div>
+	</div>
+
+	<div class="panel-body">
+	
 		<!-- Basic Info Form-->
 		<%@ include file="/common/messages.jsp"%>
 		<html:form action="/authoring/saveOrUpdateCondition" method="post" styleId="chatConditionForm" focus="displayName" >
@@ -36,21 +35,23 @@
 				<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 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}"  />
 		</html:form>
 
-		<lams:ImgButtonWrapper>
-			<a href="javascript:;" onclick="javascript:chatConditionForm.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>
+		<div class="voffset5">
+			<a href="javascript:;" onclick="submitCondition();" class="btn btn-default btn-xs">
+				<fmt:message key="label.save" /></a>
+			<a href="javascript:;" onclick="hideConditionMessage()" class="btn btn-default btn-xs">
+				<fmt:message key="label.cancel" /> </a>
+		</div>
+
+	</div>
+</div>
+
 	</body>
 </lams:html>
Index: lams_tool_chat/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/authoring/advanced.jsp,v
diff -u -r1.8 -r1.8.14.1
--- lams_tool_chat/web/pages/authoring/advanced.jsp	20 Dec 2006 00:18:15 -0000	1.8
+++ lams_tool_chat/web/pages/authoring/advanced.jsp	25 May 2016 12:46:56 -0000	1.8.14.1
@@ -1,27 +1,23 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <!-- ========== 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">
-		<fmt:message key="advanced.lockOnFinished" />
+	<html:checkbox property="lockOnFinished" value="1"	styleId="lockOnFinished">	</html:checkbox>
+	<fmt:message key="advanced.lockOnFinished" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="reflectOnActivity" value="1"
-		styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox>
-
+<div class="checkbox">
 	<label for="reflectOnActivity">
-		<fmt:message key="advanced.reflectOnActivity" />
+	<html:checkbox property="reflectOnActivity" value="1" styleId="reflectOnActivity"></html:checkbox>
+	<fmt:message key="advanced.reflectOnActivity" />
 	</label>
-</p>
-<p>
-	<html:textarea property="reflectInstructions" cols="30" rows="3" styleId="reflectInstructions"/>
-</p>
+</div>
+
+<div class="form-group">
+	<html:textarea property="reflectInstructions" rows="3" styleId="reflectInstructions" styleClass="form-control"/>
+</div>
 <script type="text/javascript">
 <!--
 //automatically turn on refect option if there are text input in refect instruction area
@@ -40,15 +36,13 @@
 	ra.onkeyup=turnOnRefect;
 //-->
 </script>
-<p>
-	<html:checkbox property="filteringEnabled" value="1"
-		styleClass="noBorder" styleId="filteringEnabled"></html:checkbox>
-
+<div class="checkbox">
 	<label for="filteringEnabled">
-		<fmt:message key="advanced.filteringEnabled" />
+	<html:checkbox property="filteringEnabled" value="1" styleId="filteringEnabled"></html:checkbox>
+	<fmt:message key="advanced.filteringEnabled" />
 	</label>
-</p>
-<p>
-	<html:textarea property="filterKeywords" cols="30" rows="3" />
-</p>
+</div>
+<div class="form-group">
+	<html:textarea property="filterKeywords" rows="3" styleClass="form-control"/>
+</div>
 
Index: lams_tool_chat/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/authoring/authoring.jsp,v
diff -u -r1.17 -r1.17.2.1
--- lams_tool_chat/web/pages/authoring/authoring.jsp	7 Apr 2014 21:52:25 -0000	1.17
+++ lams_tool_chat/web/pages/authoring/authoring.jsp	25 May 2016 12:46:56 -0000	1.17.2.1
@@ -11,54 +11,53 @@
 		<c:set var="defineLater" value="yes" />
 	</c:if>
 
-	<div id="header">
-		<lams:Tabs control="true">
+	<html:hidden property="currentTab" styleId="currentTab" />
+	<html:hidden property="dispatch" value="updateContent" />
+	<html:hidden property="sessionMapID" />
+
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	<lams:Page title="${title}" type="navbar">
+
+		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ChatConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 			<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">
-
-		<div>
-			<html:hidden property="currentTab" styleId="currentTab" />
-			<html:hidden property="dispatch" value="updateContent" />
-			<html:hidden property="sessionMapID" />
-		</div>
-
-		<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:TabBodyArea>
 		
-		<lams:help toolSignature="<%=ChatConstants.TOOL_SIGNATURE%>"
-			module="authoring" />
+			<div id="message" style="text-align: center;">
+				<logic:messagesPresent>
+					 <lams:Alert id="errorMessages" type="danger" close="false">
+			            <c:out value="${error}" escapeXml="false"/><br/>
+			         </lams:Alert>
+				</logic:messagesPresent>
+			</div>
+		
+			<%-- Page tabs --%>
+			<lams:TabBodys>
+				<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
+				<c:if test="${sessionMap.mode == 'author'}">
+					<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+					<lams:TabBody id="3" titleKey="button.conditions" page="conditions.jsp" />
+				</c:if>
+			</lams:TabBodys>
+			
+			<lams:AuthoringButton formID="authoringForm"
+				clearSessionActionUrl="/clearsession.do" toolSignature="lachat11"
+				cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
+				toolContentID="${sessionMap.toolContentID}"
+				accessMode="${sessionMap.mode}" defineLater="${defineLater}"
+				customiseSessionID="${sessionMap.sessionID}"
+				contentFolderID="${sessionMap.contentFolderID}" />
+				
+		</lams:TabBodyArea>
 
-		<%-- Page tabs --%>
-		<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-		<c:if test="${sessionMap.mode == 'author'}">
-			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-			<lams:TabBody id="3" titleKey="button.conditions" page="conditions.jsp" />
-		</c:if>
+		<div id="footer"></div>
 
-		<lams:AuthoringButton formID="authoringForm"
-			clearSessionActionUrl="/clearsession.do" toolSignature="lachat11"
-			cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
-			toolContentID="${sessionMap.toolContentID}"
-			accessMode="${sessionMap.mode}" defineLater="${defineLater}"
-			customiseSessionID="${sessionMap.sessionID}"
-			contentFolderID="${sessionMap.contentFolderID}" />
-	</div>
-	<!--closes content-->
+	</lams:Page>
+
 </html:form>
 
-<div id="footer"></div>
Index: lams_tool_chat/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/authoring/basic.jsp,v
diff -u -r1.8 -r1.8.2.1
--- lams_tool_chat/web/pages/authoring/basic.jsp	6 Oct 2010 10:16:22 -0000	1.8
+++ lams_tool_chat/web/pages/authoring/basic.jsp	25 May 2016 12:46:56 -0000	1.8.2.1
@@ -6,24 +6,11 @@
 <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_chat/web/pages/authoring/conditionList.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/authoring/conditionList.jsp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- lams_tool_chat/web/pages/authoring/conditionList.jsp	24 Apr 2015 10:00:50 -0000	1.4.2.2
+++ lams_tool_chat/web/pages/authoring/conditionList.jsp	25 May 2016 12:46:56 -0000	1.4.2.3
@@ -7,11 +7,11 @@
 </c:set>
 
 <div id="conditionList">
-	<h2 class="spacer-left">
-		<fmt:message key="label.authoring.conditions.list.title" />
-	</h2>
-	
-	<table class="alternative-color" id="conditionTable" cellspacing="0">
+	<div>
+		<i class="fa-spinner" style="display:none" id="conditionListArea_Busy"></i>
+	</div>	
+
+	<table class="table table-striped table-condensed" id="conditionTable" >
 		<tr>
 			<th width="14%" align="left">
 				<fmt:message key="label.authoring.conditions.order" />
@@ -39,62 +39,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_chat/web/pages/authoring/conditions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/authoring/conditions.jsp,v
diff -u -r1.1 -r1.1.12.1
--- lams_tool_chat/web/pages/authoring/conditions.jsp	27 Oct 2008 03:31:23 -0000	1.1
+++ lams_tool_chat/web/pages/authoring/conditions.jsp	25 May 2016 12:46:56 -0000	1.1.12.1
@@ -1,90 +1,49 @@
 <%@ include file="/common/taglibs.jsp"%>
 <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;
 		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 = $('#chatConditionForm');
+		$('#conditionInputArea').load(form.attr('action'), form.serialize());
+	} 
 </script>
 
 <!-- Conditions Tab Content -->
@@ -93,18 +52,10 @@
 	<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>
\ No newline at end of file
Index: lams_tool_chat/web/pages/authoring/headItems.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/authoring/headItems.jsp,v
diff -u -r1.3 -r1.3.12.1
--- lams_tool_chat/web/pages/authoring/headItems.jsp	27 Oct 2008 03:31:23 -0000	1.3
+++ lams_tool_chat/web/pages/authoring/headItems.jsp	25 May 2016 12:46:56 -0000	1.3.12.1
@@ -1,10 +1,2 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-
-<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>
Index: lams_tool_chat/web/pages/monitoring/advanceOptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/advanceOptions.jsp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_chat/web/pages/monitoring/advanceOptions.jsp	12 Dec 2014 14:36:38 -0000	1.1.2.2
+++ lams_tool_chat/web/pages/monitoring/advanceOptions.jsp	25 May 2016 12:46:57 -0000	1.1.2.3
@@ -1,17 +1,7 @@
-<br /><br />
-
-<h1 style="padding-bottom: 10px;">
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
-
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.th.advancedSettings" />
-	</a>
-</h1>
-<br />
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-
-<table class="alternative-color">
-
+<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
+<lams:AdvancedAccordian title="${adTitle}">
+             
+<table class="table table-striped table-condensed">
 	<tr>
 		<td>
 			<fmt:message key="advanced.lockOnFinished" />
@@ -89,4 +79,4 @@
 		</c:when>
 	</c:choose>
 </table>
-</div>
\ No newline at end of file
+</lams:AdvancedAccordian>
\ No newline at end of file
Index: lams_tool_chat/web/pages/monitoring/chatHistory.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/chatHistory.jsp,v
diff -u -r1.11 -r1.11.12.1
--- lams_tool_chat/web/pages/monitoring/chatHistory.jsp	29 Apr 2008 01:24:27 -0000	1.11
+++ lams_tool_chat/web/pages/monitoring/chatHistory.jsp	25 May 2016 12:46:57 -0000	1.11.12.1
@@ -30,25 +30,32 @@
 
 <c:set var="session" value="${requestScope.sessionDTO}" />
 
+<c:set var="title"><fmt:message key="pageTitle.monitoring.chatHistory"/></c:set>
+<lams:Page title="${title}" type="learner">
+
 <c:choose>
 	<c:when test="${empty session.messageDTOs}">
 		<fmt:message key="message.noChatMessages" />
 	</c:when>
 	<c:otherwise>
 		<div class="space-left space-right">
 			<c:forEach var="message" items="${session.messageDTOs}">
-				<c:set var="hiddenStyle" value="" />
-				<c:if test="${message.hidden}">
-					<c:set var="hiddenStyle" value="color: graytext" />
-				</c:if>
+				<c:choose>
+				<c:when test="${message.hidden}">
+					<c:set var="hiddenStyle" value="color: graytext; text-decoration:line-through" />
+				</c:when>
+				<c:otherwise>
+					<c:set var="hiddenStyle" value="" />
+				</c:otherwise>
+				</c:choose>
 
 				<div class="message"
 					onclick="javascript:toggleEditPane('u${message.uid}')" style="">
 					<div class="messageFrom">
 						${message.from}
 					</div>
-					<lams:out escapeHtml="true" value="${message.body}"></lams:out>
-					<img src="images/edit.gif" alt="edit" />
+					<span style="${hiddenStyle}"><lams:out escapeHtml="true" value="${message.body}"></lams:out></span>
+					<i class="fa fa-pencil"	title="<fmt:message key='button.edit'/>"></i>
 				</div>
 
 				<div id="u${message.uid}" class="edit-pane">
@@ -60,11 +67,11 @@
 						<c:choose>
 							<c:when test="${message.hidden}">
 								<input id="cb${message.uid}" name="messageHidden"
-									type="checkbox" checked="checked" class="noBorder" />
+									type="checkbox" checked="checked"/>
 							</c:when>
 							<c:otherwise>
 								<input id="cb${message.uid}" name="messageHidden"
-									type="checkbox" class="noBorder" />
+									type="checkbox"/>
 							</c:otherwise>
 						</c:choose>
 
@@ -76,14 +83,13 @@
 						<html:textarea property="messageBody" value="${message.body}"
 							style="width:95%" rows="3" />
 						<br />
-						<br />
 
-						<html:submit styleClass="button">
+						<html:submit styleClass="btn btn-primary btn-sm">
 							<fmt:message>button.save</fmt:message>
-						</html:submit>
+						</html:submit>&nbsp;
 						<html:button property="dispatch"
 							onclick="javascript:toggleEditPane('u${message.uid}')"
-							styleClass="button">
+							styleClass="btn btn-default btn-sm">
 							<fmt:message>button.cancel</fmt:message>
 						</html:button>
 					</html:form>
@@ -94,3 +100,4 @@
 		</div>
 	</c:otherwise>
 </c:choose>
+</lams:Page>
\ No newline at end of file
Index: lams_tool_chat/web/pages/monitoring/daterestriction.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/daterestriction.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_chat/web/pages/monitoring/daterestriction.jsp	17 May 2011 02:21:54 -0000	1.2
+++ lams_tool_chat/web/pages/monitoring/daterestriction.jsp	25 May 2016 12:46:57 -0000	1.2.2.1
@@ -1,43 +1,29 @@
 <%@include file="/common/taglibs.jsp"%>
 
-<h1 style="padding-bottom: 10px;">
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="restrictUsageTreeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'), '<lams:LAMSURL/>');" />
+<c:set var="ddTitle"><fmt:message key="monitor.summary.date.restriction" /></c:set>
+<lams:RestrictedUsageAccordian title="${ddTitle}">
 
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.date.restriction" />
-	</a>
-</h1>
-<br />
-
-<div class="monitoring-advanced" id="restrictUsageDiv" style="display:none; ">
-
-	<p>
-		<fmt:message key="monitor.summary.when.date.restriction.is.set" />
-	</p	>
+	<p><fmt:message key="monitor.summary.when.date.restriction.is.set" /></p>
 		
 	<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
-		<span>
-			<fmt:message key="monitor.summary.after.date" />
-		</span>
-		
-		<input type="text" name="datetime" id="datetime" value=""/>
-				
-		<html:link	href="javascript:setSubmissionDeadline();" styleClass="button">
+		<div class="form-group">
+		<label for="datetime"><fmt:message key="monitor.summary.after.date" />&nbsp;
+		<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline"/>
+		</label>							
+		<html:link	href="javascript:setSubmissionDeadline();" styleClass="btn btn-default">
 			<fmt:message key="monitor.summary.set.restriction" />
 		</html:link>
+		</div>
 	</div>
 
 	<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
-		<span>
-			<fmt:message key="monitor.summary.after.date" />
-		</span>
-		
+		<label><fmt:message key="monitor.summary.after.date" /></span>
 		<span id="dateInfo">
 		</span>
-				
-		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="button">
+		</label>
+		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="btn btn-default">
 			<fmt:message key="monitor.summary.unset.restriction" />
 		</html:link>
 	</div>
 
-</div>
\ No newline at end of file
+</lams:RestrictedUsageAccordian>
\ No newline at end of file
Index: lams_tool_chat/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.10 -r1.10.2.1
--- lams_tool_chat/web/pages/monitoring/editActivity.jsp	8 Apr 2014 00:16:23 -0000	1.10
+++ lams_tool_chat/web/pages/monitoring/editActivity.jsp	25 May 2016 12:46:57 -0000	1.10.2.1
@@ -3,12 +3,12 @@
 <c:set var="dto" value="${requestScope.monitoringDTO}" />
 
 <c:if test="${dto.contentInUse}">
-	<p class="warning">
+	<lams:Alert type="warn" id="no-edit" close="false">
 		<fmt:message key="message.alertContentEdit" />
-	</p>
+	</lams:Alert>
 </c:if>
 
-<table cellspacing="0">
+<table class="table table-condensed">
 	<tbody>
 		<tr>
 			<td class="field-name" style="width: 10%;" nowrap>
@@ -34,8 +34,7 @@
 	<c:param name="mode" value="teacher" />
 	<c:param name="contentFolderID" value="${contentFolderID}"></c:param>
 </c:url>
-<html:link href="${fn:escapeXml(authoringUrl)}"
-	styleClass="button right-buttons" target="_blank">
+<a href="#" onClick="javascript:launchPopup('${authoringUrl}')" class="btn btn-default">
 	<fmt:message key="button.editActivity" />
-</html:link>
+</a>
 
Index: lams_tool_chat/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.7 -r1.7.2.1
--- lams_tool_chat/web/pages/monitoring/monitoring.jsp	16 Feb 2014 18:18:38 -0000	1.7
+++ lams_tool_chat/web/pages/monitoring/monitoring.jsp	25 May 2016 12:46:57 -0000	1.7.2.1
@@ -1,23 +1,25 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.chat.util.ChatConstants"%>
 
-<div id="header">
-	<lams:Tabs>
-		<lams:Tab id="1" key="button.summary" />
-		<lams:Tab id="2" key="button.editActivity" />
-		<lams:Tab id="3" key="button.statistics" />
-	</lams:Tabs>
-	<script type="text/javascript">
-		var initialTabId = "${requestScope.monitoringDTO.currentTab}";
-	</script>
-</div>
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	<lams:Page title="${title}" type="navbar">
 
-<div id="content">
-	<lams:help toolSignature="<%= ChatConstants.TOOL_SIGNATURE %>" module="monitoring"/>
+		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ChatConstants.TOOL_SIGNATURE %>" helpModule="monitoring">
+			<lams:Tab id="1" key="button.summary" />
+			<lams:Tab id="2" key="button.editActivity" />
+			<lams:Tab id="3" key="button.statistics" />
+		</lams:Tabs>
+		<script type="text/javascript">
+			var initialTabId = "${requestScope.monitoringDTO.currentTab}";
+		</script>
 
-	<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-	<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
-	<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
-</div>
+		<lams:TabBodyArea>
+		<lams:TabBodys>
+			<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
+			<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
+			<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+		</lams:TabBodys>
+		</lams:TabBodyArea>
 
-<div id="footer"></div>
+		<div id="footer"></div>
+	</lams:Page>
\ No newline at end of file
Index: lams_tool_chat/web/pages/monitoring/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/notebook.jsp,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_chat/web/pages/monitoring/notebook.jsp	27 Mar 2014 01:42:35 -0000	1.3
+++ lams_tool_chat/web/pages/monitoring/notebook.jsp	25 May 2016 12:46:57 -0000	1.3.2.1
@@ -1,5 +1,8 @@
 <%@ include file="/common/taglibs.jsp"%>
 
+<c:set var="title"><fmt:message key="heading.reflection"/></c:set>
+<lams:Page title="${title}" type="learner">
+
 <table>
 	<tr>
 		<td>
@@ -17,3 +20,4 @@
 	</tr>
 </table>
 
+</lams:Page>
\ No newline at end of file
Index: lams_tool_chat/web/pages/monitoring/statistics.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/statistics.jsp,v
diff -u -r1.8 -r1.8.2.1
--- lams_tool_chat/web/pages/monitoring/statistics.jsp	24 Oct 2012 11:27:01 -0000	1.8
+++ lams_tool_chat/web/pages/monitoring/statistics.jsp	25 May 2016 12:46:57 -0000	1.8.2.1
@@ -1,16 +1,23 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set var="dto" value="${requestScope.monitoringDTO}" />
+
+
 <c:forEach var="session" items="${dto.sessionDTOs}">
-	<table cellspacing="0">
+
+	<c:if test="${isGroupedActivity}">	
+	    <div class="panel panel-default" >
+        <div class="panel-heading" id="heading${session.sessionID}">
+			<span class="panel-title">
+				<c:out value="${session.sessionName}" />
+			</span>
+        </div>
+        <div class="panel-body">
+	</c:if>
+
+	<table class="table table-condensed table-no-border">
 		<tbody>
 			<tr>
-				<td colspan="2">
-					<h2>${session.sessionName}</h2>
-				</td>
-			</tr>
-
-			<tr>
 				<td class="field-name" style="width: 30%;">
 					<fmt:message>heading.totalLearners</fmt:message>
 				</td>
@@ -49,5 +56,9 @@
 			</c:forEach>
 		</tbody>
 	</table>
-	<hr/>
+	
+	<c:if test="${isGroupedActivity}">	
+		</div>
+	</c:if>
+	
 </c:forEach>
Index: lams_tool_chat/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/summary.jsp,v
diff -u -r1.29.2.3 -r1.29.2.4
--- lams_tool_chat/web/pages/monitoring/summary.jsp	4 May 2015 17:01:17 -0000	1.29.2.3
+++ lams_tool_chat/web/pages/monitoring/summary.jsp	25 May 2016 12:46:57 -0000	1.29.2.4
@@ -19,150 +19,143 @@
 		messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
 	};
 </script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>  
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
-<h1>
-	<c:out value="${monitoringDTO.title}" escapeXml="true"/>
-</h1>
-
-<div class="space-top small-space-bottom instructions">
-	<c:out value="${monitoringDTO.instructions}" escapeXml="false"/>
+<div class="panel">
+	<h4>
+	    <c:out value="${monitoringDTO.title}" escapeXml="true"/>
+	</h4>
+	<div class="instructions voffset5">
+	    <c:out value="${monitoringDTO.instructions}" escapeXml="false"/>
+	</div>
 </div>
 
-<c:forEach var="session" items="${dto.sessionDTOs}">
-	<table cellspacing="0">
-		<c:if test="${isGroupedActivity}">
+<c:if test="${isGroupedActivity}">
+<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
+</c:if>
+
+<c:forEach var="session" items="${dto.sessionDTOs}" varStatus="status">
+
+	<c:if test="${isGroupedActivity}">	
+	    <div class="panel panel-default" >
+        <div class="panel-heading" id="heading${session.sessionID}">
+        	<span class="panel-title collapsable-icon-left">
+        	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${session.sessionID}" 
+					aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${session.sessionID}" >
+			<c:out value="${session.sessionName}" /></a>
+			</span>
+        </div>
+        
+        <div id="collapse${session.sessionID}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel" aria-labelledby="heading${session.sessionID}">
+	</c:if>
+
+		<table class="table table-condensed table-no-border">
 			<tr>
-				<td colspan="2">
-					<h2>
-						${session.sessionName}
-					</h2>
+				<td class="field-name" style="width: 30%;">
+					<fmt:message>heading.totalLearners</fmt:message>
 				</td>
+				<td>
+					${session.numberOfLearners}
+				</td>
+				<td rowspan="2">
+					<div class="pull-right">
+						<a href="#" onClick="javascript:launchPopup('monitoring.do?dispatch=openChatHistory&toolSessionID=${session.sessionID}')" class="btn btn-default btn-sm">
+							<fmt:message>summary.editMessages</fmt:message></a>
+						<a href="#" onClick="javascript:launchPopup('learning.do?toolSessionID=${session.sessionID}&mode=teacher')" class="btn btn-default btn-sm">
+							<fmt:message>summary.openChat</fmt:message></a>
+					</div>			
+				</td>
 			</tr>
-		</c:if>
+	
+			<tr>
+				<td class="field-name" style="width: 30%;">
+					<fmt:message>heading.totalMessages</fmt:message>
+				</td>
+				<td>
+					${session.numberOfPosts}
+				</td>
+			</tr>
+		</table>			
 
-		<tr>
-			<td class="field-name" style="width: 30%;">
-				<fmt:message>heading.totalLearners</fmt:message>
-			</td>
-			<td>
-				${session.numberOfLearners}
-			</td>
-		</tr>
-
-		<tr>
-			<td class="field-name" style="width: 30%;">
-				<fmt:message>heading.totalMessages</fmt:message>
-			</td>
-			<td>
-				${session.numberOfPosts}
-			</td>
-		</tr>
-
-		<tr>
-			<td colspan="2">
-				<h4>
-					<fmt:message>heading.recentMessages</fmt:message>
-				</h4>
-			</td>
-		</tr>
-
-		<tr>
-			<td colspan="2">
-				<c:choose>
-					<c:when test="${empty session.messageDTOs}">
-						<fmt:message>message.noChatMessages</fmt:message>
-					</c:when>
-					<c:otherwise>
-						<c:forEach var="message" items="${session.messageDTOs}">
-							<div class="message">
-								<div class="messageFrom">
-									${message.from}
-								</div>
-								<lams:out escapeHtml="true" value="${message.body}"></lams:out>
+		<!--  View the Messages -->
+		<hr/>
+		<div class="loffset5">
+			<strong><fmt:message>heading.recentMessages</fmt:message></strong>
+			<c:choose>
+				<c:when test="${empty session.messageDTOs}">
+					<fmt:message>message.noChatMessages</fmt:message>
+				</c:when>
+				<c:otherwise>
+					<c:forEach var="message" items="${session.messageDTOs}">
+						<div class="message">
+							<div class="messageFrom">
+								${message.from}
 							</div>
-						</c:forEach>
-
-					</c:otherwise>
-				</c:choose>
-			</td>
-		</tr>
-	</table>
+							<lams:out escapeHtml="true" value="${message.body}"></lams:out>
+						</div>
+					</c:forEach>
+				</c:otherwise>
+			</c:choose>
+		</div>
+		<!--  End of the Messages -->
+						
+		<hr/>
+		<!--  View the Reflections -->
+		<c:if test="${dto.reflectOnActivity}">
+			<table class="table table-condensed table-no-border">
+				<th>
+					<fmt:message>heading.learner</fmt:message>
+				</th>
+				<th class="text-center">
+					<fmt:message>heading.numPosts</fmt:message>
+				</th>
 	
-	<html:form action="/monitoring" method="get" target="_blank" style="display:inline; padding-left: 30px;">
-		<html:hidden property="dispatch" value="openChatHistory" />
-		<html:hidden property="toolSessionID"	value="${session.sessionID}" />
-		<html:submit styleClass="button">
-			<fmt:message>summary.editMessages</fmt:message>
-		</html:submit>
-	</html:form>
-	<html:form action="/learning" method="get" target="_blank" style="display:inline;">
-		<html:hidden property="toolSessionID" value="${session.sessionID}" />
-		<html:hidden property="mode" value="teacher" />
-		<html:submit styleClass="button">
-			<fmt:message>summary.openChat</fmt:message>
-		</html:submit>
-	</html:form>
-			
-	<c:if test="${dto.reflectOnActivity}">
-		<h3>
-			<fmt:message>label.reflections</fmt:message>
-		</h3>
-			
-		<table class="alternative-color">
-			<th>
-				<fmt:message>heading.learner</fmt:message>
-			</th>
-			<th align="center">
-				<fmt:message>heading.numPosts</fmt:message>
-			</th>
-
-			<th align="center">
-				<c:choose>
-					<c:when test="${dto.reflectOnActivity}">
-						<fmt:message key="heading.reflection" />
-					</c:when>
-					<c:otherwise>
-						&nbsp;
-					</c:otherwise>
-				</c:choose>
-			</th>
-
-			<c:forEach var="user" items="${session.userDTOs}">
-				<tr>
-					<td>
-						<c:out value="${user.nickname}" escapeXml="true"/>
-					</td>
-					<td align="center">
-						${user.postCount}
-					</td>
-					<c:if test="${dto.reflectOnActivity}">
-						<td align="center">
-							<c:if test="${user.finishedReflection}">
-								<c:url value="monitoring.do" var="openNotebook">
-									<c:param name="dispatch" value="openNotebook" />
-									<c:param name="uid" value="${user.uid}" />
-								</c:url>
-
-								<html:link href="javascript:launchPopup('${fn:escapeXml(openNotebook)}')">
-									<fmt:message key="link.view" />
-								</html:link>
-							</c:if>
+				<th class="text-center">
+					<fmt:message key="heading.reflection" />
+				</th>
+	
+				<c:forEach var="user" items="${session.userDTOs}">
+					<tr>
+						<td>
+							<c:out value="${user.nickname}" escapeXml="true"/>
 						</td>
-					</c:if>
-				</tr>
-			</c:forEach>
-        </table>
+						<td class="text-center">
+							${user.postCount}
+						</td>
+						<c:if test="${dto.reflectOnActivity}">
+							<td class="text-center">
+								<c:if test="${user.finishedReflection}">
+									<c:url value="monitoring.do" var="openNotebook">
+										<c:param name="dispatch" value="openNotebook" />
+										<c:param name="uid" value="${user.uid}" />
+									</c:url>
+	
+									<html:link href="javascript:launchPopup('${fn:escapeXml(openNotebook)}')">
+										<fmt:message key="link.view" />
+									</html:link>
+								</c:if>
+							</td>
+						</c:if>
+					</tr>
+				</c:forEach>
+	        </table>
 	</c:if>
+	<!--  End of the Reflections -->
 	
-	<c:if test="${fn:length(dto.sessionDTOs) > 1}">
-		<hr width="100%"/>
+	<c:if test="${isGroupedActivity}">
+		</div> <!-- end collapse area  -->
+		</div> <!-- end collapse panel  -->
 	</c:if>
+	${ !isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
+	
 </c:forEach>
 
+<c:if test="${isGroupedActivity}">
+</div> 
+</c:if>
+
 <%@include file="advanceOptions.jsp"%>
 <%@include file="daterestriction.jsp"%>