Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp
===================================================================
diff -u -rb6d9cc3b373ee8a9b7b9be20c821f337538beec4 -ra5066a096ea1309cc0e3e57ed9828818326ccb40
--- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision b6d9cc3b373ee8a9b7b9be20c821f337538beec4)
+++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision a5066a096ea1309cc0e3e57ed9828818326ccb40)
@@ -87,11 +87,13 @@
     marker.highlight = false;
     marker.removeLink = "<a href='javascript:removeMarker(" + markers.length + ")'><fmt:message key='button.remove'/></a>" ;
    	marker.editLink = "<a href='javascript:editMarker(" + markers.length + ")'><fmt:message key='button.edit'/></a>";
-   	marker.saveLink = "<a href='javascript:saveMarkerInfo(" + markers.length + ");'><fmt:message key='button.save'/></a>";
+   	marker.saveFuncStr = "saveMarkerInfo(" + markers.length + ");";
+   	marker.saveLink = "<a href='javascript:" +marker.saveFuncStr+ "'><fmt:message key='button.save'/></a>";
    	marker.cancelLink = "<a href='javascript:cancelEditMarkerInfo(" + markers.length + ")'><fmt:message key='button.cancel'/></a>";
     updateMarkerInfoWindowHtml(marker);
     markers[markers.length] = marker;
     
+    if (!isSaved) {openInfoWindow(markers.length - 1);}
 }
 
 function addUserToList(id, name)
@@ -313,7 +315,8 @@
 	if (markerIn.editingOn)
 	{
 		markerIn.linksBar = "<br/ >" + markerIn.saveLink + "&nbsp;" + markerIn.cancelLink;
-		markerIn.inputForm ="<fmt:message key='label.authoring.basic.title'/><br><input type='text' maxlength='50' size='50' id='markerTitle' name='markerTitle' value='" + markerIn.title +"' /><br>";
+		markerIn.inputForm ="<fmt:message key='label.authoring.basic.title'/>"
+		markerIn.inputForm += "<br><input type='text' onkeypress='javascript:if (event.keyCode==13){" +markerIn.saveFuncStr+ "}' maxlength='50' size='50' id='markerTitle' name='markerTitle' value='" + markerIn.title +"' /><br>";
 		markerIn.inputForm += "<fmt:message key='label.newInfoWindowText'/><br><textarea id='infoWindow' name='infoWindow' rows='5' cols='50'>" + markerIn.infoMessage + "</textarea>";
 		markerIn.markerMetaData = "<font size='tiny' color='grey'>";
 		markerIn.markerMetaData += '<nobr><fmt:message key="label.latitudeLongitude"/> (' + markerIn.getPoint().lat() + "-" + markerIn.getPoint().lng() +")</nobr>";