Index: lams_tool_notebook/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.29.2.6 -r1.29.2.7
--- lams_tool_notebook/conf/language/lams/ApplicationResources.properties	11 May 2016 07:37:21 -0000	1.29.2.6
+++ lams_tool_notebook/conf/language/lams/ApplicationResources.properties	18 May 2016 10:29:30 -0000	1.29.2.7
@@ -103,6 +103,7 @@
 monitor.summary.notification  =Notification
 monitor.summary.date.restriction.set  =Deadline has been set
 monitor.summary.date.restriction.removed  =Deadline has been removed
+message.session.name =Group
 output.desc.all.users.entries.definition.notebook  =Each learners' entry in Notebook
 button.submit  =Finish
 message.monitoring.summary.no.session  =No sessions available
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java,v
diff -u -r1.11.2.2 -r1.11.2.3
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java	11 May 2016 07:37:21 -0000	1.11.2.2
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookDTO.java	18 May 2016 10:29:30 -0000	1.11.2.3
@@ -21,8 +21,6 @@
  * ****************************************************************
  */
 
-
-
 package org.lamsfoundation.lams.tool.notebook.dto;
 
 import java.util.Date;
@@ -51,8 +49,6 @@
 
     public Set<NotebookSessionDTO> sessionDTOs = new TreeSet<NotebookSessionDTO>();
 
-    public Long currentTab;
-
     /* Constructors */
     public NotebookDTO() {
     }
@@ -144,12 +140,4 @@
     public void setSubmissionDeadline(Date submissionDeadline) {
 	this.submissionDeadline = submissionDeadline;
     }
-
-    public Long getCurrentTab() {
-	return currentTab;
-    }
-
-    public void setCurrentTab(Long currentTab) {
-	this.currentTab = currentTab;
-    }
 }
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tiles-defs.xml,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_tool_notebook/web/WEB-INF/tiles-defs.xml	17 May 2016 10:20:13 -0000	1.3.2.3
+++ lams_tool_notebook/web/WEB-INF/tiles-defs.xml	18 May 2016 10:29:30 -0000	1.3.2.4
@@ -28,6 +28,7 @@
 	<!--  Begin: Layouts -->
 	<definition name="tiles:/layout" path="/layouts/layout.jsp">
 		<put name="header" value=""/>
+		<put name="body" value=""/>
 	</definition>
 	<!--  End: Layouts -->
 
@@ -42,14 +43,17 @@
 
 	<!-- Begin: Learning -->
 	<definition name="tiles:/learning/main" extends="tiles:/layout">
+		<put name="header" value="/pages/learning/headItems.jsp" />
 		<put name="body" value="/pages/learning/notebook.jsp" />
 	</definition>
 
 	<definition name="tiles:/learning/submissionDeadline" extends="tiles:/layout">
+		<put name="header" value="/pages/learning/headItems.jsp" />
 		<put name="body" value="/pages/learning/submissionDeadline.jsp" />
 	</definition>
 	
 	<definition name="tiles:/learning/defineLater" extends="tiles:/layout">
+		<put name="header" value="/pages/learning/headItems.jsp" />
 		<put name="body" value="/pages/learning/defineLater.jsp" />
 	</definition>
 	<!-- End: Learning -->
