Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java,v
diff -u -r1.7 -r1.8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	8 Jul 2008 05:09:17 -0000	1.7
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	21 Jul 2008 06:02:25 -0000	1.8
@@ -63,6 +63,7 @@
 	
 	//public boolean allowRichEditor;
 	
+	public boolean lockOnFinish;
 	
 	public boolean allowEditMarkers;
 	
@@ -106,7 +107,8 @@
 		onlineInstructions = gmap.getOnlineInstructions();
 		offlineInstructions = gmap.getOfflineInstructions();
 		contentInUse = gmap.isContentInUse();
-		//allowRichEditor = gmap.isAllowRichEditor();		
+		//allowRichEditor = gmap.isAllowRichEditor();	
+		lockOnFinish = gmap.isLockOnFinished();
 		allowEditMarkers = gmap.isAllowEditMarkers();		
 		allowShowAllMarkers = gmap.isAllowShowAllMarkers();		
 		limitMarkers = gmap.isLimitMarkers();		
@@ -139,18 +141,11 @@
 			}
 		}
 		
-		for (Iterator iter = gmap.getGmapSessions().iterator(); iter.hasNext();) {
+		for (Iterator<GmapSession> iter = gmap.getGmapSessions().iterator(); iter.hasNext();) {
 			GmapSession session = (GmapSession) iter.next();
 			GmapSessionDTO sessionDTO = new GmapSessionDTO(session);			
 			sessionDTOs.add(sessionDTO);
 		}
-		
-		/*
-		for (Iterator<GmapMarker> i = gmap.getGmapMarkers().iterator(); i.hasNext();) {
-			GmapMarker marker = (GmapMarker) i.next();
-			GmapMarkerDTO markerDTO = new GmapMarkerDTO(marker);
-			gmapMarkers.add(markerDTO);
-		}*/
 	}
 
 	/* Getters / Setters */
@@ -336,4 +331,28 @@
 			this.gmapMarkers.add(markerDTO);
 		}
 	}
+
+	public boolean isDefineLater() {
+		return defineLater;
+	}
+
+	public void setDefineLater(boolean defineLater) {
+		this.defineLater = defineLater;
+	}
+
+	public boolean isLockOnFinish() {
+		return lockOnFinish;
+	}
+
+	public void setLockOnFinish(boolean lockOnFinish) {
+		this.lockOnFinish = lockOnFinish;
+	}
+
+	public void setContentInUse(boolean contentInUse) {
+		this.contentInUse = contentInUse;
+	}
+
+	public void setGmapMarkers(Set<GmapMarkerDTO> gmapMarkers) {
+		this.gmapMarkers = gmapMarkers;
+	}
 }
Index: lams_tool_gmap/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/monitoring/summary.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_gmap/web/pages/monitoring/summary.jsp	14 Jul 2008 03:15:00 -0000	1.8
+++ lams_tool_gmap/web/pages/monitoring/summary.jsp	21 Jul 2008 06:02:25 -0000	1.9
@@ -2,13 +2,163 @@
 <c:set var="tool"><lams:WebAppURL /></c:set>
 <c:set var="dto" value="${gmapDTO}" />
 
-<table>
+<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">
+
+	<tr>
+		<td>
+			<fmt:message key="advanced.lockOnFinished" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${dto.lockOnFinish == 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="advanced.allowEditMarkers" />
+		</td>
+		<td>
+			<c:choose>
+				<c:when test="${dto.allowEditMarkers == 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="advanced.allowShowAllMarkers" />
+		</td>
+		<td>	
+			<c:choose>
+				<c:when test="${dto.allowShowAllMarkers == 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="advanced.markerLimitsMessage" />
+		</td>	
+		<td>
+			<c:choose>
+				<c:when test="${dto.limitMarkers == true}">
+					<fmt:message key="label.on" />, ${dto.maxMarkers}
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>
+		</td>
+	</tr>
+	 		
+	<tr>
+	 	<td>
+			<fmt:message key="advanced.allowZoom" />
+		</td>
+		<td>	
+			<c:choose>
+				<c:when test="${dto.allowZoom == 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="advanced.allowTerrain" />
+		</td>
+		<td>	
+			<c:choose>
+				<c:when test="${dto.allowTerrain == 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="advanced.allowSatellite" />
+		</td>
+		<td>	
+			<c:choose>
+				<c:when test="${dto.allowSatellite == 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="advanced.allowHybrid" />
+		</td>
+		<td>	
+			<c:choose>	
+				<c:when test="${dto.allowHybrid == true}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+</table>
+</div>
+
+
+<div id="groupsTable">
+<h1><fmt:message key="monitor.summary.title.groups"/></h1>
+
+<br />
+
+<table class="alternative-color">
 <tr>
 	<th>
-		<h1>Group:</h1>
+		<fmt:message key="heading.table.group" />
 	</th>
 	<th>
-		<h1><fmt:message key="heading.totalLearners" /></h1>
+		<fmt:message key="heading.totalLearners" />
 	</th>
 </tr>
 
@@ -26,10 +176,13 @@
 		</tr>
 </c:forEach>
 </table>	
-	
-	
+</div>
 
 
+<div id="gmapDiv">	
+<h1><fmt:message key="monitor.summary.title.map"/></h1>
+
+<br />
 <table>
 	<tr>
 		 <td>
@@ -54,9 +207,9 @@
 		<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
 </td></tr>
 </table>
-	
-	
-	
+
+</div>
+		
 <script type="text/javascript">
 <!--
 	initMonotorGmap();
@@ -97,5 +250,6 @@
 	
 //-->
 </script>
+<script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/monitorToolSummaryAdvanced.js" />