Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/AdvancedAccordian.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/Arrow.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/Comments.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/CommentsAuthor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/Rating.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/RestrictedUsageAccordian.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/TabBodyArea.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/TabBodys.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/common/header.jsp,v
diff -u -r1.13.2.1 -r1.13.2.2
--- lams_tool_larsrc/web/common/header.jsp	19 May 2016 04:22:36 -0000	1.13.2.1
+++ lams_tool_larsrc/web/common/header.jsp	20 May 2016 10:36:08 -0000	1.13.2.2
@@ -4,18 +4,14 @@
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
  	<!-- ********************  CSS ********************** -->
-	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
 	<lams:css />
 
 
  	<!-- ********************  javascript ********************** -->
 	<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="<html:rewrite page='/includes/javascript/rsrccommon.js'/>"></script>
-<%-- <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script> 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script> 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script> 
- --%>	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.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>
 
 	
\ No newline at end of file
Index: lams_tool_larsrc/web/common/tabbedheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/common/tabbedheader.jsp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- lams_tool_larsrc/web/common/tabbedheader.jsp	19 May 2016 04:22:36 -0000	1.4.2.2
+++ lams_tool_larsrc/web/common/tabbedheader.jsp	20 May 2016 10:36:08 -0000	1.4.2.3
@@ -1,20 +1,15 @@
-<%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
  	<!-- ********************  CSS ********************** -->
-	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
 	<lams:css/>
 
  	<!-- ********************  javascript ********************** -->
 	<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="<html:rewrite page='/includes/javascript/rsrccommon.js'/>"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
-<%-- <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script> 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script> 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script> 
- --%>	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.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>
 	