Index: lams_tool_notebook/web/includes/javascript/authoring.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/includes/javascript/authoring.js,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_notebook/web/includes/javascript/authoring.js	17 Jan 2014 22:10:27 -0000	1.3
+++ lams_tool_notebook/web/includes/javascript/authoring.js	18 May 2016 10:29:29 -0000	1.3.2.1
@@ -1,19 +1,3 @@
-
-function init() {
-	// open the current tab    
-	var tag = document.getElementById("currentTab");
-	if (tag.value != "") {
-		selectTab(tag.value);
-	} else {
-		selectTab(1);
-	}
-}
 function doSelectTab(tabId) {
-	var tag = document.getElementById("currentTab");
-	tag.value = tabId;
 	selectTab(tabId);
-}
-function doSubmit(method) {
-	document.authoringForm.dispatch.value = method;
-	document.authoringForm.submit();
-}
+}
\ No newline at end of file
Index: lams_tool_notebook/web/includes/javascript/monitoring.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/includes/javascript/monitoring.js,v
diff -u -r1.3 -r1.3.12.1
--- lams_tool_notebook/web/includes/javascript/monitoring.js	2 May 2008 07:45:29 -0000	1.3
+++ lams_tool_notebook/web/includes/javascript/monitoring.js	18 May 2016 10:29:29 -0000	1.3.12.1
@@ -1,16 +1,6 @@
-
-function init() {
-	if (initialTabId) {
-		selectTab(initialTabId);
-	} else {
-		selectTab(1);
-	}
-}
 function doSelectTab(tabId) {
+	if (tabId == 3) {
+		$("#statisticArea").load(statisticsURL + (new Date()).getTime());
+	}
 	selectTab(tabId);
-}
-function doSubmit(method, tabId) {
-	document.monitoringForm.method.value = method;
-	document.monitoringForm.submit();
-}
-
+}
\ No newline at end of file
Index: lams_tool_notebook/web/layouts/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/layouts/Attic/layout.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_notebook/web/layouts/layout.jsp	17 May 2016 10:20:12 -0000	1.1.2.1
+++ lams_tool_notebook/web/layouts/layout.jsp	18 May 2016 10:29:30 -0000	1.1.2.2
@@ -2,7 +2,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 	<lams:head>
-		<lams:headItems/>
 		<tiles:insert attribute="header" />
 	</lams:head>
 	<body class="stripes">
Index: lams_tool_notebook/web/pages/authoring/headItems.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/headItems.jsp,v
diff -u -r1.3.12.1 -r1.3.12.2
--- lams_tool_notebook/web/pages/authoring/headItems.jsp	17 May 2016 10:20:13 -0000	1.3.12.1
+++ lams_tool_notebook/web/pages/authoring/headItems.jsp	18 May 2016 10:29:30 -0000	1.3.12.2
@@ -1,3 +1,4 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
+<lams:headItems/>
 <script type="text/javascript" src="<lams:WebAppURL />includes/javascript/authoring.js"></script>
\ No newline at end of file
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/web/pages/learning/headItems.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/pages/monitoring/advanceOptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/advanceOptions.jsp,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_notebook/web/pages/monitoring/advanceOptions.jsp	17 Jul 2014 18:04:10 -0000	1.1
+++ lams_tool_notebook/web/pages/monitoring/advanceOptions.jsp	18 May 2016 10:29:29 -0000	1.1.2.1
@@ -1,48 +1,40 @@
 <%@ include file="/common/taglibs.jsp"%>
-<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/>');" />
+<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
 
-	<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">
-
-	<tr>
-		<td>
-			<fmt:message key="advanced.lockOnFinished" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.lockOnFinish}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="advanced.allowRichEditor" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.allowRichEditor}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-</table>
-</div>
\ No newline at end of file
+<lams:AdvancedAccordian title="${adTitle}">
+	<table class="table table-striped table-condensed">
+			<tr>
+				<td>
+					<fmt:message key="advanced.lockOnFinished" />
+				</td>
+				
+				<td>
+					<c:choose>
+						<c:when test="${dto.lockOnFinish}">
+							<fmt:message key="label.on" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.off" />
+						</c:otherwise>
+					</c:choose>	
+				</td>
+			</tr>
+			
+			<tr>
+				<td>
+					<fmt:message key="advanced.allowRichEditor" />
+				</td>
+				
+				<td>
+					<c:choose>
+						<c:when test="${dto.allowRichEditor}">
+							<fmt:message key="label.on" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.off" />
+						</c:otherwise>
+					</c:choose>	
+				</td>
+			</tr>
+	</table>
+</lams:AdvancedAccordian>
\ No newline at end of file
Index: lams_tool_notebook/web/pages/monitoring/daterestriction.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/daterestriction.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_notebook/web/pages/monitoring/daterestriction.jsp	17 May 2011 04:35:35 -0000	1.2
+++ lams_tool_notebook/web/pages/monitoring/daterestriction.jsp	18 May 2016 10:29:29 -0000	1.2.2.1
@@ -1,43 +1,29 @@
 <%@include file="/common/taglibs.jsp"%>
 
