Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapUser.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Attic/GmapUser.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapUser.hbm.xml	23 May 2008 06:29:11 -0000	1.1
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapUser.hbm.xml	8 Jul 2008 04:41:25 -0000	1.2
@@ -82,14 +82,6 @@
             />
         </many-to-one>
 
-        <property
-            name="entryUID"
-            type="java.lang.Long"
-            update="true"
-            insert="true"
-            column="entry_uid"
-        />
-
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-GmapUser.xml
Index: lams_tool_gmap/db/sql/create_lams_tool_gmap.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/db/sql/create_lams_tool_gmap.sql,v
diff -u -r1.6 -r1.7
--- lams_tool_gmap/db/sql/create_lams_tool_gmap.sql	4 Jul 2008 02:36:05 -0000	1.6
+++ lams_tool_gmap/db/sql/create_lams_tool_gmap.sql	8 Jul 2008 04:41:26 -0000	1.7
@@ -10,7 +10,7 @@
 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 text, create_date datetime, update_date datetime, is_authored bit, gmap_uid bigint, title varchar(55), created_by bigint, updated_by bigint, gmap_session_uid 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));
+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, 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 FK10F22749C5F056D9 (gmap_session_uid), add constraint FK10F22749C5F056D9 foreign key (gmap_session_uid) references tl_lagmap10_session (uid);
Index: lams_tool_gmap/db/sql/table-schema.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/db/sql/table-schema.sql,v
diff -u -r1.6 -r1.7
--- lams_tool_gmap/db/sql/table-schema.sql	4 Jul 2008 02:36:05 -0000	1.6
+++ lams_tool_gmap/db/sql/table-schema.sql	8 Jul 2008 04:41:26 -0000	1.7
@@ -14,7 +14,7 @@
 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 text, create_date datetime, update_date datetime, is_authored bit, gmap_uid bigint, title varchar(55), created_by bigint, updated_by bigint, gmap_session_uid 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));
+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, 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 FK10F22749C5F056D9 (gmap_session_uid), add constraint FK10F22749C5F056D9 foreign key (gmap_session_uid) references tl_lagmap10_session (uid);
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java	4 Jul 2008 02:36:03 -0000	1.3
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java	8 Jul 2008 04:41:25 -0000	1.4
@@ -54,17 +54,13 @@
 		this.sessionName = session.getSessionName();
 		
 		numberOfFinishedLearners = 0;
-		for (Iterator iterator = session.getGmapUsers().iterator(); iterator.hasNext();) {
+		for (Iterator<GmapUser> iterator = session.getGmapUsers().iterator(); iterator.hasNext();) {
 			GmapUser user = (GmapUser) iterator.next();
 			GmapUserDTO userDTO = new GmapUserDTO(user);
-			if (userDTO.getEntryUID() != null) {
-				numberOfFinishedLearners++;
-			}
 			userDTOs.add(userDTO);
-		}
-		
+			if (user.isFinishedActivity()) {numberOfFinishedLearners++;}
+		}	
 		numberOfLearners = userDTOs.size();
-		
 	}
 	
 	public GmapSessionDTO() {}
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java	6 Jun 2008 00:24:19 -0000	1.2
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java	8 Jul 2008 04:41:25 -0000	1.3
@@ -25,7 +25,6 @@
 
 package org.lamsfoundation.lams.tool.gmap.dto;
 