\ No newline at end of file
Fisheye: Tag 1.6.16.1 refers to a dead (removed) revision in file `lams_tool_larsrc/web/includes/css/rsrc.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp	21 Apr 2016 09:13:14 -0000	1.2.2.1
+++ lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp	20 May 2016 10:36:07 -0000	1.2.2.2
@@ -1,16 +1,9 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<h1>
-	<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="label.authoring.advance.lock.on.finished" />
@@ -151,4 +144,4 @@
 		</c:when>
 	</c:choose>
 </table>
-</div>
\ No newline at end of file
+</lams:AdvancedAccordian>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.10 -r1.10.2.1
--- lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	3 Apr 2014 20:19:17 -0000	1.10
+++ lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	20 May 2016 10:36:08 -0000	1.10.2.1
@@ -3,12 +3,12 @@
 <c:set var="resource" value="${sessionMap.resource}"/>
 
 <c:if test="${sessionMap.isPageEditable}">
-	<div class="warning">
+	<lams:Alert type="warn" id="no-edit" close="false">
 		<fmt:message key="message.alertContentEdit" />
-	</div>
+	</lams:Alert>
 </c:if>
 
-<table cellpadding="0">
+<table class="table table-condensed">
 	<tr>
 		<td width="15%" nowrap>
 			<fmt:message key="label.authoring.basic.title" />:
@@ -33,7 +33,7 @@
 				<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 				<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 			</c:url>
-			<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
+			<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
 				<fmt:message key="label.monitoring.edit.activity.edit" />
 			</html:link>
 		</td>
Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.21.2.1 -r1.21.2.2
--- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	26 Feb 2016 07:17:22 -0000	1.21.2.1
+++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	20 May 2016 10:36:08 -0000	1.21.2.2
@@ -7,16 +7,6 @@
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/tabbedheader.jsp" %>
-		<style media="screen,projection" type="text/css">
-			#tabbody1 {
-				margin-left: 15px;
-			}
-			
-			table.forms {
-				margin-left: 15px;
-			}
-		</style>
-		 
 		<script>
 			var initialTabId = "${initialTabId}";
 	
@@ -40,26 +30,27 @@
 		</script>		 
 	</lams:head>
 	<body class="stripes" onLoad="init()">
-	<div id="page">
-		<h1>
-			<fmt:message key="label.monitoring.heading" />
-		</h1>
-	<div id="header">
-		<lams:Tabs>
+
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	<lams:Page title="${title}" type="navbar">
+	
+		<lams:Tabs title="${title}" control="true" helpToolSignature="<%= ResourceConstants.TOOL_SIGNATURE %>" helpModule="monitoring">
 			<lams:Tab id="1" key="monitoring.tab.summary" />
 			<lams:Tab id="2" key="monitoring.tab.edit.activity" />			
 			<lams:Tab id="3" key="monitoring.tab.statistics" />
 		</lams:Tabs>
-	</div>
-	<div id="content">
-			<lams:help toolSignature="<%= ResourceConstants.TOOL_SIGNATURE %>" module="monitoring"/>
-	
+		
+		<lams:TabBodyArea>
+		<lams:TabBodys>
 			<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
 			<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
 			<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
-	</div>
-	<div id="footer"></div>
-	
-	</div>
+		</lams:TabBodys>
+		</lams:TabBodyArea>
+		
+		<div id="footer" />
+		
+	</lams:Page>
+
 	</body>
 </lams:html>
Index: lams_tool_larsrc/web/pages/monitoring/reflections.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/reflections.jsp,v
diff -u -r1.3 -r1.3.2.1
--- lams_tool_larsrc/web/pages/monitoring/reflections.jsp	3 Apr 2014 17:23:49 -0000	1.3
+++ lams_tool_larsrc/web/pages/monitoring/reflections.jsp	20 May 2016 10:36:07 -0000	1.3.2.1
@@ -1,24 +1,27 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<br><br>
+<div class="panel-group" id="accordionReflection" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default" >
+        <div class="panel-heading collapsable-icon-left" id="headingReflection">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseReflection" aria-expanded="false" aria-controls="collapseReflection" >
+          	<fmt:message key="title.reflection"/>
+        	</a>
+      		</span>
+        </div>
 
-<table class="alternative-color">
-
-	<tr>
-		<th>
-			<fmt:message key="title.reflection"/>
-		</th>
-	</tr>
-										
-	<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
-		<tr>
-			<td>
-				<strong><c:out value="${reflectDTO.fullName}" escapeXml="true"/></strong> - <lams:Date value="${reflectDTO.date}"/>
-				<br>
-				<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
-			</td>
-		</tr>
-	</c:forEach>
-
-</table>
-<br>
+        <div id="collapseReflection" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingReflection">
+			<table class="table table-striped table-condensed">
+			<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
+				<tr>
+					<td>
+						<strong><c:out value="${reflectDTO.fullName}" escapeXml="true"/></strong> - <lams:Date value="${reflectDTO.date}"/>
+						<br>
+						<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
+					</td>
+				</tr>
+			</c:forEach>
+			</table>
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/monitoring/statistic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/statistic.jsp,v
diff -u -r1.13 -r1.13.2.1
--- lams_tool_larsrc/web/pages/monitoring/statistic.jsp	3 Apr 2014 20:19:17 -0000	1.13
+++ lams_tool_larsrc/web/pages/monitoring/statistic.jsp	20 May 2016 10:36:08 -0000	1.13.2.1
@@ -5,45 +5,46 @@
 
 	<c:choose>
 	<c:when test="${empty summaryList}">
-		<div align="center">
-			<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
-		</div>
+		<lams:Alert type="info" id="no-session-summary" close="false">
+			<fmt:message key="message.monitoring.summary.no.session" /> </b>
+		</lams:Alert>
 	</c:when>
 	<c:otherwise>
-		<div class="info">
+		<lams:Alert type="info" id="no-session-summary" close="false">
 			<fmt:message key="monitoring.summary.note" />
-		</div>
+		</lams:Alert>
 	</c:otherwise>
 	</c:choose>
 	
-	<br/>
 	<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
-	  
-	  
-		<c:forEach var="item" items="${group.items}" varStatus="status">
-				
-			<%-- display group name on first row--%>
-			<c:if test="${status.index == 0}">
-						<c:if test="${sessionMap.isGroupedActivity}">
-							<h1><fmt:message key="monitoring.label.group" /> ${group.sessionName}</h1> 
-						</c:if>
-				<table cellspacing="3" class="alternative-color">
+	
+		<c:if test="${sessionMap.isGroupedActivity}">	
+	    <div class="panel panel-default" >
+        <div class="panel-heading" id="heading${toolSessionDto.sessionID}">
+			<span class="panel-title">
+				<fmt:message key="monitoring.label.group" />&nbsp;${group.sessionName}
+			</span>
+        </div>
+		</c:if>
+		
+		<table class="table table-striped table-condensed">
+			<tr>
+				<th width="20%">
+					<fmt:message key="monitoring.label.type" />
+				</th>
+				<th>
+					<fmt:message key="monitoring.label.title" />
+				</th>
+				<th width="25%">
+					<fmt:message key="monitoring.label.suggest" />
+				</th>
+				<th width="20%" align="center">
+					<fmt:message key="monitoring.label.number.learners" />
+				</th>
+			</tr>
+		  
+			<c:forEach var="item" items="${group.items}" varStatus="status">
 				<tr>
-					<th width="20%">
-						<fmt:message key="monitoring.label.type" />
-					</th>
-					<th width="35%">
-						<fmt:message key="monitoring.label.title" />
-					</th>
-					<th width="25%">
-						<fmt:message key="monitoring.label.suggest" />
-					</th>
-					<th width="20%" align="center">
-						<fmt:message key="monitoring.label.number.learners" />
-					</th>
-				</tr>
-			</c:if>
-				<tr>
 					<td>
 						<c:choose>
 							<c:when test="${item.itemType == 1}">
@@ -82,7 +83,10 @@
 						</c:choose>
 					</td>
 				</tr>
-		
-		</c:forEach>
-       </table>
+			</c:forEach>
+		</table>
+       
+		<c:if test="${sessionMap.isGroupedActivity}">	
+		</div>
+    	</c:if>   
 	</c:forEach>
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/summary.jsp,v
diff -u -r1.23.2.2 -r1.23.2.3
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	14 Dec 2015 22:59:17 -0000	1.23.2.2
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	20 May 2016 10:36:08 -0000	1.23.2.3
@@ -3,18 +3,22 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
-<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.jqGrid.css" rel="stylesheet" />
 <style media="screen,projection" type="text/css">
-	#user-dropdown-div {padding-left: 30px; margin-top: -5px; margin-bottom: 50px;}
-	.bottom-buttons {margin: 20px 20px 0px; padding-bottom: 20px;}
-	.section-header {padding-left: 20px; margin-bottom: 15px; margin-top: 60px;}
-	.ui-jqgrid tr.jqgrow td {
-	    white-space: normal !important;
-	    height:auto;
-	    vertical-align:text-top;
-	    padding-top:2px;
+	 .ui-jqgrid {
+		border-left-style: none !important;
+		border-right-style: none !important;
+		border-bottom-style: none !important;
 	}
+	
+	.ui-jqgrid tr {
+		border-left-style: none !important;
+	}
+	
+	.ui-jqgrid td {
+		border-style: none !important;
+	}
 </style>
 
 <script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
@@ -48,7 +52,7 @@
 			   		{name:'viewNumber', index:'viewNumber', width:100, align:"center", sorttype:"int"},
 			   		{name:'actions', index:'actions', width:120, align:"center"}		
 			   	],
-			   	caption: "${groupSummary.sessionName}",
+			   	// caption: "${groupSummary.sessionName}",
 				subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
 					var subgridTableId = subgrid_id+"_t";
@@ -145,6 +149,7 @@
 		    	});
 		    }
 		});
+		setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
 		
 	});
 	
@@ -175,35 +180,59 @@
 
 </script>
 
-<h1>
-	<c:out value="${sessionMap.resource.title}" escapeXml="true"/>
-</h1>
+<div class="panel">
+	<h4>
+	    <c:out value="${sessionMap.resource.title}" escapeXml="true"/>
+	</h4>
+	<div class="instructions voffset5">
+	    <c:out value="${sessionMap.resource.instructions}" escapeXml="false"/>
+	</div>
+	
+	<c:if test="${empty summaryList}">
+		<lams:Alert type="info" id="no-session-summary" close="false">
+			 <fmt:message key="message.monitoring.summary.no.session" />
+		</lams:Alert>
+	</c:if>
+	
+	<!--For release marks feature-->
+	<i class="fa fa-spinner" style="display:none" id="message-area-busy"></i>
+	<div id="message-area"></div>
 
-<div class="instructions">
-	<c:out value="${sessionMap.resource.instructions}" escapeXml="false"/>
 </div>
 
-<br/>
 
-<c:if test="${empty summaryList}">
-	<div align="center">
-		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
-	</div>
+<c:if test="${sessionMap.isGroupedActivity}">
+<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
 </c:if>
 
-<c:forEach var="groupSummary" items="${summaryList}">
+<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
 	
+	<c:if test="${sessionMap.isGroupedActivity}">	
+	    <div class="panel panel-default" >
+        <div class="panel-heading" id="heading${groupSummary.sessionId}">
+        	<span class="panel-title collapsable-icon-left">
+        	<a class="collapsed" role="button" data-toggle="collapse" href="#collapse${groupSummary.sessionId}" 
+					aria-expanded="false" aria-controls="collapse${groupSummary.sessionId}" >
+			<fmt:message key="monitoring.label.group" />&nbsp;${groupSummary.sessionName}</a>
+			</span>
+        </div>
+        
+        <div id="collapse${groupSummary.sessionId}" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
+	</c:if>
+
+		<table id="group${groupSummary.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
+	
 	<c:if test="${sessionMap.isGroupedActivity}">
-		<h1>
-			<fmt:message key="monitoring.label.group" /> ${groupSummary.sessionName}
-		</h1>
-		<br>
+		</div> <!-- end collapse area  -->
+		</div> <!-- end collapse panel  -->
 	</c:if>
+	${ !sessionMap.isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
 	
-	<table id="group${groupSummary.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
-	<br>
-		
 </c:forEach>
+
+<c:if test="${sessionMap.isGroupedActivity}">
+</div> <!--  end accordianSessions --> 
+</c:if>
 	
 <c:if test="${sessionMap.resource.reflectOnActivity}">
 	<%@ include file="reflections.jsp"%>
Index: lams_tool_larsrc/web/pages/monitoring/userlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/userlist.jsp,v
diff -u -r1.13.2.1 -r1.13.2.2
--- lams_tool_larsrc/web/pages/monitoring/userlist.jsp	9 Feb 2016 18:53:30 -0000	1.13.2.1
+++ lams_tool_larsrc/web/pages/monitoring/userlist.jsp	20 May 2016 10:36:08 -0000	1.13.2.2
@@ -8,41 +8,52 @@
 	<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
  	<!-- ********************  CSS ********************** -->
-	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
 	<lams:css/>
+	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
+	<link type="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
 
-
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrccommon.js'/>"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script> 
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script> 
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script> 
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 	    
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pack.js"></script>
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pager.js"></script>
+<%-- 	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pack.js"></script> --%>
 	<script language="JavaScript" type="text/javascript">
-		<!--
 		jQuery(document).ready(function() {
-			jQuery("table.tablesorter-admin").tablesorter({widthFixed:true});
+			jQuery("table.tablesorter").tablesorter({
+				theme : "bootstrap",
+				widthFixed:true,
+			    headerTemplate : '{content} {icon}', 
+			    widgets : [ "uitheme"]
+			})
+			.tablesorterPager({
+				savePages: false,
+	            container: $(this).find(".ts-pager"),
+			    output: '{startRow} - {endRow} / {filteredRows} ({totalRows})',
+	            cssPageDisplay: '.pagedisplay',
+	            cssPageSize: '.pagesize',
+	            cssDisabled: 'disabled'
+			 });
+			
 			//sort table only in case there is a data inside (it's a tablesorter bug)
-			if (jQuery("table.tablesorter-admin tbody tr").length > 0) {
-				jQuery("table.tablesorter-admin").tablesorterPager({container: jQuery("#pager")});
+			if (jQuery("table.tablesorter tbody tr").length > 0) {
+				jQuery("table.tablesorter").tablesorterPager({container: jQuery("#pager")});
 			}
 		});
-		//-->
 	</script>
 </lams:head>
 <body class="stripes">
 
 <div id="content">
 		
-	<h1>
-		<fmt:message key="label.monitoring.heading.access"/>
-	</h1>
+	<c:set var="title"><fmt:message key="label.monitoring.heading.access"/></c:set>
+	<lams:Page type="learner" title="${title}">
 	
-	<br/>
-		
-	<table border="0" cellspacing="3" width="98%" class="tablesorter-admin">
+	<table class="tablesorter">
 		<thead>
 			<tr>
 				<th>
@@ -60,13 +71,6 @@
 			</tr>
 		</thead>
 		<tbody>
-			<script language="JavaScript" type="text/javascript">
-				<!--
-				if (jQuery.browser.msie) {
-					document.write('<tr><td/><td/><td/><td/><td/></tr>');
-				}
-				//-->
-			</script>
 			<c:forEach var="user" items="${userList}">
 				<tr>
 					<td>
@@ -84,33 +88,33 @@
 				</tr>
 			</c:forEach>
 		</tbody>
+		<tfoot>
+			<tr>
+		    	<th colspan="4" class="ts-pager 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">
+		      		<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>
 	</table>
 	
-	<br/>
-
-	<div id="pager" class="pager">
-		<form onsubmit="return false;">
-			<img src="<lams:LAMSURL/>/images/first.png" class="first"/>
-			<img src="<lams:LAMSURL/>/images/prev.png" class="prev">
-			<input type="text" class="pagedisplay"/>
-			<img src="<lams:LAMSURL/>/images/next.png" class="next">
-			<img src="<lams:LAMSURL/>/images/last.png" class="last">
-			<select class="pagesize">
-				<option selected="selected"  value="10">10&nbsp;&nbsp;</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>
-		</form>
-	</div>
-	
 	<div class="align-right small-space-top">
-		<a href="javaqscript:;" onclick="window.close()" class="button">Close</a>
+		<a href="javaqscript:;" onclick="window.close()" class="btn btn-default">Close</a>
 	</div>
-</div>
 
-<div id="footer"></div>
+	<div id="footer"></div>
+
+	</lams:Page>
 </body>
 </lams:html>
\ No newline at end of file