Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml
===================================================================
diff -u -r0ce24288a7982f962e62e74d254133cee8016f0a -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml	(.../GmapMarker.hbm.xml)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml	(.../GmapMarker.hbm.xml)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -47,6 +47,7 @@
             update="true"
             insert="true"
             column="info_window_message"
+            length="65535"
         />
 
         <property
@@ -92,8 +93,29 @@
             update="true"
             insert="true"
             column="title"
+            length="55"
         />
 
+        <many-to-one
+            name="createdBy"
+            class="org.lamsfoundation.lams.tool.gmap.model.GmapUser"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="created_by"
+        />
+
+        <many-to-one
+            name="updatedBy"
+            class="org.lamsfoundation.lams.tool.gmap.model.GmapUser"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="updated_by"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-GmapMarker.xml
Index: lams_tool_gmap/db/sql/create_lams_tool_gmap.sql
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/db/sql/create_lams_tool_gmap.sql	(.../create_lams_tool_gmap.sql)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/db/sql/create_lams_tool_gmap.sql	(.../create_lams_tool_gmap.sql)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -8,11 +8,13 @@
 drop table if exists tl_lagmap10_user;
 create table tl_lagmap10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, gmap_uid bigint, primary key (uid));
 create table tl_lagmap10_gmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, allow_edit_markers bit, show_all_markers bit, limit_markers bit, max_markers integer, allow_zoom bit, allow_terrain bit, allow_satellite bit, allow_hybrid bit, map_center_latitude double precision, map_center_longitude double precision, map_zoom integer, map_type varchar(20), primary key (uid));
-create table tl_lagmap10_marker (uid bigint not null auto_increment, longitude double precision, latitude double precision, info_window_message varchar(255), create_date datetime, update_date datetime, is_authored bit, gmap_uid bigint, title varchar(255), primary key (uid));
+create table tl_lagmap10_marker (uid bigint not null auto_increment, longitude double precision, latitude double precision, info_window_message text, create_date datetime, update_date datetime, is_authored bit, gmap_uid bigint, title varchar(55), created_by bigint, updated_by bigint, primary key (uid));
 create table tl_lagmap10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), gmap_uid bigint, primary key (uid));
 create table tl_lagmap10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, gmap_session_uid bigint, entry_uid bigint, primary key (uid));
 alter table tl_lagmap10_attachment add index FKBA2ECCB274028C80 (gmap_uid), add constraint FKBA2ECCB274028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid);
 alter table tl_lagmap10_marker add index FK10F2274974028C80 (gmap_uid), add constraint FK10F2274974028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid);
+alter table tl_lagmap10_marker add index FK10F22749EF5F6920 (updated_by), add constraint FK10F22749EF5F6920 foreign key (updated_by) references tl_lagmap10_user (uid);
+alter table tl_lagmap10_marker add index FK10F22749529F7FD3 (created_by), add constraint FK10F22749529F7FD3 foreign key (created_by) references tl_lagmap10_user (uid);
 alter table tl_lagmap10_session add index FK519D516774028C80 (gmap_uid), add constraint FK519D516774028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid);
 alter table tl_lagmap10_user add index FK7CB3F69AC5F056D9 (gmap_session_uid), add constraint FK7CB3F69AC5F056D9 foreign key (gmap_session_uid) references tl_lagmap10_session (uid);
 
Index: lams_tool_gmap/db/sql/table-schema.sql
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/db/sql/table-schema.sql	(.../table-schema.sql)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -1,5 +1,7 @@
 alter table tl_lagmap10_attachment drop foreign key FKBA2ECCB274028C80;
 alter table tl_lagmap10_marker drop foreign key FK10F2274974028C80;
+alter table tl_lagmap10_marker drop foreign key FK10F22749EF5F6920;
+alter table tl_lagmap10_marker drop foreign key FK10F22749529F7FD3;
 alter table tl_lagmap10_session drop foreign key FK519D516774028C80;
 alter table tl_lagmap10_user drop foreign key FK7CB3F69AC5F056D9;
 drop table if exists tl_lagmap10_attachment;
@@ -9,10 +11,12 @@
 drop table if exists tl_lagmap10_user;
 create table tl_lagmap10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, gmap_uid bigint, primary key (uid));
 create table tl_lagmap10_gmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, allow_edit_markers bit, show_all_markers bit, limit_markers bit, max_markers integer, allow_zoom bit, allow_terrain bit, allow_satellite bit, allow_hybrid bit, map_center_latitude double precision, map_center_longitude double precision, map_zoom integer, map_type varchar(20), primary key (uid));
-create table tl_lagmap10_marker (uid bigint not null auto_increment, longitude double precision, latitude double precision, info_window_message varchar(255), create_date datetime, update_date datetime, is_authored bit, gmap_uid bigint, title varchar(255), primary key (uid));
+create table tl_lagmap10_marker (uid bigint not null auto_increment, longitude double precision, latitude double precision, info_window_message text, create_date datetime, update_date datetime, is_authored bit, gmap_uid bigint, title varchar(55), created_by bigint, updated_by bigint, primary key (uid));
 create table tl_lagmap10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), gmap_uid bigint, primary key (uid));
 create table tl_lagmap10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, gmap_session_uid bigint, entry_uid bigint, primary key (uid));
 alter table tl_lagmap10_attachment add index FKBA2ECCB274028C80 (gmap_uid), add constraint FKBA2ECCB274028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid);
 alter table tl_lagmap10_marker add index FK10F2274974028C80 (gmap_uid), add constraint FK10F2274974028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid);
+alter table tl_lagmap10_marker add index FK10F22749EF5F6920 (updated_by), add constraint FK10F22749EF5F6920 foreign key (updated_by) references tl_lagmap10_user (uid);
+alter table tl_lagmap10_marker add index FK10F22749529F7FD3 (created_by), add constraint FK10F22749529F7FD3 foreign key (created_by) references tl_lagmap10_user (uid);
 alter table tl_lagmap10_session add index FK519D516774028C80 (gmap_uid), add constraint FK519D516774028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid);
 alter table tl_lagmap10_user add index FK7CB3F69AC5F056D9 (gmap_session_uid), add constraint FK7CB3F69AC5F056D9 foreign key (gmap_session_uid) references tl_lagmap10_session (uid);
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
===================================================================
diff -u -r97ded6a90b089fe5e01c48c02f952e8b09d5a911 -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	(.../GmapDTO.java)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	(.../GmapDTO.java)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -81,7 +81,7 @@
 	
 	public String mapType;
 	