-<h1 style="padding-bottom: 10px;">
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="restrictUsageTreeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'), '<lams:LAMSURL/>');" />
 
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.date.restriction" />
-	</a>
-</h1>
-<br />
+<c:set var="ddTitle"><fmt:message key="monitor.summary.date.restriction" /></c:set>
+<lams:RestrictedUsageAccordian title="${ddTitle}">
 
-<div class="monitoring-advanced" id="restrictUsageDiv" style="display:none; ">
-
-	<div>
-		<fmt:message key="monitor.summary.when.date.restriction.is.set" />
-	</div>
-		
+	<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_notebook/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.6 -r1.6.2.1
--- lams_tool_notebook/web/pages/monitoring/editActivity.jsp	27 Mar 2014 00:00:06 -0000	1.6
+++ lams_tool_notebook/web/pages/monitoring/editActivity.jsp	18 May 2016 10:29:29 -0000	1.6.2.1
@@ -1,43 +1,40 @@
 <%@ include file="/common/taglibs.jsp"%>
-
 <c:set var="dto" value="${notebookDTO}" />
 
 <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">
-	<tbody>
-		<tr>
-			<td class="field-name" width="30%">
-				<fmt:message key="label.authoring.basic.title" />
-			</td>
-			<td>
-				<c:out value="${dto.title}" escapeXml="true" />
-			</td>
-		</tr>
-		<tr>
-			<td class="field-name" width="30%">
-				<fmt:message key="label.authoring.basic.instructions" />
-			</td>
-			<td>
-				<c:out value="${dto.instructions}" escapeXml="false" />
-			</td>
-		</tr>
-	</tbody>
+
+<table class="table table-condensed">
+	<tr>
+		<td class="field-name" width="10%" valign="top">
+			<fmt:message key="label.authoring.basic.title" />
+		</td>
+		<td>
+			<c:out value="${dto.title}" escapeXml="true" />
+		</td>
+	</tr>
+
+	<tr>
+		<td class="field-name" width="10%" valign="top" NOWRAP>
+			<fmt:message key="label.authoring.basic.instructions" />
+		</td>
+		<td>
+			<c:out value="${dto.instructions}" escapeXml="false" />
+		</td>
+	</tr>
 </table>
 
-<p class="align-right">
+<c:if test='${!dto.contentInUse}'>
 	<c:url value="/authoring.do" var="authoringUrl">
 		<c:param name="toolContentID" value="${dto.toolContentId}" />
 		<c:param name="mode" value="teacher" />
 		<c:param name="contentFolderID" value="${contentFolderID}" />
 	</c:url>
-	<html:link href="${authoringUrl}" styleClass="button" target="_blank">
+	<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
 		<fmt:message key="button.editActivity" />
 	</html:link>
-</p>
-
-
+</c:if>
Index: lams_tool_notebook/web/pages/monitoring/headItems.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/headItems.jsp,v
diff -u -r1.3.14.1 -r1.3.14.2
--- lams_tool_notebook/web/pages/monitoring/headItems.jsp	17 May 2016 10:20:12 -0000	1.3.14.1
+++ lams_tool_notebook/web/pages/monitoring/headItems.jsp	18 May 2016 10:29:29 -0000	1.3.14.2
@@ -1,3 +1,20 @@
-<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ include file="/common/taglibs.jsp"%>
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
-<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/monitoring.js"></script>
\ No newline at end of file
+<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/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/jquery.jqGrid.locale-en.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+<script type="text/javascript" src="${tool}includes/javascript/jinplace-1.0.1.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>
+
+<script type="text/javascript" src="${tool}includes/javascript/monitoring.js"></script>
\ No newline at end of file
Index: lams_tool_notebook/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.6.2.1 -r1.6.2.2
--- lams_tool_notebook/web/pages/monitoring/monitoring.jsp	3 Feb 2016 04:08:52 -0000	1.6.2.1
+++ lams_tool_notebook/web/pages/monitoring/monitoring.jsp	18 May 2016 10:29:29 -0000	1.6.2.2
@@ -1,43 +1,28 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.notebook.util.NotebookConstants"%>
 
