Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -r0ce24288a7982f962e62e74d254133cee8016f0a
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml	(.../GmapMarker.hbm.xml)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml	(.../GmapMarker.hbm.xml)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
@@ -86,6 +86,14 @@
             />
         </many-to-one>
 
+        <property
+            name="title"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="title"
+        />
+
         <!--
             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 -r866dc94326b7624341331da05940cfe57a8d9ccd -r0ce24288a7982f962e62e74d254133cee8016f0a
--- lams_tool_gmap/db/sql/create_lams_tool_gmap.sql	(.../create_lams_tool_gmap.sql)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/db/sql/create_lams_tool_gmap.sql	(.../create_lams_tool_gmap.sql)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
@@ -8,7 +8,7 @@
 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, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, 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, 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_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);
Index: lams_tool_gmap/db/sql/table-schema.sql
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -r0ce24288a7982f962e62e74d254133cee8016f0a
--- lams_tool_gmap/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
@@ -9,7 +9,7 @@
 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, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, 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, 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_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);
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -r0ce24288a7982f962e62e74d254133cee8016f0a
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java	(.../GmapMarker.java)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java	(.../GmapMarker.java)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
@@ -62,6 +62,11 @@
 	// 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;
 	
@@ -232,5 +237,19 @@
 		this.gmap = gmap;
 	}
 
+	/**
+	 * 
+	 * @return
+	 * @hibernate.property column="title"
+	 */
+	public String getTitle() {
+		return title;
+	}
 
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -r0ce24288a7982f962e62e74d254133cee8016f0a
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
@@ -417,6 +417,7 @@
 				NamedNodeMap markerNode = ((Node)list.item(i)).getAttributes();
 				
 				Long uid  = Long.parseLong(markerNode.getNamedItem("markerUID").getNodeValue());
+				String markerTitle = markerNode.getNamedItem("title").getNodeValue();
 				String infoMessage = markerNode.getNamedItem("infoMessage").getNodeValue();
 				Double latitude = Double.parseDouble(markerNode.getNamedItem("latitude").getNodeValue());
 				Double longitude = Double.parseDouble(markerNode.getNamedItem("longitude").getNodeValue());
@@ -425,6 +426,7 @@
 				if (markerState.equals("save"))
 				{
 					GmapMarker marker = new GmapMarker();
+					marker.setTitle(markerTitle);
 					marker.setInfoWindowMessage(infoMessage);
 					marker.setLatitude(latitude);
 					marker.setLongitude(longitude);
@@ -440,6 +442,7 @@
 				{
 					
 					GmapMarker marker = gmap.getMarkerByUid(uid);
+					marker.setTitle(markerTitle);
 					marker.setInfoWindowMessage(infoMessage);
 					marker.setLatitude(latitude);
 					marker.setLongitude(longitude);
Index: lams_tool_gmap/web/includes/javascript/authoring.js
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -r0ce24288a7982f962e62e74d254133cee8016f0a
--- lams_tool_gmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
@@ -19,7 +19,8 @@
 {
 	if (GBrowserIsCompatible()) 
 	{
-		map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(640,320) } );
+		//map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(640,320) } );
+		map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(500,320) } );
 		map.setCenter(new GLatLng(-33.774322, 151.111988), 13);
     	map.addControl(new GLargeMapControl());
     	map.addControl(new GMapTypeControl());
Index: lams_tool_gmap/web/includes/javascript/mapFunctions.js
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -r0ce24288a7982f962e62e74d254133cee8016f0a
--- lams_tool_gmap/web/includes/javascript/mapFunctions.js	(.../mapFunctions.js)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/web/includes/javascript/mapFunctions.js	(.../mapFunctions.js)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
@@ -1,6 +1,6 @@
 
 // add a marker at the given point
-function addMarker(point, infoMessage, uid, isSaved)
+function addMarker(point, infoMessage, title, uid, isSaved)
 {
 	map.closeInfoWindow();
 	var marker = new GMarker(point, {draggable: true})
@@ -24,6 +24,26 @@
     	updateMarkerInfoWindowHtml(marker);
     });
     
