[Hyperic-hq-discuss] hq r10929 - in trunk/web: WEB-INF/classes resource/common

[<cl...@hy...>]

Author: clee
Date: 2008-08-29 11:52:12 -0700 (Fri, 29 Aug 2008)
New Revision: 10929
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=10929

Modified:
   trunk/web/WEB-INF/classes/ApplicationResources.properties
   trunk/web/resource/common/NavMap.jsp
Log:
[HHQ-2253] Call the right javascript to toggle the map diagram


Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties
===================================================================
--- trunk/web/WEB-INF/classes/ApplicationResources.properties	2008-08-29 18:48:40 UTC (rev 10928)
+++ trunk/web/WEB-INF/classes/ApplicationResources.properties	2008-08-29 18:52:12 UTC (rev 10929)
@@ -972,7 +972,7 @@
 
 resource.common.confirm.ResourcesRemoved=The selected resources have been removed. 
 
-resource.navmap.linktext=MAP
+resource.navmap.linktext=Map
 resource.toolsmenu.text=Tools Menu
 
 # RESOURCE GENERAL ERRORS

Modified: trunk/web/resource/common/NavMap.jsp
===================================================================
--- trunk/web/resource/common/NavMap.jsp	2008-08-29 18:48:40 UTC (rev 10928)
+++ trunk/web/resource/common/NavMap.jsp	2008-08-29 18:52:12 UTC (rev 10929)
@@ -37,7 +37,7 @@
       <c:when test="${xlib}">
 <script src="<html:rewrite page="/js/"/>effects.js" type="text/javascript"></script>
 <c:set var="imageWidth" value="800"/>
-<div class="navMap" onclick="toggleMenu('diagramDiv');">
+<div class="navMap" onclick="toggleDiagram('diagramdiv');">
 <hq:navMap areasVar="mapAreas" areasSizeVar="mapAreasSize" imageWidth="${imageWidth}"/>
 
 <map name="diagram">
@@ -70,9 +70,9 @@
 </c:forEach>
 </map>
 
-      <span id="mapMenuSpan">Map<img border="0" src="/images/arrow_dropdown.gif"/></span>
+      <span id="mapMenuSpan"><fmt:message key="resource.navmap.linktext"/><img border="0" src="/images/arrow_dropdown.gif"/></span>
       <div style="clear: all"></div>
-      <div id="diagramDiv" style="position: absolute; display: none;">
+      <div id="diagramdiv">
         <span>
           <html:img imageName="navMapImage" page="/resource/NavMapImage?treeVar=${treeVar}&imageWidth=${imageWidth}" alt="" border="0" usemap="#diagram" />
         </span>