-<div id="header">
-	<lams:Tabs control="true">
+<script type="text/javascript">
+	var statisticsURL = "<c:url value='/monitoring.do'/>?dispatch=getStatistics&toolContentID=${notebookDTO.toolContentId}&reqID=";
+</script>
+
+<c:set var="title"><fmt:message key="activity.title" /></c:set>
+<lams:Page title="${title}" type="navbar">
+
+	<lams:Tabs title="${title}" control="true" helpToolSignature="<%= NotebookConstants.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 = "${notebookDTO.currentTab}";
-		
-		function doSelectTab(tabId) {
-        	// start optional tab controller stuff
-        	var tag = document.getElementById("currentTab");
-	    	tag.value = tabId;
-    		selectTab(tabId);
-		    		
-	    	//for statistic page change:
-	    	if(tabId == 3)
-	    		doStatistic();	  
-        } 
-	        
-		function doStatistic(){
-			var fudge = (new Date()).getTime();
-			var url = "<c:url value="/monitoring.do"/>?dispatch=getStatistics&toolContentID=${notebookDTO.toolContentId}&reqID="+fudge;
-			$("#statisticArea").load(url);
-		}
-			
-	</script>
-</div>
 
-<div id="content">
-	<lams:help toolSignature="<%= NotebookConstants.TOOL_SIGNATURE %>" module="monitoring"/>
-	<input type="hidden" id="currentTab"/>
-	
-	<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>
 
-<div id="footer"></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>
+
+</lams:Page>
\ No newline at end of file
Index: lams_tool_notebook/web/pages/monitoring/statisticpart.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/statisticpart.jsp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_notebook/web/pages/monitoring/statisticpart.jsp	3 Feb 2016 04:08:52 -0000	1.1.2.2
+++ lams_tool_notebook/web/pages/monitoring/statisticpart.jsp	18 May 2016 10:29:29 -0000	1.1.2.3
@@ -2,31 +2,34 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:if test="${empty statisticList}">
-	<fmt:message key="label.no.user.available" />
+	<lams:Alert type="info" id="no-session-summary" close="false">
+		<fmt:message key="message.monitoring.summary.no.session" />
+	</lams:Alert>
 </c:if>
 
 <c:forEach var="statistic" items="${statisticList}">
-
 	<c:if test="${isGroupedActivity}">
-		<h1><c:out value="${statistic.sessionName}" /></h1>
+		<h4><c:out value="${statistic.sessionName}" /></h4>
 	</c:if>
-
-	<table  class="alternative-color">
+	
+	<table class="table table-condensed table-no-border">
 		<tr>
-			<td>
+			<td class="field-name" width="30%">
 				<fmt:message key="heading.totalLearnersInGroup" />
 			</td>
 			<td>
 				<c:out value="${statistic.numLearners}" />
 			</td>
+			
 		</tr>
 		<tr>
-			<td>
+			<td class="field-name" width="30%">
 				<fmt:message key="heading.totalFinishedLearnersInGroup" />
 			</td>
+			
 			<td>
 				<c:out value="${statistic.numLearnersFinished}" />
 			</td>
 		</tr>
 	</table>
-</c:forEach>
+</c:forEach>
\ No newline at end of file
Index: lams_tool_notebook/web/pages/monitoring/statistics.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/statistics.jsp,v
diff -u -r1.5.2.1 -r1.5.2.2
--- lams_tool_notebook/web/pages/monitoring/statistics.jsp	3 Feb 2016 04:08:52 -0000	1.5.2.1
+++ lams_tool_notebook/web/pages/monitoring/statistics.jsp	18 May 2016 10:29:29 -0000	1.5.2.2
@@ -1,4 +1,2 @@
 <%@ include file="/common/taglibs.jsp"%>