+    GEvent.addListener(marker,'mouseover',function(){
+		//marker[i].setImage(markerImage[3]);
+		//alert("hello");
+		//document.getElementById("sidebar").getElementsByTagName("span")[markers.length].style.background ="blue";
+	});
+	
+	GEvent.addListener(marker,'mouseout',function()
+	{
+		//document.getElementById("sidebar").getElementsByTagName("span")[markers.length].style.background ="blue";
+		
+		/*if(marker[i].visited){
+			marker[i].setImage(markerImage[4]);
+			document.getElementById("sidebar").getElementsByTagName("span")[i].style.color ="gray";
+		
+		}else{
+		marker[i].setImage(markerImage[0]);
+		document.getElementById("sidebar").getElementsByTagName("span")[i].style.color ="black";
+		*/
+	});
+    
     if (infoMessage!=null)
     {
     	marker.infoMessage = unescape(infoMessage);
@@ -33,34 +53,52 @@
     	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="save";}
+    else {marker.state="unsaved";}
     
-
+	marker.sideBarLinkPrefix = "<span class='sidebar'><a href='javascript:GEvent.trigger(markers["+markers.length+"],\"click\")'>";
+    //marker.sideBarLinkSuffix = marker.title+"</a></span><br />"
     marker.removeLink = "<a href='javascript:removeMarker(" + markers.length + ")'>Remove</a>" ;
-    //marker.editLink = "<a href='pages/authoring/map.jsp' class='thickbox'>Edit</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.cancelLink = "<a href='javascript:cancelEditMarkerInfo(" + markers.length + ")'>Cancel</a>";
-   	
-   	//markerManager.addMarkers(marker,  5);
-   	
     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)
+	addMarker(point, "", "", -1, false);
 }
 
+function refreshSideBar()
+{
+	var sideBarText = "";
+	var i=0;
+	for (;i<markers.length; i++)
+	{
+		if (markers[i].state != "remove")
+		{
+			sideBarText += markers[i].sideBarLinkPrefix + markers[i].title+"</a></span><br />";
+		}
+	}
+	document.getElementById("sidebar").innerHTML = sideBarText;
+}
+
+
 function test()
 {
 	serialiseMarkers();
@@ -75,6 +113,7 @@
 		try{map.removeOverlay(markers[x]);}
 		catch (e){}
 		markers[x].state = "remove";
+		refreshSideBar();
 		//serialiseMarkers();
 	}
 }
@@ -88,9 +127,16 @@
 
 function cancelEditMarkerInfo(x)
 {
-	markers[x].editingOn = false;
-	updateMarkerInfoWindowHtml(markers[x]);
-	openInfoWindow(x);
+	if (markers[x].state == "unsaved")
+	{
+		removeMarker(x);
+	}
+	else
+	{
+		markers[x].editingOn = false;
+		updateMarkerInfoWindowHtml(markers[x]);
+		openInfoWindow(x);
+	}
 }
 
 function updateMarkerInfoWindowHtml(markerIn)
@@ -105,11 +151,11 @@
 	{
 		markerIn.setImage(webAppUrl + "/images/blue_Marker.png");
 	}
-	else if (markerIn.state == "update")
+	else if (markerIn.state == "update" || markerIn.state == "save")
 	{
 		markerIn.setImage(webAppUrl + "/images/paleblue_Marker.png");
 	}
-	else
+	else if (markerIn.state == "unsaved")
 	{
 		markerIn.setImage(webAppUrl + "/images/red_Marker.png");
 	}
@@ -124,8 +170,11 @@
 		//markerIn.inputForm += "contentFolderID='${sessionMap.contentFolderID}'>";
 		//markerIn.inputForm += "</lams:FCKEditor>";
 		
-		markerIn.infoWindowTextarea = "<textarea id='infoWindow' name='infoWindow' rows='5' cols='50'>" + markerIn.infoMessage + "</textarea>";
-		markerIn.inputForm = "New Info Window Text: <br>" + markerIn.infoWindowTextarea;
+		//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
@@ -176,23 +225,56 @@
    map.setCenter(bounds.getCenter());
 }
 
