Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r79cd2df21e3304cc7a57066e020308c37dd06f9b -r138aaf09fb352d1037a50a1cb02d7e6bcd0d178a --- lams_tool_gmap/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 79cd2df21e3304cc7a57066e020308c37dd06f9b) +++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 138aaf09fb352d1037a50a1cb02d7e6bcd0d178a) @@ -28,27 +28,27 @@ button.addMarker =Add Marker button.fitMarkers =Fit Markers button.go =Go! - label.createdBy =Created By: label.latitudeLongitude =Latitude-Longitude: label.newInfoWindowText =New Info Window Text: button.edit =Edit button.remove =Remove - label.learner.markerLimitReached =You have reached the marker limit, you cannot add any more. - advanced.editingOptions =Editing Options advanced.lockOnFinished =Lock when finished advanced.allowEditMarkers =Allow learners to edit their own saved markers advanced.allowShowAllMarkers =Allow learners to see markers from other learners advanced.limitMarkers =Marker Limits -advanced.markerLimitsMessage =Limit the number of markers +advanced.markerLimitsMessage =Limit the number of markers a learner can add advanced.mapOptions =Map Options advanced.allowZoom =Allow zoom control advanced.allowTerrain =Allow terrain map type advanced.allowSatellite =Allow satellite map type advanced.allowHybrid =Allow hybrid map type - +monitor.summary.title.advanced =Advanced +monitor.summary.title.groups =Groups +monitor.summary.title.map =Map +monitor.summary.th.advancedSettings =Advanced Settings instructions.onlineInstructions =Online Instructions: instructions.offlineInstructions =Offline Instructions: instructions.uploadOnlineInstr =Online Instructions File: @@ -80,13 +80,13 @@ titleHeading.editActivity =Edit Activity titleHeading.exportPortfolio =Export Portfolio heading.group =Group {0}: -heading.totalLearners =Number of Learners: +heading.totalLearners =Number of Learners +heading.table.group =Group heading.totalLearnersInGroup =Total Number of Learners in Group: heading.totalFinishedLearnersInGroup =Number of Finished Learners: label.view =View label.notAvailable =Not Available heading.learner =Learner - button.cancel =Cancel button.ok =OK button.done =Done @@ -97,14 +97,13 @@ label.created =Created label.lastModified =Last modified activity.helptext =Gmap for marking world map points - authoring.msg.cancel.save =Do you want to close this window without saving? button.try.again =Try Again button.finish =Next Activity - message.alertContentEdit =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information. error.cantLoadMap =Could not load map. error.gmapKeyMissing =LAMS does not have a Google Maps API key set up, please contact your system administrator. +label.on=On +label.off=Off - #======= End labels: Exported 76 labels for en AU ===== Index: lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r66fd0a0bbc39ea3aa52ec79313f68e10a7d3095f -r138aaf09fb352d1037a50a1cb02d7e6bcd0d178a --- lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 66fd0a0bbc39ea3aa52ec79313f68e10a7d3095f) +++ lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 138aaf09fb352d1037a50a1cb02d7e6bcd0d178a) @@ -28,27 +28,27 @@ button.addMarker =Add Marker button.fitMarkers =Fit Markers button.go =Go! - label.createdBy =Created By: label.latitudeLongitude =Latitude-Longitude: label.newInfoWindowText =New Info Window Text: button.edit =Edit button.remove =Remove - label.learner.markerLimitReached =You have reached the marker limit, you cannot add any more. - advanced.editingOptions =Editing Options advanced.lockOnFinished =Lock when finished advanced.allowEditMarkers =Allow learners to edit their own saved markers advanced.allowShowAllMarkers =Allow learners to see markers from other learners advanced.limitMarkers =Marker Limits -advanced.markerLimitsMessage =Limit the number of markers +advanced.markerLimitsMessage =Limit the number of markers a learner can add advanced.mapOptions =Map Options advanced.allowZoom =Allow zoom control advanced.allowTerrain =Allow terrain map type advanced.allowSatellite =Allow satellite map type advanced.allowHybrid =Allow hybrid map type - +monitor.summary.title.advanced =Advanced +monitor.summary.title.groups =Groups +monitor.summary.title.map =Map +monitor.summary.th.advancedSettings =Advanced Settings instructions.onlineInstructions =Online Instructions: instructions.offlineInstructions =Offline Instructions: instructions.uploadOnlineInstr =Online Instructions File: @@ -58,6 +58,11 @@ label.filename =Filename label.type =Type label.attachments =Attachments +label.authoring.authoredMarkers =Markers +label.legend.unsaved =Unsaved: +label.legend.saved =Saved: +label.legend.edited =Edited: +label.legend.userSelected =User Selected: link.view =View link.download =Download link.delete =Delete @@ -75,13 +80,13 @@ titleHeading.editActivity =Edit Activity titleHeading.exportPortfolio =Export Portfolio heading.group =Group {0}: -heading.totalLearners =Number of Learners: +heading.totalLearners =Number of Learners +heading.table.group =Group heading.totalLearnersInGroup =Total Number of Learners in Group: heading.totalFinishedLearnersInGroup =Number of Finished Learners: label.view =View label.notAvailable =Not Available heading.learner =Learner - button.cancel =Cancel button.ok =OK button.done =Done @@ -92,14 +97,13 @@ label.created =Created label.lastModified =Last modified activity.helptext =Gmap for marking world map points - authoring.msg.cancel.save =Do you want to close this window without saving? button.try.again =Try Again button.finish =Next Activity - message.alertContentEdit =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information. error.cantLoadMap =Could not load map. error.gmapKeyMissing =LAMS does not have a Google Maps API key set up, please contact your system administrator. +label.on=On +label.off=Off - #======= End labels: Exported 76 labels for en AU ===== Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp =================================================================== diff -u -rb80a1d684ec6d513cba2d5a9e90e1cca93b002d2 -r138aaf09fb352d1037a50a1cb02d7e6bcd0d178a --- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp (.../mapFunctions.jsp) (revision b80a1d684ec6d513cba2d5a9e90e1cca93b002d2) +++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp (.../mapFunctions.jsp) (revision 138aaf09fb352d1037a50a1cb02d7e6bcd0d178a) @@ -94,7 +94,6 @@ if (isSaved){marker.state = "unchanged";} else {marker.state="unsaved";} - //marker.sideBarLinkPrefix = "" ; marker.editLink = ""; @@ -168,12 +167,10 @@ { if (markers[i].createdById == selectedUser) { - //markers[i].setImage(YELLOW_MARKER_ICON); markers[i].highlight=true; } else { - //markers[i].setImage(BLUE_MARKER_ICON); markers[i].highlight=false; } updateMarkerInfoWindowHtml(markers[i]); @@ -183,9 +180,6 @@ function showSelectedMarkerSideBar(id) { - - //alert ("Marker to select: " +id+ "\nSelected marker: " + selectedMarker); - var selectedMarkerSpan = document.getElementById("markerSpan" + selectedMarker); var markerSpanToSelect = document.getElementById("markerSpan" + id); @@ -210,11 +204,9 @@ function refreshSideBar(groupName) { var sideBarText = ""; - var j; var i; - - //sideBarText += "View All
"; + sideBarText += "

" + groupName + "

"; for (j=0;j
- +
-

Group:

+ 		-

+