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>