-import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.gmap.model.GmapUser;
 
 public class GmapUserDTO implements Comparable{
@@ -38,25 +37,11 @@
 	
 	public String lastName;
 	
-	public NotebookEntryDTO entryDTO;
-
-	public Long entryUID;
-	
-	public GmapUserDTO(GmapUser user, NotebookEntry entry) {
-		this.uid = user.getUid();
-		this.loginName = user.getLoginName();
-		this.firstName = user.getFirstName();
-		this.lastName = user.getLastName();
-		this.entryUID = user.getEntryUID();
-		this.entryDTO = new NotebookEntryDTO(entry);
-	}
-	
 	public GmapUserDTO(GmapUser user) {
 		this.uid = user.getUid();
 		this.loginName = user.getLoginName();
 		this.firstName = user.getFirstName();
 		this.lastName = user.getLastName();
-		this.entryUID = user.getEntryUID();		
 	}
 
 	public int compareTo(Object o) {
@@ -100,20 +85,4 @@
 	public void setUid(Long uid) {
 		this.uid = uid;
 	}
-
-	public NotebookEntryDTO getEntryDTO() {
-		return entryDTO;
-	}
-
-	public void setEntryDTO(NotebookEntryDTO entryDTO) {
-		this.entryDTO = entryDTO;
-	}
-
-	public Long getEntryUID() {
-		return entryUID;
-	}
-
-	public void setEntryUID(Long entryUID) {
-		this.entryUID = entryUID;
-	}
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapUser.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapUser.java,v
diff -u -r1.2 -r1.3
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapUser.java	6 Jun 2008 00:24:19 -0000	1.2
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapUser.java	8 Jul 2008 04:41:26 -0000	1.3
@@ -57,7 +57,6 @@
 	
 	private boolean finishedActivity;
 	
-	private Long entryUID;
 
 	// Constructors
 
@@ -165,17 +164,6 @@
 	public void setGmapSession(GmapSession gmapSession) {
 		this.gmapSession = gmapSession;
 	}
-
-	/**
-	 * @hibernate.property column="entry_uid"
-	 */
-	public Long getEntryUID() {
-		return entryUID;
-	}
-
-	public void setEntryUID(Long entryUID) {
-		this.entryUID = entryUID;
-	}
 	
 	/**
 	 * toString
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java,v
diff -u -r1.8 -r1.9
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	8 Jul 2008 04:09:11 -0000	1.8
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	8 Jul 2008 04:41:25 -0000	1.9
@@ -59,7 +59,6 @@
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
-import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
 import org.lamsfoundation.lams.tool.ToolContentManager;
@@ -234,27 +233,6 @@
 		Gmap toContent = Gmap.newInstance(fromContent, toContentId,
 				gmapToolContentHandler);
 		gmapDAO.saveOrUpdate(toContent);
-		
-		
-		//save markers in this gmap, only save the author created markers
-		// ###### Commenting this out, it is unneccessary unless teacher editing of authored markers is
-		// allowed at lesson runtime
-		/*
-		Set<GmapMarker> markers = toContent.getGmapMarkers();
-		if(markers != null){
-			Iterator iter = markers.iterator();
-			while(iter.hasNext()){
-				GmapMarker marker = (GmapMarker) iter.next();
-				//set this message forum Uid as toContent
-				if(!marker.isAuthored())
-					continue;
-				
-				marker.setUpdated(new Date());
-				marker.setGmap(toContent);
-				saveOrUpdateGmapMarker(marker);
-			}
-		}
-		*/
 	}
 
 	public void setAsDefineLater(Long toolContentId, boolean value)
@@ -394,18 +372,6 @@
 
 	/* ********** IGmapService Methods ********************************* */
 
-	public Long createNotebookEntry(Long id, Integer idType, String signature,
-			Integer userID, String entry) {
-		return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry);
-	}
-
-	public NotebookEntry getEntry(Long uid) {
-		return coreNotebookService.getEntry(uid);
-	}
-
-	public void updateEntry(Long uid, String entry) {
-		coreNotebookService.updateEntry(uid, "", entry);
-	}
 	
 	public Long getDefaultContentIdBySignature(String toolSignature) {
 		Long toolContentId = null;
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java,v
diff -u -r1.5 -r1.6
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java	8 Jul 2008 04:09:11 -0000	1.5
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java	8 Jul 2008 04:41:26 -0000	1.6
@@ -27,7 +27,6 @@
 import java.util.List;
 
 import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.gmap.model.Gmap;
 import org.lamsfoundation.lams.tool.gmap.model.GmapAttachment;
 import org.lamsfoundation.lams.tool.gmap.model.GmapSession;
@@ -153,35 +152,8 @@
 	public GmapUser createGmapUser(UserDTO user,
 			GmapSession gmapSession);
 	
-	/**
-	 * 
-	 * @param id
-	 * @param idType
-	 * @param signature
-	 * @param userID
-	 * @param title
-	 * @param entry
-	 * @return
-	 */
-	Long createNotebookEntry(Long id, Integer idType, String signature,
-			Integer userID, String entry);
 	
 	/**
-	 * 
-	 * @param uid
-	 * @return
-	 */
-	NotebookEntry getEntry(Long uid);
-	
-	/**
-	 * 
-	 * @param uid
-	 * @param title
-	 * @param entry
-	 */
-	void updateEntry(Long uid, String entry);
-	
-	/**
 	 * Updates the marker list for the gmap based upon a serialised xml version of the marker array
 	 * 
 	 * @param markerXML
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java,v
diff -u -r1.10 -r1.11
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	8 Jul 2008 04:09:11 -0000	1.10
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	8 Jul 2008 04:41:25 -0000	1.11
@@ -38,7 +38,6 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
@@ -207,15 +206,19 @@
 			
 			// update the marker list
 			Gmap gmap = gmapSession.getGmap();
-			updateMarkerListFromXML(learningForm.getMarkersXML(), gmap, gmapUser, gmapSession);
+			gmapService.updateMarkerListFromXML(learningForm.getMarkersXML(), gmap, gmapUser, true, gmapSession);
+			
+			// Set the user finished flag
+			gmapUser.setFinishedActivity(true);
+			gmapService.saveOrUpdateGmapUser(gmapUser);
+			
 
 		} else {
 			log.error("finishActivity(): couldn't find GmapUser with id: "
 					+ gmapUser.getUserId() + "and toolSessionID: "
 					+ toolSessionID);
 		}
 
-
 		ToolSessionManager sessionMgrService = GmapServiceProxy.getGmapSessionManager(getServlet().getServletContext());
 		String nextActivityUrl;
 		try {
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java,v
diff -u -r1.4 -r1.5
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java	4 Jul 2008 02:36:02 -0000	1.4
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java	8 Jul 2008 04:41:25 -0000	1.5
@@ -27,25 +27,13 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.List;
-import java.util.HashSet;
-
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.gmap.dto.GmapDTO;
-import org.lamsfoundation.lams.tool.gmap.dto.GmapUserDTO;
 import org.lamsfoundation.lams.tool.gmap.dto.GmapSessionDTO;
-import org.lamsfoundation.lams.tool.gmap.dto.GmapMarkerDTO;
 import org.lamsfoundation.lams.tool.gmap.model.Gmap;
-import org.lamsfoundation.lams.tool.gmap.model.GmapMarker;
-import org.lamsfoundation.lams.tool.gmap.model.GmapUser;
 import org.lamsfoundation.lams.tool.gmap.service.IGmapService;
 import org.lamsfoundation.lams.tool.gmap.service.GmapServiceProxy;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -92,40 +80,13 @@
 		for (GmapSessionDTO sessionDTO : gmapDT0.getSessionDTOs())
 		{
 			Long toolSessionID = sessionDTO.getSessionID();
-			List<GmapMarker> markers = gmapService.getGmapMarkersBySessionId(toolSessionID);
-			sessionDTO.setMarkerDTOs(markers);
-			/*
-			Set<GmapMarkerDTO> markerDTOs = new HashSet<GmapMarkerDTO>();
-			for (GmapMarker marker : markers) {
-				GmapMarkerDTO markerDTO = new GmapMarkerDTO(marker);
-				markerDTOs.add(markerDTO);
-			}
-			*/
-			//sessionMarkersMap.put(toolSessionID, markerDTOs);
+			sessionDTO.setMarkerDTOs(gmapService.getGmapMarkersBySessionId(toolSessionID));
 		}
