From 82e7b11892ed1c5ec681d632ac38a33999dde86e Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 5 Oct 2010 11:25:33 -0700
Subject: [PATCH] new UI - before selecting an item in middle menu, show no
 available actions instead of a blank menu when mouse is over action link.

---
 client/WEB-INF/classes/resources/resource.properties | 2 +-
 ui/new/index.jsp                                     | 2 +-
 ui/new/jsp/account.jsp                               | 9 ++-------
 ui/new/jsp/ipaddress.jsp                             | 9 ++-------
 ui/new/jsp/iso.jsp                                   | 5 +----
 ui/new/jsp/router.jsp                                | 9 ++-------
 ui/new/jsp/snapshot.jsp                              | 9 ++-------
 ui/new/jsp/template.jsp                              | 5 +----
 ui/new/jsp/volume.jsp                                | 9 ++-------
 9 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
index ac6bb99774a..62da1566506 100644
--- a/client/WEB-INF/classes/resources/resource.properties
+++ b/client/WEB-INF/classes/resources/resource.properties
@@ -24,7 +24,7 @@ domain = Domain
 event = Event
 alert = Alert
 
-
+no.available.actions = No available actions
 
 name = Name
 display.text = Display Text
diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index 8c38a2aee98..cb41c9d4569 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -337,7 +337,7 @@ long milliseconds = new Date().getTime();
                             <div class="leftmenu_arrows close" id="arrowIcon">
                             </div>
                             <div class="leftmenu_list_icons">
-                                <img src="images/leftmenu_networkgroupicon.png" alt="IP Address" /></div>
+                                <img src="images/leftmenu_ipaddressicon.png" alt="IP Address" /></div>
                             <%=t.t("ip.address")%>
                         </div>
                     </div>
diff --git a/ui/new/jsp/account.jsp b/ui/new/jsp/account.jsp
index 99446c9aed3..ac92ce2a965 100644
--- a/ui/new/jsp/account.jsp
+++ b/ui/new/jsp/account.jsp
@@ -27,15 +27,10 @@
             <div class="grid_actionbox" id="action_link">
                 <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                     <ul class="actionsdropdown_boxlist" id="action_list">
-                        <!--  
-                    	<li> <a href="#"> Delete </a> </li>
-                        <li> <a href="#"> Attach Disk </a> </li>
-                        -->
+                        <li><%=t.t("no.available.actions")%></li>
                     </ul>
                 </div>
-            </div>
-            <div class="grid_editbox">
-            </div>
+            </div>           
             <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
                 display: none;">
                 <div class="gridheader_loader" id="icon">
diff --git a/ui/new/jsp/ipaddress.jsp b/ui/new/jsp/ipaddress.jsp
index 4032295f701..04668767a48 100644
--- a/ui/new/jsp/ipaddress.jsp
+++ b/ui/new/jsp/ipaddress.jsp
@@ -32,15 +32,10 @@
             <div class="grid_actionbox" id="action_link">
                 <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                     <ul class="actionsdropdown_boxlist" id="action_list">
-                        <!--  
-                    	<li> <a href="#"> Delete </a> </li>
-                        <li> <a href="#"> Attach Disk </a> </li>
-                        -->
+                        <li><%=t.t("no.available.actions")%></li>
                     </ul>
                 </div>
-            </div>
-            <div class="grid_editbox">
-            </div>
+            </div>           
             <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
                 display: none;">
                 <div class="gridheader_loader" id="icon">
diff --git a/ui/new/jsp/iso.jsp b/ui/new/jsp/iso.jsp
index 9bc23c77bca..68b3ff5b101 100644
--- a/ui/new/jsp/iso.jsp
+++ b/ui/new/jsp/iso.jsp
@@ -28,10 +28,7 @@
             <div class="grid_actionbox" id="action_link">
                 <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                     <ul class="actionsdropdown_boxlist" id="action_list">
-                        <!--  
-                    	<li> <a href="#"> Delete </a> </li>
-                        <li> <a href="#"> Attach Disk </a> </li>
-                        -->
+                        <li><%=t.t("no.available.actions")%></li>
                     </ul>
                 </div>
             </div>
diff --git a/ui/new/jsp/router.jsp b/ui/new/jsp/router.jsp
index 2e3c57cad91..0a62e3d6015 100644
--- a/ui/new/jsp/router.jsp
+++ b/ui/new/jsp/router.jsp
@@ -30,15 +30,10 @@
             <div class="grid_actionbox" id="action_link">
                 <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                     <ul class="actionsdropdown_boxlist" id="action_list">
-                        <!--  
-                    	<li> <a href="#"> Delete </a> </li>
-                        <li> <a href="#"> Attach Disk </a> </li>
-                        -->
+                        <li><%=t.t("no.available.actions")%></li>
                     </ul>
                 </div>
-            </div>
-            <div class="grid_editbox" style="display:none">
-            </div>
+            </div>            
             <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
                 display: none;">
                 <div class="gridheader_loader" id="icon">
diff --git a/ui/new/jsp/snapshot.jsp b/ui/new/jsp/snapshot.jsp
index 3f067d33f99..3a8712d91de 100644
--- a/ui/new/jsp/snapshot.jsp
+++ b/ui/new/jsp/snapshot.jsp
@@ -28,15 +28,10 @@
             <div class="grid_actionbox" id="action_link">
                 <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                     <ul class="actionsdropdown_boxlist" id="action_list">
-                        <!--  
-                    	<li> <a href="#"> Delete </a> </li>
-                        <li> <a href="#"> Attach Disk </a> </li>
-                        -->
+                       <li><%=t.t("no.available.actions")%></li>
                     </ul>
                 </div>
-            </div>
-            <div class="grid_editbox">
-            </div>
+            </div>            
             <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
                 display: none;">
                 <div class="gridheader_loader" id="icon">
diff --git a/ui/new/jsp/template.jsp b/ui/new/jsp/template.jsp
index 898622d14ff..b3d2fccd100 100644
--- a/ui/new/jsp/template.jsp
+++ b/ui/new/jsp/template.jsp
@@ -28,10 +28,7 @@
             <div class="grid_actionbox" id="action_link">
                 <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                     <ul class="actionsdropdown_boxlist" id="action_list">
-                        <!--  
-                    	<li> <a href="#"> Delete </a> </li>
-                        <li> <a href="#"> Attach Disk </a> </li>
-                        -->
+                        <li><%=t.t("no.available.actions")%></li>
                     </ul>
                 </div>
             </div>
diff --git a/ui/new/jsp/volume.jsp b/ui/new/jsp/volume.jsp
index 28c7686a829..d081c688f88 100644
--- a/ui/new/jsp/volume.jsp
+++ b/ui/new/jsp/volume.jsp
@@ -33,15 +33,10 @@
             <div class="grid_actionbox" id="action_link">
                 <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
                     <ul class="actionsdropdown_boxlist" id="action_list">
-                        <!--  
-                    	<li> <a href="#"> Delete </a> </li>
-                        <li> <a href="#"> Attach Disk </a> </li>
-                        -->
+                       <li><%=t.t("no.available.actions")%></li>
                     </ul>
                 </div>
-            </div>
-            <div class="grid_editbox">
-            </div>
+            </div>            
             <div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
                 display: none;">
                 <div class="gridheader_loader" id="icon">