Index: lams_tool_chat/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/AdvancedAccordian.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/AdvancedAccordian.tag	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/Arrow.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/Arrow.tag	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -0,0 +1,349 @@
+<% 
+ /**
+  * AuthoringRatingCriteria.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias 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"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+
+<!-- calculate whether isCommentsAllowed is true -->
+<c:set var="isCommentsEnabled" value="false"/>
+<c:set var="commentsMinWordsLimit" value="0"/>
+<c:forEach var="criteria" items="${criterias}" varStatus="status">
+	<c:if test="${criteria.commentsEnabled}">
+		<c:set var="isCommentsEnabled" value="true"/>
+		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
+	</c:if>
+</c:forEach>
+
+<!-- begin tab content -->
+<script type="text/javascript">
+$(document).ready(function() { 
+	
+	// find max orderId
+	<c:set var="maxOrderId" value="0"/>
+	<c:forEach var="criteria" items="${criterias}" varStatus="status">
+		<c:if test="${criteria.orderId > maxOrderId}">
+			<c:set var="maxOrderId" value="${criteria.orderId}"/>
+		</c:if>
+	</c:forEach>
+	var maxOrderId = ${maxOrderId};
+	
+	function addCriteria() {
+		//increase maxOrderId by 1
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		
+		jQuery('<tr/>').append(jQuery('<td/>', {
+			'class': 'criteria-info',
+		    html: '<input type="hidden" name="criteriaOrderId' + maxOrderId + '" value="' + maxOrderId + '">' + 
+		    		'<input type="text" name="criteriaTitle' + maxOrderId + '" value="" class="form-control">'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');
+		
+		reactivateArrows();
+	}
+	<c:if test="${empty criterias}">
+		addCriteria(); 
+		addCriteria();
+	</c:if>
+	reactivateArrows();
+	
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+	
+	//upCriteria
+	 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+		var currentRow = $(this).closest('tr');
+		var currentCriteriaTd = $( ".criteria-info", currentRow);
+		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+		//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+		var prevRow = currentRow.prev();
+		var prevCriteriaTd = $( ".criteria-info", prevRow);
+		var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+		//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+		
+		//swap orderIds
+		var temp = currentOrderId.val();
+		currentOrderId.val(prevOrderId.val());
+		prevOrderId.val(temp);
+		
+		//swap elements
+		currentCriteriaTd.detach().prependTo(prevRow);
+		prevCriteriaTd.detach().prependTo(currentRow);
+		
+		reactivateArrows();
+	 } );
+	 
+	//downCriteria
+	 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+		var currentRow = $(this).closest('tr');
+		var currentCriteriaTd = $( ".criteria-info", currentRow);
+		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+		//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+		var nextRow = currentRow.next();
+		var nextCriteriaTd = $( ".criteria-info", nextRow);
+		var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+		//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+		
+		//swap orderIds
+		var temp = currentOrderId.val();
+		currentOrderId.val(nextOrderId.val());
+		nextOrderId.val(temp);
+		
+		//swap elements
+		currentCriteriaTd.detach().prependTo(nextRow);
+		nextCriteriaTd.detach().prependTo(currentRow);
+		
+		reactivateArrows();
+	 });
+	 
+	 //deleteCriteria
+	 $( "body" ).on( "click", ".fa-times", function() {
+		var currentRow = $(this).closest('tr');
+		currentRow.remove();
+		
+		reactivateArrows();
+	});
+	 
+	 //addCriteria
+	 $( "body" ).on( "click", "#add-criteria", function() {
+		 addCriteria();
+	});
+	 
+ 	//spinner
+ 	var minimumWordsSpinner = $("#comments-min-words-limit").spinner({ 
+ 		min: 0,
+ 		disabled: ${!isCommentsEnabled}
+ 	});
+ 	$("#enable-comments").click(function() {
+ 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+ 			minimumWordsSpinner.spinner( "enable" );
+ 			$("#comments-min-words-limit-label").removeClass("gray-color");
+ 		} else {
+ 			minimumWordsSpinner.spinner( "disable" );
+ 			$("#comments-min-words-limit-label").addClass("gray-color");
+ 		}
+     });
+	 
+})
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum) {
+		var minRateDropDown = document.getElementById("minimum-rates");
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximum-rates");
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+	<div class="panel panel-default voffset5">
+		<div class="panel-heading panel-title">
+			<label><fmt:message key="${headerLabel}" /></label>
+		</div>
+	
+		<div class="form-group roffset10 loffset10">
+			<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+			<table class="table table-condensed table-no-border" id="criterias-table">
+		
+				<c:forEach var="criteria" items="${criterias}" varStatus="status">
+					<c:if test="${!criteria.commentsEnabled}">
+						<tr>
+							
+							<td class="criteria-info">
+								<input type="hidden" name="criteriaOrderId${criteria.orderId}" value="${criteria.orderId}">
+								<input type="text" name="criteriaTitle${criteria.orderId}" value="${criteria.title}" class="form-control">
+							</td>
+							
+							<td width="40px">
+								<div class="arrow-up" title="<fmt:message key="${upLabel}"/>"></div>
+								<div class="arrow-down" title="<fmt:message key="${downLabel}"/>"></div>
+							</td>
+			                
+							<td width="20px">
+								<i class="fa fa-times" title="<fmt:message key="${deleteLabel}" />"></i>
+							</td>
+						</tr>
+					</c:if>
+				</c:forEach>
+			</table>
+	
+			<div style="height: 25px; margin-top: -10px;">
+				<a href="#nogo" class="btn btn-default btn-xs pull-right" id="add-criteria">
+					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+				</a>
+			</div>
+	
+			<c:if test="${hasRatingLimits}">
+				<div>
+					<label for="minimum-rates">
+						<fmt:message key="${minimumLabel}" />
+					</label>
+					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							styleClass="form-control form-control-inline">
+						<html:option value="0">
+							<fmt:message key="${noMinimumLabel}" />
+						</html:option>
+						<html:option value="1">1</html:option>
+						<html:option value="2">2</html:option>
+						<html:option value="3">3</html:option>
+						<html:option value="4">4</html:option>
+						<html:option value="5">5</html:option>
+						<html:option value="6">6</html:option>
+						<html:option value="7">7</html:option>
+						<html:option value="8">8</html:option>
+						<html:option value="9">9</html:option>
+						<html:option value="10">10</html:option>
+					</html:select>
+				
+					<label for="maximum-rates">
+						<fmt:message key="${maximumLabel}" />
+					</label>
+					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							styleClass="form-control form-control-inline">
+						<html:option value="0">
+							<fmt:message key="${noMaximumLabel}" />
+						</html:option>
+						<html:option value="1">1</html:option>
+						<html:option value="2">2</html:option>
+						<html:option value="3">3</html:option>
+						<html:option value="4">4</html:option>
+						<html:option value="5">5</html:option>
+						<html:option value="6">6</html:option>
+						<html:option value="7">7</html:option>
+						<html:option value="8">8</html:option>
+						<html:option value="9">9</html:option>
+						<html:option value="10">10</html:option>
+					</html:select>
+				</div>
+			</c:if>
+	
+			<div class="checkbox">
+				<label for="enable-comments">
+					<input type="checkbox" name="isCommentsEnabled" value="true" class="noBorder" id="enable-comments"
+						<c:if test="${isCommentsEnabled}">checked="checked"</c:if>
+					/>
+					<fmt:message key="${allowCommentsLabel}" />
+				</label>
+			</div>
+	
+			<div>
+				<label for="comments-min-words-limit" id="comments-min-words-limit-label"
+					<c:if test="${!isCommentsEnabled}">class="gray-color"</c:if>
+				>
+					<fmt:message key="${minNumberWordsLabel}" >
+						<fmt:param> </fmt:param>
+					</fmt:message>
+				</label>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+			</div>
+		</div>
+	</div>
+</div>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdc884b8e6274ebbc664d1ee940e565803445bb26 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
+++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/Comments.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/Comments.tag	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/CommentsAuthor.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/CommentsAuthor.tag	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rcfd0bcd118bf9590cbe46ed0e8dc1dfc451f26af -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision cfd0bcd118bf9590cbe46ed0e8dc1dfc451f26af)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/Rating.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/Rating.tag	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -0,0 +1,194 @@
+<% 
+ /**
+  * Rating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows rating stars widget
+  */
+ %>
+<%@ 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"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="itemRatingDto" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.ItemRatingDTO" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="disabled" required="false" rtexprvalue="true" %>
+<%@ attribute name="isItemAuthoredByUser" required="false" rtexprvalue="true" %>
+<%@ attribute name="maxRates" required="false" rtexprvalue="true" %>
+<%@ attribute name="countRatedItems" required="false" rtexprvalue="true" %>
+<%@ attribute name="yourRatingLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty disabled}">
+	<c:set var="disabled" value="false" scope="request"/>
+</c:if>
+<c:if test="${empty isItemAuthoredByUser}">
+	<c:set var="isItemAuthoredByUser" value="false" scope="request"/>
+</c:if>
+<c:if test="${empty maxRates}">
+	<c:set var="maxRates" value="0" scope="request"/>
+</c:if>
+<c:if test="${empty countRatedItems}">
+	<c:set var="countRatedItems" value="0" scope="request"/>
+</c:if>
+<c:if test="${empty yourRatingLabel}">
+	<c:set var="yourRatingLabel" value="label.your.rating" scope="request"/>
+</c:if>
+<c:if test="${empty averageRatingLabel}">
+	<c:set var="averageRatingLabel" value="label.average.rating" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.comment.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty showComments}">
+	<c:set var="showComments" value="true" scope="request"/>
+</c:if>
+<c:set var="isCommentsEnabled" value="${itemRatingDto.commentsEnabled && showComments}"/>
+
+<c:if test="${isCommentsEnabled}">
+	<c:set var="userId"><lams:user property="userID" /></c:set>
+	<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+		<c:if test="${comment.userId == userId}">
+			<c:set var="commentLeftByUser" value="${comment}"/>
+		</c:if>
+	</c:forEach>
+</c:if>
+
+<%--Rating stars area---------------------------------------%>
+
+<div class="extra-controls-inner">
+<div class="rating-stars-holder text-center center-block">
+
+	<c:set var="hasStartedRating" value="false"/>
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}">
+		<c:set var="hasStartedRating" value='${hasStartedRating || criteriaDto.userRating != ""}'/>
+	</c:forEach>
+	<c:set var="hasStartedRating" value='${hasStartedRating || not empty commentLeftByUser}'/>
+	
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}" varStatus="status">
+		<c:set var="objectId" value="${criteriaDto.ratingCriteria.ratingCriteriaId}-${itemRatingDto.itemId}"/>
+		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
+	
+		<c:choose>
+			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
+			</c:when>
+			<c:otherwise>
+				<c:set var="ratingStarsClass" value="rating-stars"/>
+			</c:otherwise>
+		</c:choose>
+			
+		<strong>
+			${criteriaDto.ratingCriteria.title}
+		</strong>
+			
+		<c:choose>
+			<c:when test='${isItemAuthoredByUser || not isCriteriaNotRatedByUser}'>
+				<c:set var="ratingDataAverage" value="${criteriaDto.averageRating}"/>
+			</c:when>
+			<c:otherwise>
+				<c:set var="ratingDataAverage" value="0"/>
+			</c:otherwise>
+		</c:choose>
+		
+		<div class="${ratingStarsClass} rating-stars-new" data-average="${ratingDataAverage}" data-id="${objectId}">
+		</div>
+			
+		<c:choose>
+			<c:when test="${isItemAuthoredByUser}">
+				<div class="rating-stars-caption">
+					<fmt:message key="${averageRatingLabel}" >
+						<fmt:param>
+							<fmt:formatNumber value="${criteriaDto.averageRating}" type="number" maxFractionDigits="1" />
+						</fmt:param>
+						<fmt:param>
+							${criteriaDto.numberOfVotes}
+						</fmt:param>
+					</fmt:message>
+				</div>
+			</c:when>
+				
+			<c:otherwise>
+				<div class="rating-stars-caption" id="rating-stars-caption-${objectId}"
+					<c:if test="${isCriteriaNotRatedByUser}">style="visibility: hidden;"</c:if>
+				>
+					<fmt:message key="${yourRatingLabel}" >
+						<fmt:param>
+							<span id="user-rating-${objectId}">
+								<fmt:formatNumber value="${criteriaDto.userRating}" type="number" maxFractionDigits="1" />
+							</span>
+						</fmt:param>			
+						<fmt:param>
+							<span id="average-rating-${objectId}">
+								<fmt:formatNumber value="${criteriaDto.averageRating}" type="number" maxFractionDigits="1" />
+							</span>
+						</fmt:param>
+						<fmt:param>
+							<span id="number-of-votes-${objectId}">${criteriaDto.numberOfVotes}</span>
+						</fmt:param>
+					</fmt:message>
+				</div>
+				
+			</c:otherwise>
+		</c:choose>
+			
+	</c:forEach>
+
+</div>
+
+</div>
+
+<%--Comments area---------------------------------------%>
+<c:if test="${isCommentsEnabled}">
+	<div id="comments-area-${itemRatingDto.itemId}">
+	
+		<c:choose>
+			<c:when test='${isItemAuthoredByUser}'>
+				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+					<div class="rating-comment">
+						<c:out value="${comment.comment}" escapeXml="false" />
+					</div>
+				</c:forEach>
+			</c:when>
+			
+			<c:when test='${not empty commentLeftByUser}'>
+				<div class="rating-comment">
+					<c:out value="${commentLeftByUser.comment}" escapeXml="false" />
+				</div>
+			</c:when>
+			
+			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
+				<div id="add-comment-area-${itemRatingDto.itemId}">
+			
+					<!-- Comment min words limit -->
+					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
+					
+						<lams:Alert type="info" id="comment-limit-${itemRatingDto.itemId}" close="false">
+							<fmt:message key="${minNumberWordsLabel}">
+								: <fmt:param value="${itemRatingDto.commentsMinWordsLimit}"/>
+							</fmt:message>
+						</lams:Alert>
+					</c:if>		
+				
+					<div class="no-gutter">
+						<div class="col-xs-12 col-sm-11 ">
+						<textarea name="comment" rows="2" id="comment-textarea-${itemRatingDto.itemId}" onfocus="if(this.value==this.defaultValue)this.value='';" 
+								onblur="if(this.value=='')this.value=this.defaultValue;" 
+								class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>
+						</div>
+						<div class="button add-comment add-comment-new col-xs-12 col-sm-1 " data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}">
+						</div>
+					</div>		
+				</div>			
+			</c:when>
+		</c:choose>
+			
+	</div>	
+</c:if>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/TSTable.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/TSTable.tag	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rb5c9ab3d41689d5418b146ccd178c39a82a78fcc -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b5c9ab3d41689d5418b146ccd178c39a82a78fcc)
+++ lams_tool_chat/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_chat/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/TabBodyArea.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/TabBodyArea.tag	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/TabBodys.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/TabBodys.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/TabBodys.tag	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
+++ lams_tool_chat/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_chat/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_chat/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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/images/cross.gif
===================================================================
diff -u -rcd0d0b28a7c27711a74ce2b41821f3ccf5c80df9 -r8955c559e118a75bcdec763ebae2e745a0421236
Binary files differ
Index: lams_tool_chat/web/images/down.gif
===================================================================
diff -u -rcd0d0b28a7c27711a74ce2b41821f3ccf5c80df9 -r8955c559e118a75bcdec763ebae2e745a0421236
Binary files differ
Index: lams_tool_chat/web/images/down_disabled.gif
===================================================================
diff -u -rcd0d0b28a7c27711a74ce2b41821f3ccf5c80df9 -r8955c559e118a75bcdec763ebae2e745a0421236
Binary files differ
Index: lams_tool_chat/web/images/edit.gif
===================================================================
diff -u -r88d61836959d6d198e1c313a361c823ed52ae544 -r8955c559e118a75bcdec763ebae2e745a0421236
Binary files differ
Index: lams_tool_chat/web/images/success.gif
===================================================================
diff -u -rb32ded72d955763a9b49e33e2dc2ab195d83564b -r8955c559e118a75bcdec763ebae2e745a0421236
Binary files differ
Index: lams_tool_chat/web/images/up.gif
===================================================================
diff -u -rcd0d0b28a7c27711a74ce2b41821f3ccf5c80df9 -r8955c559e118a75bcdec763ebae2e745a0421236
Binary files differ
Index: lams_tool_chat/web/images/up_disabled.gif
===================================================================
diff -u -rcd0d0b28a7c27711a74ce2b41821f3ccf5c80df9 -r8955c559e118a75bcdec763ebae2e745a0421236
Binary files differ
Index: lams_tool_chat/web/layouts/defaultLayout.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_chat/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_chat/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_chat/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -r1977f2d6d4038839d28238041d7e5cd4dfd35036 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 1977f2d6d4038839d28238041d7e5cd4dfd35036)
+++ lams_tool_chat/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -r976c59b0d650f97f6b26f5145a6696f08f41d2cc -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 976c59b0d650f97f6b26f5145a6696f08f41d2cc)
+++ lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_chat/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59)
+++ lams_tool_chat/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -rcd0d0b28a7c27711a74ce2b41821f3ccf5c80df9 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/authoring/conditions.jsp	(.../conditions.jsp)	(revision cd0d0b28a7c27711a74ce2b41821f3ccf5c80df9)
+++ lams_tool_chat/web/pages/authoring/conditions.jsp	(.../conditions.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -rcd0d0b28a7c27711a74ce2b41821f3ccf5c80df9 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision cd0d0b28a7c27711a74ce2b41821f3ccf5c80df9)
+++ lams_tool_chat/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -rffa266941e9221c322dfeb454965d81ed66db4e0 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/monitoring/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision ffa266941e9221c322dfeb454965d81ed66db4e0)
+++ lams_tool_chat/web/pages/monitoring/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -r2495e17b412e141f3827b7edee81e43475d16d07 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/monitoring/chatHistory.jsp	(.../chatHistory.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
+++ lams_tool_chat/web/pages/monitoring/chatHistory.jsp	(.../chatHistory.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -r9f7df51118e418eead64378c028572b0baf39196 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/monitoring/daterestriction.jsp	(.../daterestriction.jsp)	(revision 9f7df51118e418eead64378c028572b0baf39196)
+++ lams_tool_chat/web/pages/monitoring/daterestriction.jsp	(.../daterestriction.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -r274355fcd480dda4c317d4feeb509abdee5017a8 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 274355fcd480dda4c317d4feeb509abdee5017a8)
+++ lams_tool_chat/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -r195fae6595b30307b56434a26de069a1d03c211f -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 195fae6595b30307b56434a26de069a1d03c211f)
+++ lams_tool_chat/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -r98424ecde9e3fa1c56c4477b6a555bdfe0a310d2 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 98424ecde9e3fa1c56c4477b6a555bdfe0a310d2)
+++ lams_tool_chat/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -recb763befc0380d0810f5794203bfcdf9ca0bfe7 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision ecb763befc0380d0810f5794203bfcdf9ca0bfe7)
+++ lams_tool_chat/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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
===================================================================
diff -u -r732f77a31113c5838d0704829b99418d90053471 -r8955c559e118a75bcdec763ebae2e745a0421236
--- lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 732f77a31113c5838d0704829b99418d90053471)
+++ lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
@@ -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"%>