-		//request.setAttribute("sessionMarkers", sessionMarkersMap);
 		
 		request.setAttribute("gmapDTO", gmapDT0);
 		request.setAttribute("contentFolderID", contentFolderID);
 		return mapping.findForward("success");
 	}
-
-	public ActionForward showGmap(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		
-		setupService();
-		
-		Long uid = new Long(WebUtil.readLongParam(request, "userUID"));
-
-		GmapUser user = gmapService.getUserByUID(uid);
-		NotebookEntry entry = gmapService.getEntry(user.getEntryUID());
-
-		GmapUserDTO userDTO = new GmapUserDTO(user, entry);
-
-		request.setAttribute("userDTO", userDTO);
-
-		return mapping.findForward("gmap_display");
-	}
 	
 	/**
 	 * set up gmapService
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/LearningForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/LearningForm.java,v
diff -u -r1.2 -r1.3
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/LearningForm.java	6 Jun 2008 00:24:20 -0000	1.2
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/LearningForm.java	8 Jul 2008 04:41:26 -0000	1.3
@@ -44,8 +44,6 @@
 	Long toolSessionID;
 	String mode;
 	
-	String entryText;
-	
 	String markersXML;
 
 	public String getMarkersXML() {
@@ -95,12 +93,4 @@
 	public void setTitle(String title) {
 		this.title = title;
 	}
-
-	public String getEntryText() {
-		return entryText;
-	}
-
-	public void setEntryText(String entryText) {
-		this.entryText = entryText;
-	}
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java,v
diff -u -r1.6 -r1.7
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java	8 Jul 2008 01:49:19 -0000	1.6
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java	8 Jul 2008 04:41:26 -0000	1.7
@@ -31,10 +31,8 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.gmap.dto.GmapDTO;
-import org.lamsfoundation.lams.tool.gmap.dto.NotebookEntryDTO;
 import org.lamsfoundation.lams.tool.gmap.dto.GmapSessionDTO;
 import org.lamsfoundation.lams.tool.gmap.dto.GmapUserDTO;
 import org.lamsfoundation.lams.tool.gmap.model.Gmap;
Index: lams_tool_gmap/web/pages/learning/gmap.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/learning/gmap.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_gmap/web/pages/learning/gmap.jsp	8 Jul 2008 02:23:41 -0000	1.10
+++ lams_tool_gmap/web/pages/learning/gmap.jsp	8 Jul 2008 04:41:25 -0000	1.11
@@ -27,43 +27,40 @@
 
 		<c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
-		<c:choose>
-			<c:when test="${contentEditable}">
-				<br />
-				
-				<table>
-					<tr>
-						<td>
-							<div id="map_canvas" style="float: left; width:80%; height:400px"><fmt:message key="error.cantLoadMap"></fmt:message></div>
-							<div id="usersidebar" style="float: right; width:20%; overflow:auto; height:400px; background:WhiteSmoke; "></div>		
-						</td>
-					</tr>
-					<tr>
-						<td>	
-							<a href="javascript:addMarkerToCenter()" class="button"/><fmt:message key="button.addMarker"/></a>
-							<a href="javascript:fitMapMarkers()" class="button"/><fmt:message key="button.fitMarkers"/></a>
-						</td>
-					</tr>
-				</table>
-				<p />
-				
-				<input type="text" onkeypress="javascript:if (event.keyCode==13){showAddress();return false;}" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
-       			<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
-				
-				<div class="space-bottom-top align-right">
-					<html:submit styleClass="button" styleId="finishButton" onclick="javascript:serialiseMarkers();document.getElementById('dispatch').value = 'saveMarkers';">
-						<fmt:message>button.save</fmt:message>
-					</html:submit>
-					
-					<html:submit styleClass="button" styleId="finishButton" onclick="javascript:serialiseMarkers();document.getElementById('dispatch').value = 'finishActivity';">
-						<fmt:message>button.finish</fmt:message>
-					</html:submit>
-				</div>
-			</c:when>
-			<c:otherwise>
-					<lams:out value="${lrnForm.entryText}" />
-			</c:otherwise>
-		</c:choose>
+		<br />
+		
+		<table>
+			<tr>
+				<td>
+					<div id="map_canvas" style="float: left; width:80%; height:400px"><fmt:message key="error.cantLoadMap"></fmt:message></div>
+					<div id="usersidebar" style="float: right; width:20%; overflow:auto; height:400px; background:WhiteSmoke; "></div>		
+				</td>
+			</tr>
+			<tr>
+				<td>	
+					<c:choose>
+						<c:when test="${contentEditable}">
+					<a href="javascript:addMarkerToCenter()" class="button"/><fmt:message key="button.addMarker"/></a>
+						</c:when>
+					</c:choose>
+					<a href="javascript:fitMapMarkers()" class="button"/><fmt:message key="button.fitMarkers"/></a>
+				</td>
+			</tr>
+		</table>
+		<p />
+		
+		<input type="text" onkeypress="javascript:if (event.keyCode==13){showAddress();return false;}" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
+	    			<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
+		
+		<div class="space-bottom-top align-right">
+			<html:submit styleClass="button" styleId="finishButton" onclick="javascript:serialiseMarkers();document.getElementById('dispatch').value = 'saveMarkers';">
+				<fmt:message>button.save</fmt:message>
+			</html:submit>
+			
+			<html:submit styleClass="button" styleId="finishButton" onclick="javascript:serialiseMarkers();document.getElementById('dispatch').value = 'finishActivity';">
+				<fmt:message>button.finish</fmt:message>
+			</html:submit>
+		</div>
 	</html:form>
 </div>
 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/monitoring/gmapDisplay.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?