-<div id="statisticArea">
-	<%@ include file="statisticpart.jsp"%>
-</div>
+<div id="statisticArea"></div>
\ No newline at end of file
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/summary.jsp,v
diff -u -r1.15.2.6 -r1.15.2.7
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	5 Feb 2016 00:22:04 -0000	1.15.2.6
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	18 May 2016 10:29:29 -0000	1.15.2.7
@@ -2,7 +2,7 @@
 <c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
-<link type="text/css" href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
 <link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet"/>
 <style media="screen,projection" type="text/css">
@@ -60,28 +60,12 @@
 		messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
 		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>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
-<script type="text/javascript" src="${tool}includes/javascript/jinplace-1.0.1.js"></script>
-<script type="text/javascript">
+
 	$(document).ready(function(){
 		<c:forEach var="sessionEntry" items="${notebookDTO.sessions}">
 			<c:set var="sessionId" value ="${sessionEntry.key}"/>
 			<c:set var="sessionName" value ="${sessionEntry.value}"/>
-   			<c:choose>
-				<c:when test="${isGroupedActivity}">
-					<c:set var="gridCaption" value="${sessionName}"/>
-				</c:when>
-				<c:otherwise>
-					<c:set var="gridCaption"><fmt:message key='label.notebook.entries' /></c:set>
-				</c:otherwise>
-			</c:choose>
+			<c:set var="gridCaption"><fmt:message key='label.notebook.entries' /></c:set>
 			
 			jQuery("#group${sessionId}").jqGrid({
 			
@@ -167,7 +151,7 @@
 				rowList:[10,20,30,40,50,100],
 				
 				height: 'auto',
-				width: 780,
+				width: 685,
 				
 			   	colNames:['#',
 						'userUid',
@@ -208,37 +192,57 @@
 	});
 
 </script>
+<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
-<h1>
-	<c:out value="${notebookDTO.title}" escapeXml="true"/>
-</h1>
-
-<div class="instructions space-top">
-	<c:out value="${notebookDTO.instructions}" escapeXml="false"/>
+<div class="panel">
+	<h4>
+	    <c:out value="${notebookDTO.title}" escapeXml="true"/>
+	</h4>
+	<div class="instructions voffset5">
+	    <c:out value="${notebookDTO.instructions}" escapeXml="false"/>
+	</div>
+	
+	<c:if test="${empty notebookDTO.sessions}">
+		<lams:Alert type="info" id="no-session-summary" close="false">
+			<fmt:message key="message.monitoring.summary.no.session" />
+		</lams:Alert>
+	</c:if>
+	
 </div>
 
-<c:if test="${empty notebookDTO.sessions}">
-	<div align="center">
-		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
-	</div>
+<c:if test="${isGroupedActivity}">
+	<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
 </c:if>
 
-<div id="session-list">
-	<c:forEach var="session" items="${notebookDTO.sessions}">
+<c:forEach var="session" items="${notebookDTO.sessions}" varStatus="status">
+
+	<c:if test="${isGroupedActivity}">	
+	    <div class="panel panel-default" >
+        <div class="panel-heading" id="heading${session.key}">
+        	<span class="panel-title collapsable-icon-left">
+        	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${session.key}" 
+					aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${session.key}" >
+			<fmt:message key="message.session.name" />:	<c:out value="${session.value}" /></a>
+			</span>
+        </div>
+        
+        <div id="collapse${session.key}" class="panel-collapse collapse ${status.first ? 'in' : ''}"
+        	 role="tabpanel" aria-labelledby="heading${session.key}">
+	</c:if>
 	
-		<c:if test="${isGroupedActivity}">
-			<h1>
-				${session.value}
-			</h1>
-			<br>
-		</c:if>
-		
-		<table id="group${session.key}" class="scroll" cellpadding="0" cellspacing="0" ></table>
-		<div id="group${session.key}pager"></div> 
-		<br><br>
-		
-	</c:forEach>
-</div>
+	<table id="group${session.key}" class="scroll" cellpadding="0" cellspacing="0" ></table>
+	<div id="group${session.key}pager"></div>
+	
+	<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> <!--  end panel group -->
+</c:if>
 
 <%@include file="advanceOptions.jsp"%>