Index: lams_tool_images/web/common/tabbedheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/common/tabbedheader.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_images/web/common/tabbedheader.jsp	11 Oct 2008 12:04:14 -0000	1.1
+++ lams_tool_images/web/common/tabbedheader.jsp	24 Apr 2014 20:39:10 -0000	1.2
@@ -3,15 +3,11 @@
 <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/imageGallery.css'/>" rel="stylesheet" type="text/css">
-	<lams:css style="tabbed"/>
+<!-- ********************  CSS ********************** -->
+<link href="<html:rewrite page='/includes/css/imageGallery.css'/>" rel="stylesheet" type="text/css">
+<lams:css style="tabbed"/>
 
-
- 	<!-- ********************  javascript ********************** -->
-	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/imageGallerycommon.js'/>"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
-
-	
+<!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/imageGallerycommon.js'/>"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/authoring.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_images/web/pages/authoring/authoring.jsp	17 Jan 2014 21:44:57 -0000	1.5
+++ lams_tool_images/web/pages/authoring/authoring.jsp	24 Apr 2014 20:39:10 -0000	1.6
@@ -10,6 +10,7 @@
 	<title><fmt:message key="label.author.title" /></title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
+	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 
 	<script>
         function init(){
Index: lams_tool_images/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_images/web/pages/monitoring/monitoring.jsp	17 Jan 2014 21:44:57 -0000	1.8
+++ lams_tool_images/web/pages/monitoring/monitoring.jsp	24 Apr 2014 20:39:10 -0000	1.9
@@ -3,6 +3,7 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 
 <lams:html>
 	<lams:head>
@@ -11,9 +12,19 @@
 		</title>
 		<%@ include file="/common/tabbedheader.jsp" %>
 		
-		<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
- 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>	
+		<link href="${lams}css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
+		<link href="${lams}css/jquery.tablesorter.theme-blue.css" rel="stylesheet" >
+		<style media="screen,projection" type="text/css">
+			.tablesorter {
+				margin: 15px 10px 5px;
+				width: 97%;
+			}
+		</style>
+		
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+ 		<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>	
  			
 		<script>
 			var initialTabId = "${initialTabId}";
@@ -29,12 +40,50 @@
 		   	function doSelectTab(tabId) {
 				// end optional tab controller stuff
 			    selectTab(tabId);
-		    } 
+		    }
+		   	
+		   	function onSelectTab(id) {
+		   		return;
+		   	}
 		        
 			function viewItem(imageUid,sessionMapID){
 				var myUrl = "<c:url value="/reviewItem.do"/>?mode=teacher&imageUid=" + imageUid + "&sessionMapID="+sessionMapID;
 				launchPopup(myUrl,"MonitoringReview");
 			}
+			
+			$(document).ready(function(){
+
+				$(".tablesorter").tablesorter({
+					theme: 'blue',
+				    widthFixed: true,
+				    widgets: ['zebra'],
+			        headers: {
+			            0: { sorter: false }
+			            <c:if test="${sessionMap.imageGallery.allowRank || sessionMap.imageGallery.allowVote}"> 
+			            	, 3: { sorter: false }
+			            </c:if>
+			        } 
+				});
+
+				function resizeIframe() {
+					if (document.getElementById('TB_iframeContent') != null) {
+					    var height = top.window.innerHeight;
+					    if ( height == undefined || height == 0 ) {
+					    	// IE doesn't use window.innerHeight.
+					    	height = document.documentElement.clientHeight;
+					    	// alert("using clientHeight");
+					    }
+						// alert("doc height "+height);
+					    height -= document.getElementById('TB_iframeContent').offsetTop + 100;
+					    document.getElementById('TB_iframeContent').style.height = height +"px";
+				
+						TB_HEIGHT = height + 28;
+						tb_position();
+					}
+				};
+				window.onresize = resizeIframe;
+				
+			});
 		</script>		 
 	</lams:head>
 	
@@ -51,11 +100,11 @@
 				</lams:Tabs>
 			</div>
 			<div id="content">
-					<lams:help toolSignature="<%= ImageGalleryConstants.TOOL_SIGNATURE %>" module="monitoring"/>
+				<lams:help toolSignature="<%= ImageGalleryConstants.TOOL_SIGNATURE %>" module="monitoring"/>
 			