-	public Set<GmapMarker> gmapMarkers;
+	public Set<GmapMarkerDTO> gmapMarkers = new TreeSet<GmapMarkerDTO>();
 	
 	public Set<GmapAttachmentDTO> onlineInstructionsFiles;
 
@@ -112,7 +112,6 @@
 		mapCenterLongitude = gmap.getMapCenterLongitude();		
 		mapZoom = gmap.getMapZoom();
 		mapType = gmap.getMapType();
-		gmapMarkers = gmap.getGmapMarkers();
 
 		onlineInstructionsFiles = new TreeSet<GmapAttachmentDTO>();
 		offlineInstructionsFiles = new TreeSet<GmapAttachmentDTO>();
@@ -135,10 +134,15 @@
 		
 		for (Iterator iter = gmap.getGmapSessions().iterator(); iter.hasNext();) {
 			GmapSession session = (GmapSession) iter.next();
-			GmapSessionDTO sessionDTO = new GmapSessionDTO(session);
-			
+			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 */
@@ -312,11 +316,11 @@
 		this.mapType = mapType;
 	}
 
-	public Set<GmapMarker> getGmapMarkers() {
+	public Set<GmapMarkerDTO> getGmapMarkers() {
 		return gmapMarkers;
 	}
 
-	public void setGmapMarkers(Set<GmapMarker> gmapMarkers) {
+	public void setGmapMarkers(Set<GmapMarkerDTO> gmapMarkers) {
 		this.gmapMarkers = gmapMarkers;
 	}
 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java
===================================================================
diff -u
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java	(revision 0)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -0,0 +1,110 @@
+package org.lamsfoundation.lams.tool.gmap.dto;
+
+import java.util.Date;
+import org.lamsfoundation.lams.tool.gmap.model.GmapMarker;
+import org.lamsfoundation.lams.tool.gmap.model.GmapUser;
+
+/**
+ * 
+ * @author lfoxton
+ *
+ */
+public class GmapMarkerDTO 
+{
+	public Long uid;		
+	public Double longitude;
+	public Double latitude;
+	public String infoWindowMessage;
+	public String title;
+	public Date created;
+	public Date updated;
+	public boolean isAuthored;
+	public GmapUserDTO createdBy;
+	public GmapUserDTO updatedBy;
+	
+	
+	public GmapUserDTO getCreatedBy() {
+		return createdBy;
+	}
+
+	public void setCreatedBy(GmapUserDTO createdBy) {
+		this.createdBy = createdBy;
+	}
+
+	public GmapUserDTO getUpdatedBy() {
+		return updatedBy;
+	}
+
+	public void setUpdatedBy(GmapUserDTO updatedBy) {
+		this.updatedBy = updatedBy;
+	}
+
+	public GmapMarkerDTO() {}
+	
+	public GmapMarkerDTO(GmapMarker marker)
+	{
+		this.uid = marker.getUid();
+		this.longitude = marker.getLongitude();
+		this.latitude = marker.getLatitude();
+		this.infoWindowMessage = marker.getInfoWindowMessage();
+		this.title = marker.getTitle();
+		this.created = marker.getCreated();
+		this.updated = marker.getUpdated();
+		this.isAuthored = marker.isAuthored();
+		this.createdBy = new GmapUserDTO(marker.getCreatedBy());
+		this.updatedBy = new GmapUserDTO(marker.getCreatedBy());
+	}
+
+	public Long getUid() {
+		return uid;
+	}
+	public void setUid(Long uid) {
+		this.uid = uid;
+	}
+	public Double getLongitude() {
+		return longitude;
+	}
+	public void setLongitude(Double longitude) {
+		this.longitude = longitude;
+	}
+	public Double getLatitude() {
+		return latitude;
+	}
+	public void setLatitude(Double latitude) {
+		this.latitude = latitude;
+	}
+	public String getInfoWindowMessage() {
+		return infoWindowMessage;
+	}
+	public void setInfoWindowMessage(String infoWindowMessage) {
+		this.infoWindowMessage = infoWindowMessage;
+	}
+	public String getTitle() {
+		return title;
+	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	public Date getCreated() {
+		return created;
+	}
+	public void setCreated(Date created) {
+		this.created = created;
+	}
+	public Date getUpdated() {
+		return updated;
+	}
+	public void setUpdated(Date updated) {
+		this.updated = updated;
+	}
+	public boolean isAuthored() {
+		return isAuthored;
+	}
+	public void setAuthored(boolean isAuthored) {
+		this.isAuthored = isAuthored;
+	}
+	public boolean getIsAuthored() {
+		return isAuthored;
+	}
+
+}
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
===================================================================
diff -u -r0ce24288a7982f962e62e74d254133cee8016f0a -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java	(.../GmapMarker.java)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java	(.../GmapMarker.java)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -40,78 +40,42 @@
 	private static final long serialVersionUID = 54263746982364732L;
 	
 	private static final Logger log = Logger.getLogger(GmapMarker.class);
-	
-	// Unique identifier
+
 	private Long uid;		
-	
-	// Longitude of marker position
 	private Double longitude;
-	
-	// Latitude of marker position
 	private Double latitude;
-	
-	// String address of marker if given
-	//private String address;
-	
-	// Marker colour, can be: ORANGE, PURPLE, YELLOW, GREEN, BLUE, RED, AQUA, WHITE, or GRAY
-	//private String colour;
-	
-	// A character that will display on the marker
-	//private char markerDisplayCharacter;
-	
-	// Info windo message that appears when you click the marker (in HTML)
 	private String infoWindowMessage;
-	
-	
-	// The marker title
 	private String title;
-	
-	
-	// Text that appears when the user mouseovers the marker
-	//private String mouseoverText;
-	
-	// The date the marker was created
 	private Date created;
-	
-	// The date the marker was updated
 	private Date updated;
-	
-	// True if it is an authored marker, false if it is a learner marker
 	private boolean isAuthored;
-	
-	// The gmap tool session if in learner, null if in author 
-	//private GmapSession toolSession;
-	
-	// The gmap instance that this marker is part of
 	private Gmap gmap;
-	//private Long gmapID;
-	
-	// The user who created the marker
-	//private GmapUser createBy;
-	
-	// The last user to modify the marker
-	//private GmapUser modifiedBy;
+	private GmapUser createdBy;
+	private GmapUser updatedBy;
 
-
 	/**
 	 * Generic POJO constructor
 	 */
 	public GmapMarker() {}
 
-
 	public GmapMarker(Long uid, Double longitude, Double latitude,
-			String infoWindowMessage, Date created, Date updated,
-			boolean isAuthored) {
+			String infoWindowMessage, String title, Date created, Date updated,
+			boolean isAuthored, Gmap gmap, GmapUser createdBy,
+			GmapUser updatedBy) {
 		super();
 		this.uid = uid;
 		this.longitude = longitude;
 		this.latitude = latitude;
 		this.infoWindowMessage = infoWindowMessage;
+		this.title = title;
 		this.created = created;
 		this.updated = updated;
 		this.isAuthored = isAuthored;
+		this.gmap = gmap;
+		this.createdBy = createdBy;
+		this.updatedBy = updatedBy;
 	}
-	
+
 	public Object clone() {
 		Object obj = null;
 		try {
@@ -124,11 +88,6 @@
 		return obj;
 	}
 
-
-
-
-
-
 	/**
 	 * 
 	 * @return
@@ -171,7 +130,7 @@
 	/**
 	 * 
 	 * @return
-	 * @hibernate.property column="info_window_message"
+	 * @hibernate.property column="info_window_message" length="65535"
 	 */
 	public String getInfoWindowMessage() {
 		return infoWindowMessage;
@@ -240,7 +199,7 @@
 	/**
 	 * 
 	 * @return
-	 * @hibernate.property column="title"
+	 * @hibernate.property column="title" length="55"
 	 */
 	public String getTitle() {
 		return title;
@@ -250,6 +209,39 @@
 	public void setTitle(String title) {
 		this.title = title;
 	}
+	
+	/**
+     * @return Returns the userid of the user who created the Forum.
+     *
+     * @hibernate.many-to-one
+     * 		column="created_by"
+     *  	cascade="none"
+     *
+     */
+	public GmapUser getCreatedBy() {
+		return createdBy;
+	}
 
+	public void setCreatedBy(GmapUser createdBy) {
+		this.createdBy = createdBy;
+	}
+	
+	/**
+     * @return Returns the userid of the user who created the Forum.
+     *
+     * @hibernate.many-to-one
+     * 		column="updated_by"
+     *  	cascade="none"
+     *
+     */
+	public GmapUser getUpdatedBy() {
+		return updatedBy;
+	}
 
+	public void setUpdatedBy(GmapUser updatedBy) {
+		this.updatedBy = updatedBy;
+	}
+
+
+
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java	(.../GmapConstants.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java	(.../GmapConstants.java)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -43,6 +43,8 @@
 	// Attribute names
 	public static final String ATTR_MESSAGE = "message";
 	public static final String ATTR_SESSION_MAP = "sessionMap";
+	public static final String ATTR_USER_DTO = "gmapUserDTO";
+	public static final String ATTR_USER = "gmapUser";
 	
 	// Parameter names
 	public static final String PARAM_PARENT_PAGE = "parentPage";
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -35,6 +35,7 @@
 import org.xml.sax.InputSource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
@@ -50,6 +51,7 @@
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.gmap.model.Gmap;
+import org.lamsfoundation.lams.tool.gmap.model.GmapUser;
 import org.lamsfoundation.lams.tool.gmap.model.GmapAttachment;
 import org.lamsfoundation.lams.tool.gmap.model.GmapMarker;
 import org.lamsfoundation.lams.tool.gmap.service.IGmapService;
@@ -61,6 +63,8 @@
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Node;
@@ -125,8 +129,7 @@
 		}
 
 		// retrieving Gmap with given toolContentID
-		Gmap gmap = gmapService
-				.getGmapByContentId(toolContentID);
+		Gmap gmap = gmapService.getGmapByContentId(toolContentID);
 		if (gmap == null) {
 			gmap = gmapService.copyDefaultContent(toolContentID);
 			gmap.setCreateDate(new Date());
@@ -142,6 +145,19 @@
 			gmapService.saveOrUpdateGmap(gmap);
 		}
 
+		GmapUser gmapUser = null;
+		HttpSession ss = SessionManager.getSession();
+		//get back login user DTO
+		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		gmapUser = gmapService.getUserByUID(new Long(user.getUserID().intValue()));
+		if(gmapUser == null){
+			gmapUser = new GmapUser(user,null);
+			gmapService.saveOrUpdateGmapUser(gmapUser);
+		}
+		request.setAttribute(GmapConstants.ATTR_USER, gmapUser);
+		
+
+		
 		// Set up the authForm.
 		AuthoringForm authForm = (AuthoringForm) form;
 		updateAuthForm(authForm, gmap);
@@ -174,7 +190,23 @@
 
 		// update gmap content using form inputs.
 		ToolAccessMode mode = (ToolAccessMode) map.get(KEY_MODE);
-		updateGmap(gmap, authForm, mode);
+		
+		String contentFolderID = (String) map.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
+		GmapUser gmapUser = null;
+		//check whether it is sysadmin:LDEV-906 
+		if(!StringUtils.equals(contentFolderID,"-1" )){
+			//try to get form system session
+			HttpSession ss = SessionManager.getSession();
+			//get back login user DTO
+			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+			gmapUser = gmapService.getUserByUID(new Long(user.getUserID().intValue()));
+			if(gmapUser == null){
+				gmapUser = new GmapUser(user,null);
+				gmapService.saveOrUpdateGmapUser(gmapUser);
+			}
+		}	
+		
+		updateGmap(gmap, authForm, mode, gmapUser);
 
 		// remove attachments marked for deletion.
 		Set<GmapAttachment> attachments = gmap.getGmapAttachments();
@@ -386,12 +418,12 @@
 	 * @param mode
 	 * @return
 	 */
-	private void updateGmap(Gmap gmap, AuthoringForm authForm, ToolAccessMode mode)
+	private void updateGmap(Gmap gmap, AuthoringForm authForm, ToolAccessMode mode, GmapUser guser)
 	{
 		gmap.setTitle(authForm.getTitle());
 		gmap.setInstructions(authForm.getInstructions());
 		
-		updateMarkerListFromXML(authForm.getMarkersXML(), gmap);
+		updateMarkerListFromXML(authForm.getMarkersXML(), gmap, guser);
 		
 		if (mode.isAuthor()) { // Teacher cannot modify following
 			gmap.setOfflineInstructions(authForm.getOnlineInstruction());
@@ -412,7 +444,7 @@
 		}
 	}
 	
-	private void updateMarkerListFromXML(String markerXML, Gmap gmap)
+	private void updateMarkerListFromXML(String markerXML, Gmap gmap, GmapUser guser)
 	{
 		//Set<GmapMarker> newMarkers = new HashSet<GmapMarker>();
 		Set<GmapMarker> existingMarkers = gmap.getGmapMarkers();
@@ -445,7 +477,8 @@
 					marker.setCreated(new Date());
 					marker.setUpdated(new Date());
 					marker.setAuthored(true);
-					//gmap.addMarker(marker);
+					marker.setCreatedBy(guser);
+					marker.setUpdatedBy(guser);
 					gmapService.saveOrUpdateGmapMarker(marker);
 					
 				}
@@ -459,15 +492,13 @@
 					marker.setLongitude(longitude);
 					marker.setGmap(gmap);
 					marker.setUpdated(new Date());
+					marker.setUpdatedBy(guser);
 					marker.setAuthored(true);
 					gmapService.saveOrUpdateGmapMarker(marker);
-					//gmap.updateMarker(marker, uid);
 				}
 				else if (markerState.equals("remove"))
 				{
 					gmap.removeMarker(uid);
-					//GmapMarker marker = gmap.getMarkerByUid(uid);
-					//gmapService.deleteGmapMarker(marker);
 				}
 			}
 		}
@@ -485,7 +516,10 @@
 	 * @param authForm
 	 * @return
 	 */
-	private void updateAuthForm(AuthoringForm authForm, Gmap gmap) {
+	private void updateAuthForm(AuthoringForm authForm, Gmap gmap) 
+	{
+		// #################################### TODO: Fix this by setting a gmap in the authform
+		
 		authForm.setTitle(gmap.getTitle());
 		authForm.setInstructions(gmap.getInstructions());
 		authForm.setOnlineInstruction(gmap.getOnlineInstructions());
@@ -523,9 +557,7 @@
 		map.put(KEY_ONLINE_FILES, new LinkedList<GmapAttachment>());
 		map.put(KEY_OFFLINE_FILES, new LinkedList<GmapAttachment>());
 		map.put(KEY_UNSAVED_ONLINE_FILES, new LinkedList<GmapAttachment>());
-		map
-				.put(KEY_UNSAVED_OFFLINE_FILES,
-						new LinkedList<GmapAttachment>());
+		map.put(KEY_UNSAVED_OFFLINE_FILES,new LinkedList<GmapAttachment>());
 		map.put(KEY_DELETED_FILES, new LinkedList<GmapAttachment>());
 
 		Iterator iter = gmap.getGmapAttachments().iterator();
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
===================================================================
diff -u -r97ded6a90b089fe5e01c48c02f952e8b09d5a911 -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -40,6 +40,7 @@
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.gmap.dto.GmapDTO;
+import org.lamsfoundation.lams.tool.gmap.dto.GmapUserDTO;
 import org.lamsfoundation.lams.tool.gmap.model.Gmap;
 import org.lamsfoundation.lams.tool.gmap.model.GmapSession;
 import org.lamsfoundation.lams.tool.gmap.model.GmapUser;
@@ -80,29 +81,26 @@
 
 		// 'toolSessionID' and 'mode' paramters are expected to be present.
 		// TODO need to catch exceptions and handle errors.
-		ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,
-				AttributeNames.PARAM_MODE, MODE_OPTIONAL);
+		ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, MODE_OPTIONAL);
 
-		Long toolSessionID = WebUtil.readLongParam(request,
-				AttributeNames.PARAM_TOOL_SESSION_ID);
+		Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 
 		// set up gmapService
 		if (gmapService == null) {
-			gmapService = GmapServiceProxy.getGmapService(this
-					.getServlet().getServletContext());
+			gmapService = GmapServiceProxy.getGmapService(this.getServlet().getServletContext());
 		}
 
 		// Retrieve the session and content.
-		GmapSession gmapSession = gmapService
-				.getSessionBySessionId(toolSessionID);
+		GmapSession gmapSession = gmapService.getSessionBySessionId(toolSessionID);
 		if (gmapSession == null) {
-			throw new GmapException(
-					"Cannot retreive session with toolSessionID"
-							+ toolSessionID);
+			throw new GmapException("Cannot retreive session with toolSessionID"+ toolSessionID);
 		}
 
 		Gmap gmap = gmapSession.getGmap();
-
+		if (gmap.getTitle() == null) {
+			throw new GmapException("Cannot retreive gmap with toolSessionID"+ toolSessionID);
+		}
+		
 		// check defineLater
 		if (gmap.isDefineLater()) {
 			return mapping.findForward("defineLater");
@@ -117,8 +115,6 @@
 		//gmapDTO.instructions = gmap.getInstructions();
 		//gmapDTO.allowRichEditor = gmap.isAllowRichEditor();
 		GmapDTO gmapDTO = new GmapDTO(gmap);
-		
-		
 		request.setAttribute("gmapDTO", gmapDTO);
 
 		// Set the content in use flag.
@@ -139,8 +135,10 @@
 		} else {
 			gmapUser = getCurrentUser(toolSessionID);
 		}
+		GmapUserDTO gmapUserDTO = new GmapUserDTO(gmapUser);
+		request.setAttribute(GmapConstants.ATTR_USER_DTO, gmapUserDTO);
 		
-		// get any existing gmap entry
+		// get any existing Notebook entry
 		NotebookEntry nbEntry = null;
 		if ( gmapUser != null ) {
 			nbEntry = gmapService.getEntry(gmapUser.getEntryUID());
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -68,9 +68,12 @@
        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
 	}
     function doSubmit_Form_Only() {
-    	serialiseMarkers();
-    	saveMapState();
-    	document.getElementById("${formID}").submit();
+    	var save = serialiseMarkers();
+    	if (save)
+    	{
+    		saveMapState();
+    		document.getElementById("${formID}").submit();
+    	}
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
Index: lams_tool_gmap/web/common/learnerheader.jsp
===================================================================
diff -u -r97ded6a90b089fe5e01c48c02f952e8b09d5a911 -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
+++ lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
 	
 	<script type="text/javascript" src="${tool}includes/javascript/mapFunctions.js"></script>
+	<script type="text/javascript" src="${tool}includes/javascript/mapFunctionsLearning.js"></script>
 
 	<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAvPAE96y1iioFQOnrP1RCBxS3S_A0Q4kgEfsHF6TMv6-oezFszBTPVN72_75MGlxr3nP_6ixxWd30jw" type="text/javascript"></script>
 	<script type="text/javascript">
@@ -32,6 +33,11 @@
 		var map;
 		var markers;
 		var geocoder = null;
+		var currUser;
+		var userMarkerCount =0;
+		var limitMarkers = ${gmapDTO.limitMarkers};
+		var markerLimit = 0;
+		var markerLimit = ${gmapDTO.maxMarkers};
 		function initLearnerGmap()
 		{
 			if (GBrowserIsCompatible()) 
@@ -45,6 +51,8 @@
 				map.setCenter(new GLatLng('${gmapDTO.mapCenterLatitude}', '${gmapDTO.mapCenterLongitude}' ));
 				map.setZoom(${gmapDTO.mapZoom});
 
+				currUser = '${gmapUserDTO.firstName} ${gmapUserDTO.lastName}';
+
 				if (${gmapDTO.allowEditMarkers})
 				{
 				
@@ -54,22 +62,26 @@
 				map.addControl(new GMapTypeControl());
 				if (${gmapDTO.allowZoom}) {map.addControl(new GLargeMapControl());}
 				if (${gmapDTO.allowTerrain}) {map.addMapType(G_PHYSICAL_MAP);}
-				if (${gmapDTO.allowSatellite}) {map.removeMapType(G_SATELLITE_MAP);}
-				if (${gmapDTO.allowHybrid}) {map.removeMapType(G_HYBRID_MAP);}
+				if (!${gmapDTO.allowSatellite}) {map.removeMapType(G_SATELLITE_MAP);}
+				if (!${gmapDTO.allowHybrid}) {map.removeMapType(G_HYBRID_MAP);}
 				map.setMapType(${gmapDTO.mapType});
 		    	
 		    	<c:forEach var="marker" items="${gmapDTO.gmapMarkers}">
-					
-					addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true);
-					
-					if (${gmapDTO.allowEditMarkers}){}
-					
-					if (${gmapDTO.allowShowAllMarkers}){}
+					if (${marker.isAuthored})
+					{
+						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' );
+					}
+					else if ("${marker.createdBy.loginName}" == "${gmapUserDTO.loginName}" && !${marker.isAuthored})
+					{
+						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' );
+						userMarkerCount ++;
+					}
+					else if (${gmapDTO.allowShowAllMarkers})
+					{
+						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' );
+					}
 				</c:forEach>
-				
-				
-				var limitMarkers = ${gmapDTO.limitMarkers};
-				var markerLimit = markers.length + ${gmapDTO.maxMarkers};
+
 		    }
 		}
 	//-->
Index: lams_tool_gmap/web/includes/javascript/authoring.js
===================================================================
diff -u -r97ded6a90b089fe5e01c48c02f952e8b09d5a911 -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
+++ lams_tool_gmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -3,6 +3,7 @@
 var map;
 var markers;
 var geocoder = null;
+var currUser;
 function init() {
 	// open the current tab    
 	var tag = document.getElementById("currentTab");
Index: lams_tool_gmap/web/includes/javascript/mapFunctions.js
===================================================================
diff -u -r97ded6a90b089fe5e01c48c02f952e8b09d5a911 -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/web/includes/javascript/mapFunctions.js	(.../mapFunctions.js)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
+++ lams_tool_gmap/web/includes/javascript/mapFunctions.js	(.../mapFunctions.js)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -1,9 +1,15 @@
-
 // add a marker at the given point
-function addMarker(point, infoMessage, title, uid, isSaved)
+function addMarker(point, infoMessage, title, uid, isSaved, editAble, createdBy)
 {
 	map.closeInfoWindow();
-	var marker = new GMarker(point, {draggable: true})
+	var marker;
+	
+	if(editAble) 	{marker = new GMarker(point, {draggable: true});}
+	else 			{marker = new GMarker(point, {draggable: false})};
+	
+	marker.editAble = editAble;
+	marker.createdBy = createdBy;
+	
     map.addOverlay(marker);
     
     GEvent.addListener(marker, "dragstart", function() {
@@ -12,7 +18,6 @@
 
     GEvent.addListener(marker, "dragend", function() {
 		if (marker.state == "unchanged") {marker.state = "update";}
-		//serialiseMarkers();
 		updateMarkerInfoWindowHtml(marker);	
     });
     
@@ -32,37 +37,27 @@
     {
     	marker.infoMessage = "";
     }
-    
-    //marker.title = "Marker #" + markers.length;
     marker.title = title;
+
     
-    //sideBar(marker.infoMessage, markers.length);
-    
-    
     // set the state of the marker
     marker.editingOn = !isSaved;
     marker.uid = uid;
     if (isSaved){marker.state = "unchanged";}
     else {marker.state="unsaved";}
     
-	marker.sideBarLinkPrefix = "<span class='sidebar'><a href='javascript:GEvent.trigger(markers["+markers.length+"],\"click\")'>";
+	marker.sideBarLinkPrefix = "<span class='sidebar'><a href='javascript:GEvent.trigger(markers["+markers.length+"],\"click\")'";
     marker.removeLink = "<a href='javascript:removeMarker(" + markers.length + ")'>Remove</a>" ;
    	marker.editLink = "<a href='javascript:editMarker(" + markers.length + ")'>Edit</a>";
-   	marker.saveLink = "<a href='javascript:saveMarkerInfo(" + markers.length + "); openInfoWindow("+ markers.length +");'>Save</a>";
+   	marker.saveLink = "<a href='javascript:saveMarkerInfo(" + markers.length + ");'>Save</a>";
    	marker.cancelLink = "<a href='javascript:cancelEditMarkerInfo(" + markers.length + ")'>Cancel</a>";
     updateMarkerInfoWindowHtml(marker);
     markers[markers.length] = marker;
     
 }
 
-// Add a new marker to the center of the map
-function addMarkerToCenter()
-{
-	var bounds = map.getBounds();
-	var point = bounds.getCenter();
-	addMarker(point, "", "", -1, false);
-}
 
+
 function refreshSideBar()
 {
 	var sideBarText = "";
@@ -71,39 +66,12 @@
 	{
 		if (markers[i].state != "remove")
 		{
-			sideBarText += markers[i].sideBarLinkPrefix + markers[i].title+"</a></span><br />";
+			sideBarText += markers[i].sideBarLinkPrefix + " title='" + markers[i].createdBy + "' >" + markers[i].title+"</a></span><br />";
 		}
 	}
 	document.getElementById("sidebar").innerHTML = sideBarText;
 }
 
-
-function test()
-{
-	serialiseMarkers();
-	alert(document.authoringForm.markersXML.value);
-}
-
-function removeMarker(x)
-{
-	var ans = confirm(confirmDelete);
-	if (ans)
-	{
-		try{map.removeOverlay(markers[x]);}
-		catch (e){}
-		markers[x].state = "remove";
-		refreshSideBar();
-		//serialiseMarkers();
-	}
-}
-
-function editMarker(x)
-{
-	markers[x].editingOn = true;
-	updateMarkerInfoWindowHtml(markers[x]);
-	openInfoWindow(x);
-}	
-
 function cancelEditMarkerInfo(x)
 {
 	if (markers[x].state == "unsaved")
@@ -118,52 +86,6 @@
 	}
 }
 
-function updateMarkerInfoWindowHtml(markerIn)
-{
-	markerIn.locationMessage = "<font size='small'><i>";
-	markerIn.locationMessage += "Latitude: " + markerIn.getPoint().lat() + "<br />";
-	markerIn.locationMessage += "Longitude: " + markerIn.getPoint().lng() + "<br /><br />";
-	markerIn.locationMessage += "</i></font>";
-	markerIn.infoWindowHtml = markerIn.locationMessage;
-	
-	if (markerIn.state == "unchanged")
-	{
-		markerIn.setImage(webAppUrl + "/images/blue_Marker.png");
-	}
-	else if (markerIn.state == "update" || markerIn.state == "save")
-	{
-		markerIn.setImage(webAppUrl + "/images/paleblue_Marker.png");
-	}
-	else if (markerIn.state == "unsaved")
-	{
-		markerIn.setImage(webAppUrl + "/images/red_Marker.png");
-	}
-	
-	if (markerIn.editingOn)
-	{
-		markerIn.linksBar = "<br/ >" + markerIn.saveLink + "&nbsp;" + markerIn.cancelLink;
-		
-		//markerIn.inputForm = "New Info Window Text: <br>";
-		//markerIn.inputForm += "<lams:FCKEditor id='infoWindow'";
-		//markerIn.inputForm += "value='"+markerIn.infoMessage+"'";
-		//markerIn.inputForm += "contentFolderID='${sessionMap.contentFolderID}'>";
-		//markerIn.inputForm += "</lams:FCKEditor>";
-		
-		//markerIn.titleInput = "Title:<br><textarea id='markerTitle' name='markerTitle' value='" + markerIn.title +"' /><br>";
-		//markerIn.infoWindowTextarea = "New Info Window Text:<br><textarea id='infoWindow' name='infoWindow' rows='5' cols='50'>" + markerIn.infoMessage + "</textarea>";
-		markerIn.inputForm = "Title:<br><input tupe='text' id='markerTitle' name='markerTitle' value='" + markerIn.title +"' /><br>";
-		markerIn.inputForm += "New Info Window Text:<br><textarea id='infoWindow' name='infoWindow' rows='5' cols='50'>" + markerIn.infoMessage + "</textarea>";
-		//markerIn.inputForm = "" + markerIn.infoWindowTextarea;
-		markerIn.infoWindowHtml += markerIn.inputForm + markerIn.linksBar;
-	}
-	else
-	{
-		markerIn.linksBar = "<br/ >" + markerIn.removeLink + "&nbsp;" + markerIn.editLink;
-		markerIn.inputForm = "";
-		markerIn.infoWindowHtml += markerIn.infoMessage + "<br />" + markerIn.inputForm + markerIn.linksBar;
-	}	
-}
-
 function openInfoWindow(x)
 {
 	markers[x].openInfoWindowHtml(markers[x].infoWindowHtml);
@@ -196,150 +118,71 @@
 
 function fitMapMarkers() 
 {
-   var bounds = new GLatLngBounds();
-   for (var i=0; i< markers.length; i++) {
-      bounds.extend(markers[i].getPoint());
-   }
-   map.setZoom(map.getBoundsZoomLevel(bounds));
-   //map.setCenter(bounds.getCenter());
-   map.panTo(bounds.getCenter());
-   
-}
-
-function saveMarkerInfo(x)
-{
-	if (markers[x] != null)
+   	var bounds = new GLatLngBounds();
+	for (var i=0; i< markers.length; i++) 
 	{
-		var title= trim(document.getElementById("markerTitle").value);
-		if (title==null || title == "")
+		if (markers[i].state != "remove")
 		{
-			alert(errorMissingTitle);
-			return false;
+			bounds.extend(markers[i].getPoint());	
 		}
-		else
-		{		
-			
-			var info=document.getElementById("infoWindow").value;
-			markers[x].title = title;
-			markers[x].infoMessage = info;
-			markers[x].editingOn = false;
-			
-			// change the state to update if it is a pre-existing marker
-			if (markers[x].state == "unchanged") {markers[x].state = "update";}
-			else (markers[x].state ="save");
-			
-			//markers[x].isSaved = persistMarker(markers[x], "createMarker");
-			updateMarkerInfoWindowHtml(markers[x]);
-			refreshSideBar();
-		}
 	}
+   	var zoom = map.getBoundsZoomLevel(bounds) - 1;
+   	if (zoom > 15) {zoom = 15;}
+   	map.setZoom(zoom);
+   	map.panTo(bounds.getCenter());
+   
 }
 
 function trim(x)
 {
 	return x.replace(/^\s+|\s+$/g, '')
 }
 
-/*
-function getAjaxObject()
+function updateMarkerInfoWindowHtml(markerIn)
 {
-	var req=null;
-	if ( window.XMLHttpRequest ) {req = new XMLHttpRequest();} 
-	else {req = new ActiveXObject("MSXML2.XMLHTTP");} 
-	return req;	
-}
-*/
-
-/*
-function persistMarker(marker, method)
-{
-	var ajax = getAjaxObject();
-	var result = null;
-	ajax.onreadystatechange = function() 
-	{ 
-	    if(ajax.readyState == 4) 
-	    {
-	    	result = ajax.responseText;
-	    }
+	if (markerIn.state == "unchanged")
+	{
+		markerIn.setImage(webAppUrl + "/images/blue_Marker.png");
 	}
-	
- 	var url = webAppUrl + "/marker.do?" +
- 		"&method="  + method +
- 		"&toolContentID=" + toolContentID + 
- 		"&latitude=" + marker.getPoint().lat() +
- 		"&longitude=" + marker.getPoint().lng() +
- 		"&infoMessage=" + marker.infoMessage;
- 		
- 	try
- 	{
-		ajax.open("GET",url,false);
-		ajax.send(null);
-	
-		if (result=="success")
-		{
-			alert("yay!");
-			return true;
-		}
-		else
-		{
-			//TODO: handle marker save failure
-			alert("boo!");
-			return false;
-		}
+	else if (markerIn.state == "update" || markerIn.state == "save")
+	{
+		markerIn.setImage(webAppUrl + "/images/paleblue_Marker.png");
 	}
-	catch(e)
+	else if (markerIn.state == "unsaved")
 	{
-		return e;
-		//alert("An error occurred: " + e);
+		markerIn.setImage(webAppUrl + "/images/red_Marker.png");
 	}
-}*/	
-
-
-function serialiseMarkers()
-{
-	var xmlString = '<?xml version="1.0"?><markers>';
-	var i =0;
 	
-	for (;i<markers.length;i++)
+	if (markerIn.editingOn)
 	{
-		if (markers[i].state != "unchanged" && markers[i].state !="unsaved")
-		{
-			var markerString = '<marker'+
-			' latitude="'+ markers[i].getPoint().lat()+ '"'+
-			' longitude="'+ markers[i].getPoint().lng()+ '"'+
-			' infoMessage="'+ escape(markers[i].infoMessage)+ '"' +
-			' markerUID="'+ markers[i].uid + '"' +
-			' title="'+ markers[i].title + '"' +
-			' state="'+ markers[i].state + '"' +
-			' />';
-			xmlString += markerString;
-		}	
+		markerIn.linksBar = "<br/ >" + markerIn.saveLink + "&nbsp;" + markerIn.cancelLink;
+		markerIn.inputForm = "Title:<br><input tupe='text' maxlength='50' size='50' id='markerTitle' name='markerTitle' value='" + markerIn.title +"' /><br>";
+		markerIn.inputForm += "New Info Window Text:<br><textarea wrap='hard' id='infoWindow' name='infoWindow' rows='5' cols='50'>" + markerIn.infoMessage + "</textarea>";
+		markerIn.markerMetaData = "<font size='tiny' color='grey'>";
+		markerIn.markerMetaData += "<nobr>Latitude-Longitude: (" + markerIn.getPoint().lat() + "-" + markerIn.getPoint().lng() +")</nobr>";
+		markerIn.markerMetaData += "</font>";
+		markerIn.infoWindowHtml =  markerIn.inputForm + "<br />" +markerIn.markerMetaData + markerIn.linksBar;
 	}
-	xmlString += "</markers>"
-	//document.authoringForm.markersXML.value=xmlString;
-	document.getElementById("markersXML").value=xmlString;
+	else
+	{
+		markerIn.linksBar = ""
+		if (markerIn.editAble)
+		{
+			markerIn.linksBar = "<br/ >" + markerIn.removeLink + "&nbsp;" + markerIn.editLink;
+		}
+		markerIn.markerMetaData = "<font size='tiny' color='grey'>";
+		markerIn.markerMetaData += "Created By: " + markerIn.createdBy + "<br />";
+		markerIn.markerMetaData += "<nobr>Latitude-Longitude: (" + markerIn.getPoint().lat() + "-" + markerIn.getPoint().lng() +")</nobr>";
+		markerIn.markerMetaData += "</font>";
+		markerIn.infoWindowHtml = "" + "<h4>" + markerIn.title + "</h4><div style='overflow:auto;width:400px;height:80px'>" +  markerIn.infoMessage.replace(/\n/g, "<br />") + "</div>"+ markerIn.markerMetaData  + markerIn.linksBar;
+	}	
 }
 
-// TODO: This method should only be included for the authoring pages, put them in another file
-function saveMapState()
-{
-	document.getElementById("mapZoom").value=map.getZoom();
-	document.getElementById("mapCenterLatitude").value=map.getCenter().lat();
-	document.getElementById("mapCenterLongitude").value=map.getCenter().lng();
-	var mapTypeName = map.getCurrentMapType().getName();
-	var mapType = "";	
-	if 		(mapTypeName == "Satellite"){ mapType = "G_SATELLITE_MAP"; }
-	else if (mapTypeName == "Hybrid")	{ mapType = "G_HYBRID_MAP"; }
-	else if (mapTypeName == "Terrain") 	{ mapType = "G_PHYSICAL_MAP"; }
-	else 								{ mapType = "G_NORMAL_MAP"; }
-	document.getElementById("mapType").value=mapType;
-}
 
 
 
 
 
 
 
-
 	
\ No newline at end of file
Index: lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js
===================================================================
diff -u
--- lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js	(revision 0)
+++ lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -0,0 +1,114 @@
+// Add a new marker to the center of the map
+function addMarkerToCenter()
+{
+	var bounds = map.getBounds();
+	var point = bounds.getCenter();
+	addMarker(point, "", "", -1, false, true, currUser);
+}
+
+
+function test()
+{
+	serialiseMarkers();
+	alert(document.authoringForm.markersXML.value);
+}
+
+function removeMarker(x)
+{
+	var ans = confirm(confirmDelete);
+	if (ans)
+	{
+		try{map.removeOverlay(markers[x]);}
+		catch (e){}
+		markers[x].state = "remove";
+		refreshSideBar();
+		//serialiseMarkers();
+	}
+}
+
+function editMarker(x)
+{
+	markers[x].editingOn = true;
+	updateMarkerInfoWindowHtml(markers[x]);
+	openInfoWindow(x);
+}
+
+function saveMarkerInfo(x)
+{
+	if (markers[x] != null)
+	{
+		var title= trim(document.getElementById("markerTitle").value);
+		if (title==null || title == "")
+		{
+			alert(errorMissingTitle);
+		}
+		else
+		{		
+			
+			var info=document.getElementById("infoWindow").value;
+			markers[x].title = title;
+			markers[x].infoMessage = info;
+			markers[x].editingOn = false;
+			
+			// change the state to update if it is a pre-existing marker
+			if (markers[x].state == "unchanged") {markers[x].state = "update";}
+			else (markers[x].state ="save");
+			
+			updateMarkerInfoWindowHtml(markers[x]);
+			refreshSideBar();
+			openInfoWindow(x);
+		}
+	}
+}
+
+
+
+
+function serialiseMarkers()
+{
+	var xmlString = '<?xml version="1.0"?><markers>';
+	var i =0;
+	
+	for (;i<markers.length;i++)
+	{
+		if (markers[i].state == "unchanged")
+		{
+			var ans = confirm("You have unsaved markers, do you wish to continue?");
+			if (!ans)
+			{
+				return false;
+			}
+		}
+		if (markers[i].state != "unchanged" && markers[i].state !="unsaved")
+		{
+			var markerString = '<marker'+
+			' latitude="'+ markers[i].getPoint().lat()+ '"'+
+			' longitude="'+ markers[i].getPoint().lng()+ '"'+
+			' infoMessage="'+ escape(markers[i].infoMessage)+ '"' +
+			' markerUID="'+ markers[i].uid + '"' +
+			' title="'+ markers[i].title + '"' +
+			' state="'+ markers[i].state + '"' +
+			' />';
+			xmlString += markerString;
+		}	
+	}
+	xmlString += "</markers>"
+	//document.authoringForm.markersXML.value=xmlString;
+	document.getElementById("markersXML").value=xmlString;
+	return true;
+}
+
+// TODO: This method should only be included for the authoring pages, put them in another file
+function saveMapState()
+{
+	document.getElementById("mapZoom").value=map.getZoom();
+	document.getElementById("mapCenterLatitude").value=map.getCenter().lat();
+	document.getElementById("mapCenterLongitude").value=map.getCenter().lng();
+	var mapTypeName = map.getCurrentMapType().getName();
+	var mapType = "";	
+	if 		(mapTypeName == "Satellite"){ mapType = "G_SATELLITE_MAP"; }
+	else if (mapTypeName == "Hybrid")	{ mapType = "G_HYBRID_MAP"; }
+	else if (mapTypeName == "Terrain") 	{ mapType = "G_PHYSICAL_MAP"; }
+	else 								{ mapType = "G_NORMAL_MAP"; }
+	document.getElementById("mapType").value=mapType;
+}
\ No newline at end of file
Index: lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js
===================================================================
diff -u
--- lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js	(revision 0)
+++ lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -0,0 +1,92 @@
+// Add a new marker to the center of the map
+function addMarkerToCenter()
+{
+	if (limitMarkers)
+	{
+		if (userMarkerCount == markerLimit)
+		{
+			alert("You have reached the marker limit, you cannot add any more");
+			return;
+		}
+	}
+	var bounds = map.getBounds();
+	var point = bounds.getCenter();
+	addMarker(point, "", "", -1, false, true, currUser);
+	userMarkerCount ++;
+}
+
+function removeMarker(x)
+{
+	var ans = confirm(confirmDelete);
+	if (ans)
+	{
+		try{map.removeOverlay(markers[x]);}
+		catch (e){}
+		markers[x].state = "remove";
+		refreshSideBar();
+		userMarkerCount --;
+		//serialiseMarkers();
+	}
+}
+
+function editMarker(x)
+{
+	markers[x].editingOn = true;
+	updateMarkerInfoWindowHtml(markers[x]);
+	openInfoWindow(x);
+}
+
+function saveMarkerInfo(x)
+{
+	if (markers[x] != null)
+	{
+		var title= trim(document.getElementById("markerTitle").value);
+		if (title==null || title == "")
+		{
+			alert(errorMissingTitle);
+			return false;
+		}
+		else
+		{		
+			
+			var info=document.getElementById("infoWindow").value;
+			markers[x].title = title;
+			markers[x].infoMessage = info;
+			markers[x].editingOn = false;
+			
+			// change the state to update if it is a pre-existing marker
+			if (markers[x].state == "unchanged") {markers[x].state = "update";}
+			else (markers[x].state ="save");
+			
+			updateMarkerInfoWindowHtml(markers[x]);
+			refreshSideBar();
+			openInfoWindow(x);
+		}
+	}
+}
+
+
+function serialiseMarkers()
+{
+	var xmlString = '<?xml version="1.0"?><markers>';
+	var i =0;
+	
+	for (;i<markers.length;i++)
+	{
+		if (markers[i].state != "unchanged" && markers[i].state !="unsaved")
+		{
+			var markerString = '<marker'+
+			' latitude="'+ markers[i].getPoint().lat()+ '"'+
+			' longitude="'+ markers[i].getPoint().lng()+ '"'+
+			' infoMessage="'+ escape(markers[i].infoMessage)+ '"' +
+			' markerUID="'+ markers[i].uid + '"' +
+			' title="'+ markers[i].title + '"' +
+			' state="'+ markers[i].state + '"' +
+			' />';
+			xmlString += markerString;
+		}	
+	}
+	xmlString += "</markers>"
+	document.getElementById("markersXML").value=xmlString;
+}
+
Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
diff -u -r97ded6a90b089fe5e01c48c02f952e8b09d5a911 -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -60,6 +60,7 @@
 <script type="text/javascript">
 <!--
 	initGmap();
+	currUser = '${gmapUser.firstName} ${gmapUser.lastName}';
 	map.setCenter(new GLatLng('${formBean.gmap.mapCenterLatitude}', '${formBean.gmap.mapCenterLongitude}' ));
 	map.setCenter(new GLatLng('${formBean.gmap.mapCenterLatitude}', '${formBean.gmap.mapCenterLongitude}' ));
 	map.setZoom(${formBean.gmap.mapZoom});
@@ -71,7 +72,7 @@
 	<script type="text/javascript">
 	<!--
 		var savedPoint = new GLatLng('${marker.latitude}', '${marker.longitude}' );
-		addMarker(savedPoint, '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true);
+		addMarker(savedPoint, '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, true, "${marker.createdBy.firstName} ${marker.createdBy.lastName}");
 	//-->
 	</script>
 </c:forEach>
Index: lams_tool_gmap/web/pages/authoring/headItems.jsp
===================================================================
diff -u -r97ded6a90b089fe5e01c48c02f952e8b09d5a911 -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b
--- lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
+++ lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
@@ -6,6 +6,7 @@
 
 <script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
 <script type="text/javascript" src="${tool}includes/javascript/mapFunctions.js"></script>
+<script type="text/javascript" src="${tool}includes/javascript/mapFunctionsAuthoring.js"></script>
 
 <!--  
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery-latest.pack.js"></script>