Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/conf/language/lams/ApplicationResources.properties,v diff -u -r1.34.2.2 -r1.34.2.3 --- lams_tool_gmap/conf/language/lams/ApplicationResources.properties 11 May 2016 07:14:33 -0000 1.34.2.2 +++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties 13 May 2016 02:39:11 -0000 1.34.2.3 @@ -109,6 +109,6 @@ button.placeMarker =Place marker label.nogroups =No groups found for activity. button.submit =Finish +label.show.on.map=Show on Map - #======= End labels: Exported 104 labels for en AU ===== Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/monitoring/advancedOptions.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/web/pages/monitoring/editActivity.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/monitoring/editActivity.jsp,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_gmap/web/pages/monitoring/editActivity.jsp 27 Mar 2014 18:22:21 -0000 1.2 +++ lams_tool_gmap/web/pages/monitoring/editActivity.jsp 13 May 2016 02:39:11 -0000 1.2.2.1 @@ -3,12 +3,12 @@ -

+ -

+
- +
@@ -29,15 +29,13 @@
-

- - - - - - - - -

+ + + + + + + + Index: lams_tool_gmap/web/pages/monitoring/monitoring.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/monitoring/monitoring.jsp,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_gmap/web/pages/monitoring/monitoring.jsp 17 Jan 2014 21:45:00 -0000 1.2 +++ lams_tool_gmap/web/pages/monitoring/monitoring.jsp 13 May 2016 02:39:11 -0000 1.2.2.1 @@ -1,20 +1,19 @@ <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.tool.gmap.util.GmapConstants"%> - + -
- + + + + + - - - -
- - + + + + + + + + Index: lams_tool_gmap/web/pages/monitoring/notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/monitoring/notebook.jsp,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_tool_gmap/web/pages/monitoring/notebook.jsp 26 Feb 2016 07:17:49 -0000 1.5.2.1 +++ lams_tool_gmap/web/pages/monitoring/notebook.jsp 13 May 2016 02:39:11 -0000 1.5.2.2 @@ -9,46 +9,20 @@
- <fmt:message>pageTitle.monitoring.notebook</fmt:message> - - - - - - + - -
- -

- pageTitle.monitoring.notebook -

- - - - - - - - -
-

- -

-
-

- -

-
- -
+ pageTitle.monitoring.notebook + +

+

+
Index: lams_tool_gmap/web/pages/monitoring/statistics.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/monitoring/statistics.jsp,v diff -u -r1.1 -r1.1.12.1 --- lams_tool_gmap/web/pages/monitoring/statistics.jsp 23 May 2008 06:29:10 -0000 1.1 +++ lams_tool_gmap/web/pages/monitoring/statistics.jsp 13 May 2016 02:39:11 -0000 1.1.12.1 @@ -1,34 +1,42 @@ <%@ include file="/common/taglibs.jsp"%> - + + + + + + + - - - - -
-

- ${session.sessionName} -

-
+
+
+ + ${session.sessionName} + +
- - - - - - - - - -
- heading.totalLearnersInGroup - - ${session.numberOfLearners} -
- heading.totalFinishedLearnersInGroup - - ${session.numberOfFinishedLearners} -
+
+ + + + + + + + + + +
+ heading.totalLearnersInGroup + + ${session.numberOfLearners} +
+ heading.totalFinishedLearnersInGroup + + ${session.numberOfFinishedLearners} +
+
+
+
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.24 -r1.24.2.1 --- lams_tool_gmap/web/pages/monitoring/summary.jsp 27 Mar 2014 18:22:21 -0000 1.24 +++ lams_tool_gmap/web/pages/monitoring/summary.jsp 13 May 2016 02:39:11 -0000 1.24.2.1 @@ -2,274 +2,58 @@ - -

- - - - - -

-
- - + + + + + + + - -
-

+

-
+ + - - - - - +
- -
- - - - - - - -
- - - -
- ${session.sessionName} - - ${session.numberOfLearners} -
-
+ + javascript:clearMap();addUsersForSession${session.sessionID}();addMarkersForSession${session.sessionID}(); +
- - - - - - - -
-

- -
- - - - - - - -
-
- +
- - - -
- - - -
- - -
-
- -
- - - -
- - - - - - +
+ +
-

- - ${session.sessionName} - - -

-
- - - +
@@ -283,20 +67,117 @@ - - +
+ +
+ + +
 
+
- + + + + + + +
+ + + + + + + + + + + + + + +
+ + + +
+ ${session.sessionName} + + ${session.numberOfLearners} + + Show On Map +
+
+
+
+ + + + + + + + + + + +
+

+ + +
+
+ + <%@ include file="../../common/mapLegend.jsp"%> + +
+
+
+
+
+
+
+
+ +
+
+ + + +
+
+ +
+
+ + + +
+
+ + + +
+
+
+
+ +
+
+<%@include file="advancedOptions.jsp"%>