Fisheye: Tag 1ba75f43a383fb925aae69975d748d0a8dfdf9a5 refers to a dead (removed) revision in file `lams_central/web/css/jquery.jqGrid.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1ba75f43a383fb925aae69975d748d0a8dfdf9a5 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jquery.jqGrid.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1ba75f43a383fb925aae69975d748d0a8dfdf9a5 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jquery.jqGrid.locale-en.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r9f956c8c8c000f50ae584b8feffdab3ed0c709d5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 9f956c8c8c000f50ae584b8feffdab3ed0c709d5)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -166,15 +166,13 @@
 label.monitoring.user.summary.grade  =Grade
 label.monitoring.user.summary.title  =Title:
 label.monitoring.user.summary.question  =Question:
-label.monitoring.user.summary.ok  =Ok
 label.monitoring.question.summary.history.responses  =Responses for the question
 label.monitoring.question.summary.title  =Title
 label.monitoring.question.summary.question  =Question
 label.monitoring.question.summary.default.mark  =Default mark
 label.monitoring.question.summary.penalty  =Penalty
 label.monitoring.question.summary.average.mark  =Average mark
 label.monitoring.question.summary.group  =Group:
-label.monitoring.question.summary.ok  =Ok
 output.desc.learner.total.score  =Last total score
 output.desc.learner.time.taken  =Time taken
 output.desc.learner.number.of.attempts  =Number of attempts
@@ -349,6 +347,6 @@
 output.ordered.answers.for.question  =Ordered answers for the question:
 label.answer.required  =Answer required
 outcome.authoring.remove.confirm  =Are you sure you want to remove this learning outcome?
+label.close  =Close
 
-
 #======= End labels: Exported 343 labels for en AU =====
Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -10,10 +10,15 @@
 		<link href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css">
 		<link href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet" type="text/css">
 		<link href="${lams}css/thickbox.css" rel="stylesheet" rel="stylesheet" type="text/css">
-		<link href="${lams}css/jquery.jqGrid.css" rel="stylesheet" type="text/css">		
+		<link href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet" type="text/css" >
  		<lams:css suffix="chart"/>
  		<link href="${lams}css/jquery.jqGrid.confidence-level-formattter.css" rel="stylesheet" type="text/css">
- 		<link href="<lams:WebAppURL/>includes/css/monitoring.css" rel="stylesheet" type="text/css">	
+ 		<link href="${lams}includes/css/monitoring.css" rel="stylesheet" type="text/css">	
+ 		<style>
+ 		.ui-jqdialog.ui-jqgrid-bootstrap .ui-jqdialog-titlebar, .ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-caption {
+			background-color: #f5f5f5;
+ 		}
+ 		</style>
  		
 		<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
 		<script>
@@ -34,8 +39,7 @@
 		<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="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
    		<script type="text/javascript" src="${lams}includes/javascript/d3.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/chart.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/jquery.cookie.js"></script>
Index: lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -15,7 +15,7 @@
  	       		
  	       	var table = jQuery("#userSummary${assessmentResult.sessionId}");
  	     	table.addRowData(${i.index + 1}, {
- 	   	    		id:"${i.index + 1}",
+ 	   	    	id:"${i.index + 1}",
  	   	   		questionResultUid:"${questionResult.uid}",
  	   	   		title:"${fn:escapeXml(title)}",
  	   	   		response:responseStr,
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -10,12 +10,11 @@
 		<c:set var="sessionDtos" value="${sessionMap.sessionDtos}"/>
 		
 		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-		<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet">
+		<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 		<link type="text/css" href="${lams}css/jquery.jqGrid.confidence-level-formattter.css" rel="stylesheet">
 		<link type="text/css" href="<lams:WebAppURL/>includes/css/monitoring.css" rel="stylesheet">	
 		
-		<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="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.confidence-level-formattter.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
   	    <script>
@@ -27,16 +26,19 @@
 	  				jQuery("#session${sessionDto.sessionId}").jqGrid({
 	  					datatype: "json",
 	  					url: "<c:url value="/monitoring/getUsersByQuestion.do"/>?sessionMapID=${sessionMapID}&sessionId=${sessionDto.sessionId}&questionUid=${questionSummary.question.uid}",
+	  					autoencode:false,
 	  					height: 'auto',
 	  					autowidth: true,
 	  					shrinkToFit: false,
 	  				    pager: 'pager${sessionDto.sessionId}',
 	  				  	rowList:[10,20,30,40,50,100],
 	  				    rowNum:10,
 	  				    viewrecords:true,
+	  					guiStyle: "bootstrap",
+	  					iconSet: 'fontAwesome',
 	  				   	colNames:[
 		  				   	'questionResultUid',
-	  				   	    	'maxMark',
+	  				   	    'maxMark',
 	  		  				"<fmt:message key="label.monitoring.summary.user.name" />",
 	  		  			    "<fmt:message key="label.monitoring.user.summary.grade" />",
 		  			   		<c:if test="${assessment.enableConfidenceLevels}">
@@ -93,17 +95,7 @@
 	  					},
   						loadComplete: function () {
   					   	 	initializePortraitPopover('<lams:LAMSURL/>');
-  					    	}
-  						/*  resetSelection() doesn't work in this version
-						    hope it'll be fixed in the next one
-						    
-	  					,
-	  					onSelectRow: function (rowid){
-	  						$("[id^='user']").resetSelection();
-	  					},
-	  					onCellSelect: function (rowid, iCol, cellcontent){
-	  						jQuery("#session${sessionDto.sessionId}}").resetSelection();
-	  					}*/ 	  				  	
+  					    }	  				  	
 	  				})
 	  				<c:if test="${!sessionMap.assessment.useSelectLeaderToolOuput}">
 		  				.jqGrid('filterToolbar', { 
@@ -205,8 +197,8 @@
 				</div>	
 			</c:forEach>
 			
-			<a href="#nogo" onclick="refreshSummaryPage();" class="btn btn-primary btn-sm voffset10 pull-right">
-				<fmt:message key="label.monitoring.question.summary.ok" /> 
+			<a href="#nogo" onclick="refreshSummaryPage();" class="btn btn-default btn-sm voffset10 pull-right">
+				<fmt:message key="label.close" /> 
 			</a>
 
 		</div>
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -8,12 +8,11 @@
 		<%@ include file="/common/header.jsp"%>		
 		
 		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-		<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet">
+		<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 		<link type="text/css" href="${lams}css/jquery.jqGrid.confidence-level-formattter.css" rel="stylesheet">
 		<link type="text/css" href="<lams:WebAppURL/>includes/css/monitoring.css" rel="stylesheet">	
 
-		<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="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.confidence-level-formattter.js"></script>
   	    <script>
 	    	var isEdited = false;
@@ -24,11 +23,13 @@
 	  			
 	  				jQuery("#user${question.uid}").jqGrid({
 	  					datatype: "local",
+	  					autoencode:false,
 	  					rowNum: 10000,
 	  					height: 'auto',
 	  					autowidth: true,
 	  					shrinkToFit: false,
-	  					
+	  					guiStyle: "bootstrap",
+	  					iconSet: 'fontAwesome',
 	  				   	colNames:[
 		  				   	"<fmt:message key="label.monitoring.user.summary.attempt" />",
 	  						'questionResultUid',
@@ -38,8 +39,7 @@
 	  							"<fmt:message key="label.confidence" />",
 	  						</c:if>
 	  						"<fmt:message key="label.monitoring.user.summary.grade" />"
-	  					],
-	  						    
+	  					],  
 	  				   	colModel:[
 	  				   		{name:'id', index:'id', width:52, sorttype:"int"},
 	  				   		{name:'questionResultUid', index:'questionResultUid', width:0, hidden: true},
@@ -50,7 +50,6 @@
 			  			  	</c:if>
 	  				   		{name:'grade', index:'grade', width:80, sorttype:"float", editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' }		
 	  				   	],
-	  				   	
 	  				   	multiselect: false,
 	  				  	cellurl: '<c:url value="/monitoring/saveUserGrade.do?sessionMapID=${sessionMapID}"/>',
 	  				  	cellEdit: true,
@@ -85,17 +84,7 @@
 	  							var questionResultUid = jQuery("#user${question.uid}").getCell(rowid, 'questionResultUid');
 	  							return {questionResultUid:questionResultUid};		  				  		
 	  				  		}
-	  					}
-  						/*  resetSelection() doesn't work in this version
-						    hope it'll be fixed in the next one
-						    
-	  					,
-	  					onSelectRow: function (rowid){
-	  						$("[id^='user']").resetSelection();
-	  					},
-	  					onCellSelect: function (rowid, iCol, cellcontent){
-	  						jQuery("#user${question.uid+1}").resetSelection();
-	  					}*/ 	  				  	
+	  					}  				  	
 	  				});
 	  				
 	  	   	        <c:forEach var="questionResult" items="${userSummaryItem.questionResults}" varStatus="i">
@@ -228,7 +217,7 @@
 			</c:forEach>
 
 			<a href="#nogo" onclick="refreshSummaryPage();" class="btn btn-default btn-sm voffset20 pull-right">
-				<fmt:message key="label.monitoring.user.summary.ok" /> 
+				<fmt:message key="label.close" /> 
 			</a>
 
 		</div>
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -22,6 +22,8 @@
 			    rowList:[10,20,30,40,50,100],
 			    rowNum:10,
 			    viewrecords:true,
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 				   	'userId',
 					'sessionId',
@@ -46,28 +48,28 @@
 			  	},
 			  	onSelectRow: function(rowid) { 
 			  	    if(rowid == null) { 
-			  	    		rowid=0; 
+			  	    	rowid=0; 
 			  	    } 
 			   		var userId = jQuery("#list${sessionDto.sessionId}").getCell(rowid, 'userId');
 			   		var sessionId = jQuery("#list${sessionDto.sessionId}").getCell(rowid, 'sessionId');
 					var userMasterDetailUrl = '<c:url value="/monitoring/userMasterDetail.do"/>';
 		  	        jQuery("#userSummary${sessionDto.sessionId}").clearGridData().setGridParam({gridstate: "visible"}).trigger("reloadGrid");
 		  	        $("#masterDetailArea").load(
-		  	        		userMasterDetailUrl,
-		  	        		{
-		  	        			userID: userId,
-		  	        			sessionId: sessionId,
-		  	        			sessionMapID: '${sessionMapID}'
+		  	        	userMasterDetailUrl,
+		  	        	{
+		  	        		userID: userId,
+		  	        		sessionId: sessionId,
+		  	        		sessionMapID: '${sessionMapID}'
 		  	       		}
 		  	       	);    
 	  	  		},
 			    loadError: function(xhr,st,err) {
-			    		jQuery("#list${sessionDto.sessionId}").clearGridData();
-			    		$.jgrid.info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.loaderror"/>", "<fmt:message key="label.ok"/>");
+			    	jQuery("#list${sessionDto.sessionId}").clearGridData();
+			    	$.jgrid.info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.loaderror"/>", "<fmt:message key="label.ok"/>");
 			    },
 			    loadComplete: function () {
 			   	 	initializePortraitPopover('<lams:LAMSURL/>');
-			    	},
+			    },
 
 			})
 			<c:if test="${!sessionMap.assessment.useSelectLeaderToolOuput}">
@@ -80,13 +82,14 @@
 	        var oldValue = 0;
 			jQuery("#userSummary${sessionDto.sessionId}").jqGrid({
 				datatype: "local",
+				autoencode:false,
 				rowNum: 10000,
 				gridstate:"hidden",
-				//hiddengrid:true,
 				height: 180,
 				autowidth: true,
 				shrinkToFit: false,
-				caption: "<fmt:message key="label.monitoring.summary.learner.summary" />",
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 				   	'#',
 					'questionResultUid',
@@ -105,7 +108,7 @@
 	  			   	<c:if test="${sessionMap.assessment.enableConfidenceLevels}">
 	  			   		{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter},
 	  			  	</c:if>
-	  			  	{name:'response', index:'response', width:443, sortable:false}
+	  			  	{name:'response', index:'response', datatype:'html', width:443, sortable:false}
 			   	],
 			   	multiselect: false,
 
@@ -282,6 +285,7 @@
 		jqgrids.each(function(index) {
 			var gridId = $(this).attr('id');
 	    	var gridParentWidth = jQuery('#gbox_' + gridId).parent().width();
+	    	console.log(gridParentWidth);
 	    	jQuery('#' + gridId).setGridWidth(gridParentWidth, true);
 	    });
 	};
Index: lams_tool_lamc/web/common/monitoringheader.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_lamc/web/common/monitoringheader.jsp	(.../monitoringheader.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/common/monitoringheader.jsp	(.../monitoringheader.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -15,8 +15,6 @@
 <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="${lams}includes/javascript/bootstrap.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -3,23 +3,8 @@
 
 <link type="text/css" href="${lams}css/jquery-ui-bootstrap-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">
+<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 <link type="text/css" href="${lams}css/jquery.jqGrid.confidence-level-formattter.css" rel="stylesheet">
-<style type="text/css">
-	.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"> 
 	//pass settings to monitorToolSummaryAdvanced.js
@@ -35,6 +20,7 @@
 	};	
 </script>
 <script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
+<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 <script type="text/javascript" src="${lams}/includes/javascript/jquery.jqGrid.confidence-level-formattter.js" ></script>
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript">
@@ -53,7 +39,8 @@
 				rowList:[2,10,20,30,40,50,100],
 				rowNum:10,
 				viewrecords:true,
-			   	/* caption: "${sessionDto.sessionName}", */
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 					'userUid',
 					'userId',
@@ -74,18 +61,18 @@
 			   	},
 			   	loadComplete: function () {
 			   	 	initializePortraitPopover('<lams:LAMSURL/>');
-			    	},
+			    },
 			  	onSelectRow: function(rowid) { 
 			  	    if(rowid == null) { 
-			  	    		rowid=0; 
+			  	    	rowid=0; 
 			  	    } 
 			   		var userUid = jQuery("#group${sessionDto.sessionId}").getCell(rowid, 'userUid');
 					var userMasterDetailUrl = '<c:url value="/monitoring/userMasterDetail.do"/>';
 		  	        jQuery("#userSummary${sessionDto.sessionId}").clearGridData().setGridParam({gridstate: "visible"}).trigger("reloadGrid");
 		  	        $("#masterDetailArea").load(
-		  	        		userMasterDetailUrl,
-		  	        		{
-		  	        			userUid: userUid
+		  	        	userMasterDetailUrl,
+		  	        	{
+		  	        		userUid: userUid
 		  	       		}
 		  	       	);
 	  	  		} 
@@ -98,13 +85,14 @@
 	        var oldValue = 0;
 			jQuery("#userSummary${sessionDto.sessionId}").jqGrid({
 				datatype: "local",
+				autoencode:false,
 				rowNum: 10000,
 				gridstate:"hidden",
-				//hiddengrid:true,
 				height: 110,
 				autowidth: true,
 				shrinkToFit: true,
-				caption: "<fmt:message key="label.monitoring.summary.learner.summary" />",
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 				   	'#',
 					'userAttemptUid',
@@ -119,7 +107,7 @@
 	  			   	{name:'id', index:'id', width:20, sorttype:"int"},
 	  			   	{name:'userAttemptUid', index:'userAttemptUid', width:0, hidden: true},
 	  			   	{name:'title', index:'title', width: 200},
-	  			   	{name:'response', index:'response', width:443, sortable:false},
+	  			   	{name:'response', index:'response', width:473, sortable:false},
 	  			   	<c:if test="${enableConfidenceLevels}">
 	  			   		{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter},
 	  			  	</c:if>
@@ -186,11 +174,10 @@
         };
         setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
         
-    		function userNameFormatter (cellvalue, options, rowObject) {
-	    		return definePortraitPopover(rowObject[4], rowObject[0],  rowObject[2]);
-    		}
+    	function userNameFormatter (cellvalue, options, rowObject) {
+	    	return definePortraitPopover(rowObject[4], rowObject[0],  rowObject[2]);
+    	}
 	});
-
 </script>
 
 <div class="panel">
@@ -216,23 +203,14 @@
 	<!--For release marks feature-->
 	<lams:WaitingSpinner id="message-area-busy"></lams:WaitingSpinner>
 	<div class="voffset5 help-block" id="message-area"></div>
-
 </div>
 
-<%@ include file="parts/advanceQuestions.jsp"%>
-
 <c:if test="${not empty sessionDtos}">
-	<button onclick="return downloadMarks()" class="btn btn-default btn-xs btn-disable-on-submit pull-right">
-		<i class="fa fa-download" aria-hidden="true"></i> 
-		<fmt:message key="label.monitoring.downloadMarks.button" />
-	</button>
-
-	<h4>    
-		<fmt:message key="label.studentMarks"/>
-	</h4>
-
-	<div id="masterDetailArea">
-		<%@ include file="masterDetailLoadUp.jsp"%>
+	<div style="height: 30px;">
+		<button onclick="return downloadMarks()" class="btn btn-default btn-xs btn-disable-on-submit pull-right">
+			<i class="fa fa-download" aria-hidden="true"></i> 
+			<fmt:message key="label.monitoring.downloadMarks.button" />
+		</button>
 	</div>
 
 	<c:if test="${isGroupedActivity}">
@@ -257,8 +235,8 @@
 			<table id="group${sessionDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
 			<div id="pager-${sessionDto.sessionId}" class="scroll"></div>
 			
-			<div style="margin-top: 10px; width:99%;">
-				<table id="userSummary${sessionDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
+			<div style="margin-top: 10px;">
+				<table id="userSummary${sessionDto.sessionId}" class="scroll jqgrid-no-borders" cellpadding="0" cellspacing="0"></table>
 			</div>
 			
 		<c:if test="${isGroupedActivity}">
@@ -275,9 +253,14 @@
 
 </c:if>
 
+<div id="masterDetailArea">
+	<%@ include file="masterDetailLoadUp.jsp"%>
+</div>
+
 <c:if test="${not empty reflectionsContainerDTO}"> 							
 	<jsp:include page="/monitoring/Reflections.jsp" />
 </c:if>
 
+<%@ include file="parts/advanceQuestions.jsp"%>
 <%@ include file="parts/advanceOptions.jsp"%>
 <%@ include file="parts/dateRestriction.jsp"%>
Index: lams_tool_larsrc/web/css/monitor.scss
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_larsrc/web/css/monitor.scss	(.../monitor.scss)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/css/monitor.scss	(.../monitor.scss)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -1,19 +1,9 @@
 @import "_lams_variables.scss";
-	
-.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;
+.tablediv {
+	margin: 10px 5px;
 }
 
-.ui-jqgrid td {
-	border-style: none !important;
-}
-
 .ui-jqgrid a {
     color: $a-link-default !important;
 }
Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-        
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.rsrc.ResourceConstants"%>
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -5,7 +5,7 @@
 
 <lams:css suffix="jquery.jRating"/>
 <link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet"/>
-<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 <link type="text/css" href="<lams:WebAppURL/>css/monitor.css" rel="stylesheet" />
 
 <script type="text/javascript">
@@ -19,8 +19,7 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/rating.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="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript" src="${lams}includes/javascript/portrait.js" ></script>
 <script type="text/javascript">
@@ -35,10 +34,13 @@
 		
 			jQuery("#group${groupSummary.sessionId}").jqGrid({
 				datatype: "local",
+				autoencode:false,
 				rowNum: 10000,
 				height: 'auto',
 				autowidth: true,
 				shrinkToFit: false,
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:['#',
 						'itemUid',
 						"<fmt:message key="monitoring.label.title" />",
@@ -69,7 +71,6 @@
 			   		{name:'actions', index:'actions', width:120, align:"center"}		
 			   	],
 			   	<c:if test="${sessionsExist}">
-			   	// caption: "${groupSummary.sessionName}",
 				subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
 					var subgridTableId = subgrid_id+"_t";
@@ -87,6 +88,8 @@
 						rowList:[10,20,30,40,50,100],
 						rowNum:10,
 						viewrecords:true,
+						guiStyle: "bootstrap",
+						iconSet: 'fontAwesome',
 						colNames: [
 						   '',
 						   "<fmt:message key="monitoring.label.user.name"/>",
@@ -258,10 +261,8 @@
 	<!--For release marks feature-->
 	<lams:WaitingSpinner id="message-area-busy"/>
 	<div id="message-area"></div>
-
 </div>
 
-
 <c:if test="${sessionMap.isGroupedActivity}">
 <div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
 </c:if>
@@ -295,8 +296,6 @@
 	
 </c:forEach>
 
- 
-
 <c:if test="${sessionMap.isGroupedActivity}">
 </div> <!--  end accordianSessions --> 
 </c:if>
Index: lams_tool_notebook/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_notebook/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -15,8 +15,7 @@
 		<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="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/jinplace-1.0.1.js"></script>
 		
 		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
@@ -29,6 +28,7 @@
 		
 		<script type="text/javascript" src="${tool}includes/javascript/monitoring.js"></script>
 	</lams:head>
+
 	<body class="stripes">
 		<script type="text/javascript">
 		var statisticsURL = "<c:url value='/monitoring/getStatistics.do' />?toolContentID="+${notebookDTO.toolContentId}+"&reqID=";
@@ -56,5 +56,3 @@
 		<div class="footer"></div>					
 	</body>
 </lams:html>
-
-
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -3,23 +3,16 @@
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 <link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet"/>
+<link type="text/css" href="${lams}css/free.ui.jqgrid.min.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">
-	 .ui-jqgrid {
-		border-left-style: none !important;
-		border-right-style: none !important;
-		border-bottom-style: none !important;
+<style>
+	/* remove jqGrid border radius */
+	.ui-jqgrid.ui-jqgrid-bootstrap {
+	    border-radius:0;
+	    -moz-border-radius:0;
+	    -webkit-border-radius:0;
+	    -khtml-border-radius:0;
 	}
-	
-	.ui-jqgrid tr {
-		border-left-style: none !important;
-	}
-	
-	.ui-jqgrid td {
-		border-style: none !important;
-	}
 </style>
 
 <script type="text/javascript">
@@ -36,33 +29,65 @@
 	};
 
 	$(document).ready(function(){
- 
+		
 		<c:forEach var="sessionEntry" items="${notebookDTO.sessions}">
 			<c:set var="sessionId" value ="${sessionEntry.key}"/>
 			<c:set var="sessionName" value ="${sessionEntry.value}"/>
 			
 			jQuery("#group${sessionId}").jqGrid({
-			
-				url: "<c:url value='/monitoring/getUsers.do?toolSessionID=${sessionId}'/>",
 				datatype: 'json',
+				url: "<c:url value='/monitoring/getUsers.do?toolSessionID=${sessionId}'/>",
+				autoencode:false,
+				pager : '#group${sessionId}pager',
+				pagerpos: "left",
+				rowNum: 10,
+				rowList:[10,20,30,40,50,100],
+				height: 'auto',
+				autowidth: true,
+				shrinkToFit: false,
+			   	multiselect: false,
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
+			   	colNames:['#',
+						'userUid',
+ 						"<fmt:message key="label.user.name" />",
+ 					    "<fmt:message key="label.lastModified" />",
+					    "<fmt:message key="label.lastModified" />",
+					    "<fmt:message key="label.lastModified" />",
+	 				    'entry',
+					    "<fmt:message key="label.comment" />",  // comment summary for sorting
+					    'actualComment',
+	 					'userId',
+						'portraitId'
+				],
+			   	colModel:[
+			   		{name:'id',index:'id', width:10, hidden: true, search: false},
+			   		{name:'userUid',index:'userUid', width:0, hidden: true, search: false},
+ 			   		{name:'userName',index:'userName', width:200, formatter:userNameFormatter},
+ 			   		{name:'lastEdited',index:'lastEdited', hidden: true, width:0, search: false},		
+			   		{name:'lastEditedTimeago',index:'lastEditedTimeago', hidden: true, width:0,  search: false},		
+			   		{name:'lastEditedTimeagoOutput',index:'lastEditedTimeagoOutput', width:120, search: false},		
+ 			   		{name:'entry',index:'entry', hidden: true, width:0, search: false},	
+			   		{name:'commentsort',index:'commentsort', width:40, search: false },
+			   		{name:'comment',index:'comment', hidden: true, width:0, search: false},
+ 			   		{name:'userId',index:'userId', width:0, hidden: true, search: false},
+			   		{name:'portraitId',index:'portraitId', width:0, hidden: true, search: false}
+			   	],
 				jsonReader : {
 				     root: "rows",
 				     page: "page",
 				     total: "total",
 				     records: "total_rows",
 				     repeatitems: false,
 				     id: "id",
-				   },
-				   
+				},
 				loadError: function(xhr, status, error){ 
 					alert("Error has occured "+error);
 				},	
-				
  				subGrid: true,
 			    subGridOptions: {
 			        reloadOnExpand: false, // Prevent jqGrid from wiping out the subgrid data.
 			    },
-
  				gridComplete: function() {	
   					initializePortraitPopover('${lams}');
 					var dop = $("#group${sessionId}");
@@ -124,44 +149,7 @@
  					    okButton: "<fmt:message key='button.ok' />",
  					    cancelButton: "<fmt:message key='button.cancel' />"
  					});
- 				},
- 
-				pager : '#group${sessionId}pager',
-				pagerpos: "left",
-				rowNum: 10,
-				rowList:[10,20,30,40,50,100],
-				
-				height: 'auto',
-				autowidth: true,
-				shrinkToFit: false,
-				
-			   	colNames:['#',
-						'userUid',
- 						"<fmt:message key="label.user.name" />",
- 					    "<fmt:message key="label.lastModified" />",
-					    "<fmt:message key="label.lastModified" />",
-					    "<fmt:message key="label.lastModified" />",
-	 				    'entry',
-					    "<fmt:message key="label.comment" />",  // comment summary for sorting
-					    'actualComment',
-	 					'userId',
-						'portraitId'],
-					    
-			   	colModel:[
-			   		{name:'id',index:'id', width:10, hidden: true, search: false},
-			   		{name:'userUid',index:'userUid', width:0, hidden: true, search: false},
- 			   		{name:'userName',index:'userName', width:200, formatter:userNameFormatter},
- 			   		{name:'lastEdited',index:'lastEdited', hidden: true, width:0, search: false},		
-			   		{name:'lastEditedTimeago',index:'lastEditedTimeago', hidden: true, width:0,  search: false},		
-			   		{name:'lastEditedTimeagoOutput',index:'lastEditedTimeagoOutput', width:120, search: false},		
- 			   		{name:'entry',index:'entry', hidden: true, width:0, search: false},	
-			   		{name:'commentsort',index:'commentsort', width:40, search: false },
-			   		{name:'comment',index:'comment', hidden: true, width:0, search: false},
- 			   		{name:'userId',index:'userId', width:0, hidden: true, search: false},
-			   		{name:'portraitId',index:'portraitId', width:0, hidden: true, search: false}
-			   	],
-			   	
-			   	multiselect: false,
+ 				}
 			}).jqGrid('filterToolbar',{searchOnEnter: false});
 		</c:forEach>
 		 
@@ -186,8 +174,8 @@
         setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
 
         function userNameFormatter (cellvalue, options, rowObject) {
-    			return definePortraitPopover(rowObject.portraitId, rowObject.userId,  rowObject.userName);
-	    	}
+    		return definePortraitPopover(rowObject.portraitId, rowObject.userId,  rowObject.userName);
+	    }
 	});
 
 </script>
Index: lams_tool_preview/web/pages/monitoring/criteria.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -7,51 +7,52 @@
 
 <lams:html>
 <lams:head>
-	<title><fmt:message key="label.monitoring.heading" />
-	</title>
+	<title><fmt:message key="label.monitoring.heading" /></title>
 	<%@ include file="/common/header.jsp"%>
 
 	<lams:css suffix="jquery.jRating"/>
 	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+	<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 	<link type="text/css" href="<lams:WebAppURL/>includes/css/learning.css" rel="stylesheet" >
+	<style>
+		.tablediv {
+		    padding: 5px;
+		}
+	</style>
 
-<script type="text/javascript">
-	//var for jquery.jRating.js
-	var pathToImageFolder = "${lams}images/css/";
-		
-	//vars for rating.js
-	var MAX_RATES = 0,
-	MIN_RATES = 0,
-	COMMENTS_MIN_WORDS_LIMIT = 0,
-	MAX_RATINGS_FOR_ITEM = 0,
-	LAMS_URL = '',
-	COUNT_RATED_ITEMS = 0,
-	COMMENT_TEXTAREA_TIP_LABEL = '',
-	WARN_COMMENTS_IS_BLANK_LABEL = '',
-	WARN_MIN_NUMBER_WORDS_LABEL = '';
-</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/jquery.jqGrid.locale-en.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
-
+	<script type="text/javascript">
+		//var for jquery.jRating.js
+		var pathToImageFolder = "${lams}images/css/";
+			
+		//vars for rating.js
+		var MAX_RATES = 0,
+		MIN_RATES = 0,
+		COMMENTS_MIN_WORDS_LIMIT = 0,
+		MAX_RATINGS_FOR_ITEM = 0,
+		LAMS_URL = '',
+		COUNT_RATED_ITEMS = 0,
+		COMMENT_TEXTAREA_TIP_LABEL = '',
+		WARN_COMMENTS_IS_BLANK_LABEL = '',
+		WARN_MIN_NUMBER_WORDS_LABEL = '';
+	</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/free.jquery.jqgrid.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
 </lams:head>
-<body class="stripes">
 
+<body class="stripes">
 	<lams:Page type="monitor" title="${criteria.title}">
 		<%@ include file="criteriapart.jsp" %>
- 		<span onclick="window.close()" class="btn btn-default voffset5 pull-right"><fmt:message key="label.close"/></span>
+		
+ 		<span onclick="window.close()" class="btn btn-default voffset20 pull-right">
+ 			<fmt:message key="label.close"/>
+ 		</span>
 	</lams:Page>
-	<!--closes content-->
 
-	<div id="footer">
-	</div>
-	<!--closes footer-->
-
+	<div id="footer"></div>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -21,9 +21,12 @@
 		jQuery("#group${toolSessionId}").jqGrid({
 		   	url: "<c:url value='/monitoring/getUsers.do'/>?toolContentId=${sessionMap.toolContentID}&toolSessionId=${toolSessionId}&criteriaId=${criteria.ratingCriteriaId}",
 			datatype: "json",
+			autoencode: false,
 			height: 'auto',
 			autowidth: true,
 			shrinkToFit: false,
+			guiStyle: "bootstrap",
+			iconSet: 'fontAwesome',
 		   	colNames:[
 				'itemId',
 				'<fmt:message key="label.user.name" />',
@@ -69,13 +72,8 @@
 							groupField : ['criteriaId'],
 							groupColumnShow : [false]
 						},
-						loadComplete: function(){
-							//remove empty subgrids
-					        var table_value = $('#'+subgridTableId).getGridParam('records');
-					        if(table_value === 0){
-					            $('#'+subgrid_id).parent().unbind('click').html('<fmt:message key="label.no.ratings.left" />');
-					        }
-						},
+						guiStyle: "bootstrap",
+						iconSet: 'fontAwesome',
 						colNames:[
 							'id',
 							'<fmt:message key="label.user.name" />',
@@ -88,6 +86,13 @@
 						   {name:'rating', index:'rating', width:200, align:"center",  title:false},
 						   {name:'criteriaId', width:0, hidden:true}
 						],
+						loadComplete: function(){
+							//remove empty subgrids
+					        var table_value = $('#'+subgridTableId).getGridParam('records');
+					        if(table_value === 0){
+					            $('#'+subgrid_id).parent().unbind('click').html('<fmt:message key="label.no.ratings.left" />');
+					        }
+						},
 						loadError: function(xhr,st,err) {
 					    	jQuery("#"+subgridTableId).clearGridData();
 					    	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
Index: lams_tool_preview/web/pages/monitoring/manageUsers.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_preview/web/pages/monitoring/manageUsers.jsp	(.../manageUsers.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_preview/web/pages/monitoring/manageUsers.jsp	(.../manageUsers.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -10,7 +10,7 @@
 	<%@ include file="/common/header.jsp"%>
 
 	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+	<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 	<link type="text/css" href="<lams:WebAppURL/>includes/css/learning.css" rel="stylesheet" />
 	<style type="text/css">
 		.ui-jqgrid-labels {
@@ -21,8 +21,7 @@
 		}	
 	</style>
 
-	<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="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 	<script type="text/javascript">
 	$(document).ready(function(){
 
@@ -36,6 +35,8 @@
 				height: 'auto',
 				autowidth: true,
 				shrinkToFit: false,
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 					'userUid',
 			   		'<fmt:message key="label.user.hidden" />',
Index: lams_tool_preview/web/pages/monitoring/reflections.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_preview/web/pages/monitoring/reflections.jsp	(.../reflections.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_preview/web/pages/monitoring/reflections.jsp	(.../reflections.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -9,23 +9,17 @@
 
 <lams:html>
 <lams:head>
-	<title><fmt:message key="label.monitoring.heading" />
-	</title>
+	<title><fmt:message key="label.monitoring.heading" /></title>
 	<%@ include file="/common/header.jsp"%>
 	
 	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
-	<link type="text/css" href="<lams:WebAppURL/>includes/css/learning.css" rel="stylesheet" />
+	<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 	
-	<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="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
-
 	<script type="text/javascript">
-	
 	$(document).ready(function(){
 
 			jQuery("#group${toolSessionId}").jqGrid({
@@ -34,6 +28,8 @@
 				height: 'auto',
 				autowidth: true,
 				shrinkToFit: false,
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 						'itemId',
 						'<fmt:message key="label.user.name" />',
@@ -88,10 +84,9 @@
 		}
 
 	});
-	
     </script>
-        
 </lams:head>
+
 <body class="stripes">
 
 	<c:set var="title"><fmt:message key="title.reflection"/></c:set>
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -1,12 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="webapp"><lams:WebAppURL/></c:set>
-
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
 <link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
 <lams:css suffix="jquery.jRating"/>
 <link type="text/css" href="${webapp}includes/css/learning.css" rel="stylesheet" >
 <style type="text/css">
@@ -32,7 +30,15 @@
 	COMMENT_TEXTAREA_TIP_LABEL = '',
 	WARN_COMMENTS_IS_BLANK_LABEL = '',
 	WARN_MIN_NUMBER_WORDS_LABEL = '';
-	
+</script>
+<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<script src="${lams}includes/javascript/download.js" type="text/javascript" ></script>
+<script src="${lams}includes/javascript/portrait.js" type="text/javascript" ></script>
+<script type="text/javascript">
+	function exportResults() {
+		var exportExcelUrl = '<c:url value="/monitoring/exportTeamReport.do"/>?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID}';
+		return downloadFile(exportExcelUrl, 'messageArea_Busy', '<fmt:message key="label.file.downloaded"/>', 'messageArea', 'btn-disable-on-submit');
+	}
 	function sendResults(sessionId) {
 		var url = "<c:url value="/monitoring/sendResultsToSessionUsers.do"/>";
 		$("#messageArea").html("");
@@ -53,23 +59,8 @@
 		);
 		return false;
 	}
-	
 </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="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
-<script src="${lams}includes/javascript/rating.js" type="text/javascript" ></script>
-<script src="${lams}includes/javascript/download.js" type="text/javascript" ></script>
-<script src="${lams}includes/javascript/portrait.js" type="text/javascript" ></script>
 
-<script type="text/javascript">
-	function exportResults() {
-		var exportExcelUrl = '<c:url value="/monitoring/exportTeamReport.do"/>?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID}';
-		return downloadFile(exportExcelUrl, 'messageArea_Busy', '<fmt:message key="label.file.downloaded"/>', 'messageArea', 'btn-disable-on-submit');
-	}
-</script>
-
 <div class="panel">
 	<h4>
 	    <c:out value="${sessionMap.peerreview.title}" escapeXml="true"/>
Index: lams_tool_scratchie/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -12,17 +12,16 @@
 	<lams:css/>
 	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
 	<link type="text/css" href="${lams}css/thickbox.css" rel="stylesheet"  media="screen">
-	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
 	<link href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet" type="text/css" >
+	<link href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet" type="text/css">
 	<lams:css suffix="chart"/>
 		
 	<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="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/thickbox.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_scratchie/web/pages/monitoring/parts/itemSummary.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -9,35 +9,44 @@
 		<%@ include file="/common/header.jsp"%>
 		
 		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-		<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+		<link href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet" type="text/css">
 		<style type="text/css">
+			/* remove jqGrid borders */
 			.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;
 			}
+			
+			/* remove jqGrid border radius */
+			.ui-jqgrid.ui-jqgrid-bootstrap {
+			    border-radius:0;
+			    -moz-border-radius:0;
+			    -webkit-border-radius:0;
+			    -khtml-border-radius:0;
+			}
 		</style>
 		
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.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="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
   	    <script>
 	  	  	$(document).ready(function(){
 	  			<c:forEach var="summary" items="${summaryList}" varStatus="status">
 		  			
 	  				jQuery("#session${summary.sessionId}").jqGrid({
 	  					datatype: "local",
+	  					autoencode:false,
 	  					rowNum: 10000,
 	  					height: 'auto',
 	  					width: '100%',
+	  					guiStyle: "bootstrap",
+	  					iconSet: 'fontAwesome',
 	  				   	colNames:["<fmt:message key="label.monitoring.summary.answer" />"
 		  			  	   	        <c:forEach var="answer" items="${summary.answers}" varStatus="i">
 		  			  	   	 			,"<fmt:message key="label.monitoring.summary.choice" />&nbsp;${i.index + 1}"
Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -4,8 +4,9 @@
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 <c:set var="scratchie" value="${sessionMap.scratchie}"/>
 
-<style media="screen,projection" type="text/css">
-	 .ui-jqgrid {
+<style type="text/css">
+	/* remove jqGrid borders */
+	.ui-jqgrid {
 		border-left-style: none !important;
 		border-right-style: none !important;
 		border-bottom-style: none !important;
@@ -16,6 +17,7 @@
 	.ui-jqgrid td {
 		border-style: none !important;
 	}
+	
 	.ui-jqgrid tr.jqgrow td {
 	    white-space: normal !important;
 	    height:auto;
@@ -25,6 +27,14 @@
 	.ui-jqgrid tr.jqgrow td {
 		vertical-align:middle !important
 	}
+	
+	/* remove jqGrid border radius */
+	.ui-jqgrid.ui-jqgrid-bootstrap {
+	    border-radius:0;
+	    -moz-border-radius:0;
+	    -webkit-border-radius:0;
+	    -khtml-border-radius:0;
+	}
 </style>
 
 <script type="text/javascript">
@@ -39,13 +49,8 @@
 				height: 'auto',
 				autowidth: true,
 				shrinkToFit: false,
-			   	ondblClickRow: function(rowid) {
-			   		var userId = jQuery("#list${summary.sessionId}").getCell(rowid, 'userId');
-			   		var toolSessionId = jQuery("#list${summary.sessionId}").getCell(rowid, 'sessionId');
-
-			   		var userSummaryUrl = "<c:url value='/learning/start.do'/>?userID=" + userId + "&toolSessionID=" + toolSessionId + "&mode=teacher&reqId=" + (new Date()).getTime();
-					launchPopup(userSummaryUrl, "MonitoringReview");		
-			  	},
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 				   	'#',
 					'userId',
@@ -64,6 +69,13 @@
 			   		{name:'mark', index:'mark', width:100, align:"right", sorttype:"int", editable:true, editoptions: {size:4, maxlength: 4}},
 			   		{name:'portraitId', index:'portraitId', width:0, hidden: true},
 			   	],
+			   	ondblClickRow: function(rowid) {
+			   		var userId = jQuery("#list${summary.sessionId}").getCell(rowid, 'userId');
+			   		var toolSessionId = jQuery("#list${summary.sessionId}").getCell(rowid, 'sessionId');
+
+			   		var userSummaryUrl = "<c:url value='/learning/start.do'/>?userID=" + userId + "&toolSessionID=" + toolSessionId + "&mode=teacher&reqId=" + (new Date()).getTime();
+					launchPopup(userSummaryUrl, "MonitoringReview");		
+			  	},
 			   	// caption: "${summary.sessionName}",
 				cellurl: '<c:url value="/monitoring/saveUserMark.do"/>',
   				cellEdit: true,
@@ -114,6 +126,8 @@
 				height: 'auto',
 				autowidth: true,
 				shrinkToFit: false,
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:['#',
 						"<fmt:message key='label.monitoring.summary.user.name' />",
 					    "<fmt:message key='label.burning.questions' />",
@@ -124,8 +138,7 @@
 			   		{name:'groupName', index:'groupName', width:150},
 			   		{name:'feedback', index:'feedback', width:520},
 			   		{name:'count', index:'count', align:"right", width:70}
-			   	],
-			   	// caption: "${scratchieItem.title}"
+			   	]
 			});
 			
 			<c:forEach var="burningQuestionDto" items="${burningQuestionItemDto.burningQuestionDtos}" varStatus="i">
Index: lams_tool_task/web/common/monitorheader.jsp
===================================================================
diff -u -r5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_task/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision 5a0c67fe7b338c1f3ad27b7e309d993feb90a0b5)
+++ lams_tool_task/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -7,8 +7,8 @@
 <link href="<lams:WebAppURL/>includes/css/taskList.css" rel="stylesheet" type="text/css">
 <lams:css/>
 <link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/free.ui.jqgrid.min.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"/>
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
@@ -17,8 +17,7 @@
 <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="${lams}includes/javascript/free.jquery.jqgrid.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>
 <script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
Index: lams_tool_task/web/pages/monitoring/itemsummary.jsp
===================================================================
diff -u -r3b9eccb4b8def4d56a62641a0fe4038a60b3afe6 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6)
+++ lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -9,30 +9,15 @@
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/monitorheader.jsp"%>
-
-	<style media="screen,projection" type="text/css">
-		 .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">
 		$(document).ready(function(){
 			<c:forEach var="sessionDto" items="${sessionDtos}">
 				
 				jQuery("#group${sessionDto.sessionId}").jqGrid({
 					datatype: "json",
 					url: "<c:url value='/monitoring/getPagedUsersByItem.do'/>?sessionMapID=${sessionMapID}&toolSessionID=${sessionDto.sessionId}&itemUid=${item.uid}",
+					autoencode:false,
 					height: 'auto',
 					autowidth: true,
 					shrinkToFit: true,
@@ -41,7 +26,8 @@
 					rowList:[10,20,30,40,50,100],
 					rowNum:10,
 					viewrecords:true,
-				   	caption: "${sessionDto.sessionName}",
+				   	guiStyle: "bootstrap",
+					iconSet: 'fontAwesome',
 				   	colNames:[
 							"<fmt:message key="label.monitoring.tasksummary.user" />",
 							"<fmt:message key="label.monitoring.tasksummary.completed" />",
@@ -95,10 +81,8 @@
 	
 <body class="stripes">
 
-	<c:set var="title"><fmt:message key="label.monitoring.tasksummary.task.summary" /></c:set>
+	<c:set var="title"><c:out value="${item.title}" escapeXml="true"/></c:set>
 	<lams:Page type="admin" title="${title}">
-
-		<h4><c:out value="${item.title}" escapeXml="true"/></h4>
 				
 		<c:if test="${item.required}">
 		<div><em><fmt:message key="label.monitoring.tasksummary.task.required.to.finish" /></em></div>
Index: lams_tool_task/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_task/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -2,12 +2,11 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.taskList.TaskListConstants"%>
-		<%-- param has higher level for request attribute --%>
-		<c:if test="${not empty param.sessionMapID}">
-			<c:set var="sessionMapID" value="${param.sessionMapID}" />
-		</c:if>
-	
-		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+
+<c:if test="${not empty param.sessionMapID}">
+	<c:set var="sessionMapID" value="${param.sessionMapID}" />
+</c:if>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 		
 <lams:html>
 	<lams:head>
@@ -27,22 +26,6 @@
 		</script>
 		<%@ include file="/common/monitorheader.jsp" %>
 		
-		<style media="screen,projection" type="text/css">
-			 .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>
 	        function init(){
 	        	var initialTabId = "${initialTabId}";
@@ -57,7 +40,6 @@
 		    	// end optional tab controller stuff
 		    	selectTab(tabId);
 	        } 
-
 	    </script>		 
 	</lams:head>
 	<body class="stripes" onLoad="init()">
Index: lams_tool_task/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5
--- lams_tool_task/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
@@ -12,14 +12,16 @@
 			jQuery("#group${sessionDto.sessionId}").jqGrid({
 				datatype: "json",
 				url: "<c:url value='/monitoring/getPagedUsers.do'/>?sessionMapID=${sessionMapID}&toolSessionID=${sessionDto.sessionId}",
+				autoencode:false,
 				height: '100%',
 				autowidth: true,
 				shrinkToFit: false,
 				pager: 'pager-${sessionDto.sessionId}',
 				rowList:[10,20,30,40,50,100],
 				rowNum:10,
 				viewrecords:true,
-//			   	caption: "${sessionDto.sessionName}",
+				guiStyle: "bootstrap",
+				iconSet: 'fontAwesome',
 			   	colNames:[
 						'userUid'
 						,"<fmt:message key="label.monitoring.summary.user" />"
@@ -30,7 +32,7 @@
 							,'<fmt:message key="label.monitoring.summary.confirm.completion" />'
 						</c:if>
 						,'portraitId'
-						],
+				],
 			   	colModel:[
 			   		{name:'userUid',index:'userUid', width:0, hidden: true}
 			   		,{name:'userName',index:'userName', width:200, searchoptions: { clearSearch: false }, formatter:userNameFormatter}
@@ -48,7 +50,7 @@
 			   	},
 			    loadComplete: function () {
 			   	 	initializePortraitPopover('<lams:LAMSURL/>');
-			    	}
+			    }
 			})
 			.jqGrid('filterToolbar', { 
  	 			searchOnEnter: false
@@ -87,7 +89,6 @@
 	}
 	
 	function setVerifiedByMonitor(link, userUid) {
-
 		$.ajax({
 			type: "POST",
 			url: '<c:url value="/monitoring/setVerifiedByMonitor.do"/>',
@@ -114,16 +115,13 @@
 			 <fmt:message key="message.monitoring.summary.no.session" />
 		</lams:Alert>
 	</c:if>
-	
 </div>
 
-
 <%-- Summary list  --%>
 <c:if test="${sessionMap.isGroupedActivity}">
 <div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
 </c:if>
 
-
 <c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
 			
 	<c:if test="${sessionMap.isGroupedActivity}">	
@@ -139,8 +137,8 @@
 	       <div id="collapse${sessionDto.sessionId}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel" aria-labelledby="heading${sessionDto.sessionId}">
 	</c:if>
 			
-		<table id="group${sessionDto.sessionId}"></table>
-		<div id="pager-${sessionDto.sessionId}"></div>
+	<table id="group${sessionDto.sessionId}"></table>
+	<div id="pager-${sessionDto.sessionId}"></div>
 
 	<c:if test="${sessionMap.isGroupedActivity}">
 		</div> <!-- end collapse area  -->