+/*
+function saveClick(x)
+{
+	var title=document.getElementById("markerTitle");
+	if (title==null || trim(title) == "")
+	{
+		alert("Title is required.");
+		return false;
+	}
+	else
+	{
+		saveMarkerInfo(x);
+	}
+}
+*/
+
 function saveMarkerInfo(x)
 {
 	if (markers[x] != null)
 	{
-		var info=document.getElementById("infoWindow");
-		markers[x].infoMessage = info.value;
-		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";}
-		
-		//markers[x].isSaved = persistMarker(markers[x], "createMarker");
-		updateMarkerInfoWindowHtml(markers[x]);
-
+		var title= trim(document.getElementById("markerTitle").value);
+		if (title==null || title == "")
+		{
+			alert("Title is required.");
+			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");
+			
+			//markers[x].isSaved = persistMarker(markers[x], "createMarker");
+			updateMarkerInfoWindowHtml(markers[x]);
+			refreshSideBar();
+		}
 	}
 }
 
+function trim(x)
+{
+	return x.replace(/^\s+|\s+$/g, '')
+}
+
 /*
 function getAjaxObject()
 {
@@ -255,13 +337,14 @@
 	
 	for (;i<markers.length;i++)
 	{
-		if (markers[i].state != "unchanged")
+		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;
Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -r0ce24288a7982f962e62e74d254133cee8016f0a
--- lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
@@ -6,7 +6,7 @@
 <c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 
 <!-- ========== Basic Tab ========== -->
-<table cellpadding="0">
+<table cellpadding="0" border='0'>
 	<tr>
 		<td>
 			<div class="field-name">
@@ -30,12 +30,20 @@
 			<div class="field-name">
 				Map:
 			</div>
-			<div id="map_canvas" style="width: 500px; height: 300px"></div>
+			<!--  
+			<div id="map_canvas" style="width: 500px; height: 300px"></div> 
+			-->
+			<table cellpadding='0' cellspacing='0' border='1'>
+			<tr><td><div id="map_canvas" style="width: 400px; height: 300px;" ></div></td>
+			<td><div id="sidebar" style="width:100px; 
+									overflow:auto;
+									height:320px; 
+									background:WhiteSmoke; "></div></td></tr>
+			</table>
 			
 			<input type="button" onclick="addMarkerToCenter()"  value="Add Marker" />
 			<input type="button" onclick="fitMapMarkers()" value="Fit Markers" />
 			<input type="button" onclick="test()"  value="Test" />
-			<a href='map.jsp' class='thickbox'>Edit</a>
 		</td>
 	</tr>
 	
@@ -58,13 +66,21 @@
 	        	<script type="text/javascript">
 				<!--
 					var savedPoint = new GLatLng('${marker.latitude}', '${marker.longitude}' );
-					addMarker(savedPoint, '${marker.infoWindowMessage}', '${marker.uid}', true);
+					addMarker(savedPoint, '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true);
 				//-->
 				</script>
       		</c:forEach>
       		<script type="text/javascript">
 			<!--
-	       		fitMapMarkers();
+	       		if (markers.length == 1)
+	       		{
+	       			map.setCenter(markers[0].getPoint());
+	       		}
+	       		else if (markers.length >= 2)
+	       		{
+	       			fitMapMarkers();
+	       		}
+	       		refreshSideBar();
        		//-->
 			</script>
 
Index: lams_tool_gmap/web/pages/authoring/headItems.jsp
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -r0ce24288a7982f962e62e74d254133cee8016f0a
--- lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
@@ -4,13 +4,11 @@
 	<lams:WebAppURL />
 </c:set>
 
-<link rel="stylesheet" href="<lams:LAMSURL/>/css/thickbox.css" type="text/css" media="screen" />
-
 <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="<lams:LAMSURL/>/includes/javascript/jquery-latest.pack.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/thickbox-compressed.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 src="http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/release/src/markermanager.js"></script>
 
Fisheye: Tag 0ce24288a7982f962e62e74d254133cee8016f0a refers to a dead (removed) revision in file `lams_tool_gmap/web/pages/authoring/map.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?