-					<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" />
+				<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>
 		
Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/summary.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_images/web/pages/monitoring/summary.jsp	3 Apr 2014 14:28:26 -0000	1.14
+++ lams_tool_images/web/pages/monitoring/summary.jsp	24 Apr 2014 20:39:10 -0000	1.15
@@ -2,32 +2,11 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-<script type="text/javascript">
-
-	function resizeIframe() {
-		if (document.getElementById('TB_iframeContent') != null) {
-		    var height = top.window.innerHeight;
-		    if ( height == undefined || height == 0 ) {
-		    	// IE doesn't use window.innerHeight.
-		    	height = document.documentElement.clientHeight;
-		    	// alert("using clientHeight");
-		    }
-			// alert("doc height "+height);
-		    height -= document.getElementById('TB_iframeContent').offsetTop + 100;
-		    document.getElementById('TB_iframeContent').style.height = height +"px";
-	
-			TB_HEIGHT = height + 28;
-			tb_position();
-		}
-	};
-	window.onresize = resizeIframe;
-</script>
-
 <h1>
   <c:out value="${sessionMap.imageGallery.title}" escapeXml="true"/>
 </h1>
-<div class="instructions small-space-top">
+
+<div class="instructions small-space-top small-space-bottom">
   <c:out value="${sessionMap.imageGallery.instructions}" escapeXml="false"/>
 </div>
 
@@ -38,51 +17,53 @@
 </c:if>
 
 <c:forEach var="group" items="${summaryList}">
+
 	<c:choose>
-	 <c:when test="${sessionMap.isGroupedActivity}">
-		<h1>
-			<fmt:message key="monitoring.label.group" /> ${group[0].sessionName}	
-		</h1>
-		<h2 style="color:black; margin-left: 20px;">
-                  <fmt:message key="label.monitoring.summary.overall.summary" />
-                </h2>
-	</c:when>
-	<c:otherwise>
-	  <h1 style="margin-left: 20px;">
-		<fmt:message key="label.monitoring.summary.overall.summary" />	
-	  </h1>
+		 <c:when test="${sessionMap.isGroupedActivity}">
+			<h1>
+				<fmt:message key="monitoring.label.group" /> ${group[0].sessionName}	
+			</h1>
+		</c:when>
+		
+		<c:otherwise>
+			<h1>
+				<fmt:message key="label.monitoring.summary.overall.summary" />	
+		 	</h1>
          </c:otherwise>
 	</c:choose>
 
-	<table cellpadding="0" class="alternative-color" style="margin-top: 5px;">
-		<tr>
-			<th width="4%" align="center">
-				<!--thumbnail-->
-			</th>
-			<th>
-				<fmt:message key="monitoring.label.title" />
-			</th>
-			<c:choose>
-				<c:when test="${sessionMap.imageGallery.allowRank == true}">
-					<th width="70px" style="padding-left:0px; text-align:center;">
-						<fmt:message key="label.monitoring.average.rating" />
-					</th>
-				</c:when>
-				<c:when test="${sessionMap.imageGallery.allowVote == true}">
-					<th width="70px" style="padding-left:0px; text-align:center;">
-						<fmt:message key="label.monitoring.number.votes" />
-					</th>
-				</c:when>
-			</c:choose>				
-			<th width="75px" >
-				<!--hide/show-->
-			</th>
-		</tr>
-		<%-- End group title display --%>	
+	<table class="tablesorter">
+		<thead>
+			<tr>
+				<th width="4%" align="center">
+					<!--thumbnail-->
+				</th>
+				<th>
+					<fmt:message key="monitoring.label.title" />
+				</th>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.allowRank}">
+						<th width="70px" style="padding-left:0px; text-align:center;">
+							<fmt:message key="label.monitoring.average.rating" />
+						</th>
+					</c:when>
+					<c:when test="${sessionMap.imageGallery.allowVote}">
+						<th width="70px" style="padding-left:0px; text-align:center;">
+							<fmt:message key="label.monitoring.number.votes" />
+						</th>
+					</c:when>
+				</c:choose>				
+				<th width="75px" >
+					<!--hide/show-->
+				</th>
+			</tr>
+		</thead>
 	
+		<tbody>
 		<c:forEach var="summary" items="${group}">
 			<c:set var="sessionId" value="${summary.sessionId}" />		
 			<c:set var="image" value="${summary.item}" />
+			
 			<c:if test="${summary.itemUid == -1}">
 				<tr>
 					<td colspan="5">
@@ -92,6 +73,7 @@
 					</td>
 				</tr>
 			</c:if>
+			
 			<c:if test="${summary.itemUid != -1}">
 				<tr>
 
@@ -103,9 +85,9 @@
 							<c:url value='/monitoring/imageSummary.do'/>?sessionMapID=${sessionMapID}&imageUid=${image.uid}&resizeIframe=true&TB_iframe=true&height=640&width=740
 						</c:set>				
 						<a href="${url}" class="thickbox" title="<fmt:message key='label.monitoring.imagesummary.image.summary' />" style="border-style: none;"> 
-						<c:set var="title">
-							<c:out value="${image.title}" escapeXml="true"/>
-						</c:set>
+							<c:set var="title">
+								<c:out value="${image.title}" escapeXml="true"/>
+							</c:set>
 							<img src="${thumbnailPath}" alt="${title}" style="border-style: none;"/>
 						</a>
 					</td>
@@ -121,13 +103,14 @@
 							<c:out value="${title}" escapeXml="false"/>
 						</a>
 					</td>
+					
 					<c:choose>
-						<c:when test="${sessionMap.imageGallery.allowRank == true}">
+						<c:when test="${sessionMap.imageGallery.allowRank}">
 							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
 								${summary.averageRating}
 							</td>
 						</c:when>
-						<c:when test="${sessionMap.imageGallery.allowVote == true}">
+						<c:when test="${sessionMap.imageGallery.allowVote}">
 							<td style="vertical-align:middle; padding-left:0px; text-align:center;">
 								${summary.numberOfVotes}
 							</td>
@@ -144,10 +127,14 @@
 							</c:otherwise>
 						</c:choose>
 					</td>
+					
 				</tr>
 			</c:if>
 		</c:forEach>
-	</table>			
+		<tbody>
+	</table>
+	
+			<br>	
 
 	<%-- Reflection list  --%>
 	<c:if test="${sessionMap.imageGallery.reflectOnActivity && not (empty sessionId)}">	
@@ -194,151 +181,4 @@
 	</a>
 </div>
 
-
-<br />
-
-<h1 class="space-top">
-	<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 space-top" id="advancedDiv" style="display:none">
-	<table class="alternative-color">
-		<tr>
-			<td>
-				<fmt:message key="label.authoring.advance.lock.on.finished" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.lockWhenFinished == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="label.authoring.advance.allow.learner.share.images" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.allowShareImages == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="label.authoring.advance.notify.monitoring.teachers" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.notifyTeachersOnImageSumbit == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="label.authoring.advance.allow.learner.comment.images" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.allowCommentImages == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="label.authoring.advance.allow.learner.vote" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.allowVote == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="label.authoring.advance.allow.learner.rank" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.allowRank == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<tr>
-			<td>
-				<fmt:message key="monitor.summary.td.addNotebook" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.imageGallery.reflectOnActivity == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
-		
-		<c:choose>
-			<c:when test="${sessionMap.imageGallery.reflectOnActivity == true}">
-				<tr>
-					<td>
-						<fmt:message key="monitor.summary.td.notebookInstructions" />
-					</td>
-					<td>
-						<lams:out value="${sessionMap.imageGallery.reflectInstructions}" escapeHtml="true"/>
-					</td>
-				</tr>
-			</c:when>
-		</c:choose>
-	</table>
-</div>
+<%@ include file="parts/advanceOptions.jsp"%>
Index: lams_tool_images/web/pages/monitoring/parts/advanceOptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/parts/advanceOptions.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_images/web/pages/monitoring/parts/advanceOptions.jsp	24 Apr 2014 20:39:10 -0000	1.1
@@ -0,0 +1,149 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<br />
+
+<h1 class="space-top">
+	<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 space-top" id="advancedDiv" style="display:none">
+	<table class="alternative-color">
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.lock.on.finished" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.lockWhenFinished == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.learner.share.images" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.allowShareImages == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.notify.monitoring.teachers" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.notifyTeachersOnImageSumbit == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.learner.comment.images" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.allowCommentImages == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.learner.vote" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.allowVote == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.learner.rank" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.allowRank == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="monitor.summary.td.addNotebook" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${sessionMap.imageGallery.reflectOnActivity == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<c:choose>
+			<c:when test="${sessionMap.imageGallery.reflectOnActivity == true}">
+				<tr>
+					<td>
+						<fmt:message key="monitor.summary.td.notebookInstructions" />
+					</td>
+					<td>
+						<lams:out value="${sessionMap.imageGallery.reflectInstructions}" escapeHtml="true"/>
+					</td>
+				</tr>
+			</c:when>
+		</c:choose>
+	</table>
+</div>