From 04078b86c8251bb9c07d90d3eaffad0e40f64b69 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Thu, 18 Nov 2010 13:26:51 -0800
Subject: [PATCH] bug 7153: Fixed left nav menu text.

---
 .../classes/resources/resource.properties     | 38 ++++++------
 ui/index.jsp                                  | 58 +++++++++----------
 ui/jsp/instance.jsp                           |  2 +-
 3 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
index a75c5d83cb9..e0b88f249be 100644
--- a/client/WEB-INF/classes/resources/resource.properties
+++ b/client/WEB-INF/classes/resources/resource.properties
@@ -5,25 +5,27 @@ advanced = Advanced
 version = Version
 
 dashboard = Dashboard
-instance = Instance
+instances = Instances
 router = Router
 storage = Storage
-volume = Volume
-snapshot = Snapshot
-ip.address = IP Address
-template = Template
-my.template = My Template
-featured.template = Featured Template
-community.template = Community Template
-iso = ISO
-my.iso = My ISO
-featured.iso = Featured ISO
-community.iso = Community ISO
-account = Account
-domain = Domain
-event = Event
-alert = Alert
+volumes = Volumes
+snapshots = Snapshots
+ip.addresses = IP Addresses
+templates = Templates
+my.templates = My Templates
+featured.templates = Featured Templates
+community.templates = Community Templates
+isos = ISOs
+my.isos = My ISOs
+featured.isos = Featured ISOs
+community.isos = Community ISOs
+accounts = Accounts
+domains = Domains
+events = Events
+alerts = Alerts
 system = System
+configuration = Configuration
+
 global.settings = Global Settings
 resources = Resources
 service.offerings = Service Offerings
@@ -151,5 +153,5 @@ customizable.during.VM.creation = Customizable during VM creation
 
 physical.resources = Physical Resources
 virtual.resources = Virtual Resources
-virtual.router = Virtual Router
-system.VM = System VM
\ No newline at end of file
+virtual.routers = Virtual Routers
+system.vms = System VMs
\ No newline at end of file
diff --git a/ui/index.jsp b/ui/index.jsp
index 143ac006ef9..15a36b82f18 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -367,8 +367,8 @@ long milliseconds = new Date().getTime();
                         <div class="leftmenu_firstindent">
                             <div class="leftmenu_arrows_firstlevel_open" id="expandable_first_level_arrow" style="display:none;"></div>
                             <div class="leftmenu_list_icons">
-                                <img src="images/instance_leftmenuicon.png" alt="Instance" /></div>
-                            <%=t.t("instance")%>
+                                <img src="images/instance_leftmenuicon.png" alt="Instances" /></div>
+                            <%=t.t("instances")%>
                         </div>
                     </div>
                     
@@ -439,7 +439,7 @@ long milliseconds = new Date().getTime();
                                    	<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
                                     </div>
                                       
-                                    <%=t.t("volume")%>
+                                    <%=t.t("volumes")%>
                                 </div>
                             </div>
                         </div>
@@ -449,7 +449,7 @@ long milliseconds = new Date().getTime();
                                 	  <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
                                             </div>
                                    
-                                    <%=t.t("snapshot")%>
+                                    <%=t.t("snapshots")%>
                                 </div>
                             </div>
                         </div>
@@ -471,7 +471,7 @@ long milliseconds = new Date().getTime();
                                    	<div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
                                     </div>
                                     
-                                    <%=t.t("ip.address")%>
+                                    <%=t.t("ip.addresses")%>
                                 </div>
                             </div>
                         </div>                        
@@ -482,8 +482,8 @@ long milliseconds = new Date().getTime();
                         <div class="leftmenu_firstindent">
                             <div class="leftmenu_arrows_firstlevel_open" id="expandable_first_level_arrow" style="display:none;"></div>
                             <div class="leftmenu_list_icons">
-                                <img src="images/templates_leftmenuicon.png" alt="Template" /></div>
-                            <%=t.t("template")%>
+                                <img src="images/templates_leftmenuicon.png" alt="Templates" /></div>
+                            <%=t.t("templates")%>
                         </div>
                     </div>
                     <div class="leftmenu_expandedbox" style="display: none">
@@ -493,7 +493,7 @@ long milliseconds = new Date().getTime();
                                     <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
                                     </div>
                                     
-                                    <%=t.t("template")%>
+                                    <%=t.t("templates")%>
                                 </div>
                             </div>
                             <div id="leftmenu_template_filter_container">
@@ -504,7 +504,7 @@ long milliseconds = new Date().getTime();
                                             </div>
                                             
                                             <div>
-                                                <%=t.t("my.template")%></div>
+                                                <%=t.t("my.templates")%></div>
                                         </div>
                                     </div>
                                 </div>
@@ -515,7 +515,7 @@ long milliseconds = new Date().getTime();
                                             </div>
                                           
                                             <div>
-                                                <%=t.t("featured.template")%></div>
+                                                <%=t.t("featured.templates")%></div>
                                         </div>
                                     </div>
                                 </div>
@@ -526,7 +526,7 @@ long milliseconds = new Date().getTime();
                                             </div>
                                             
                                             <div>
-                                                <%=t.t("community.template")%></div>
+                                                <%=t.t("community.templates")%></div>
                                         </div>
                                     </div>
                                 </div>
@@ -538,7 +538,7 @@ long milliseconds = new Date().getTime();
                                     <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
                                     </div>
                                     
-                                    <%=t.t("iso")%>
+                                    <%=t.t("isos")%>
                                 </div>
                             </div>
                             <div id="leftmenu_iso_filter_container">
@@ -549,7 +549,7 @@ long milliseconds = new Date().getTime();
                                             </div>
                                             
                                             <div>
-                                                <%=t.t("my.iso")%></div>
+                                                <%=t.t("my.isos")%></div>
                                         </div>
                                     </div>
                                 </div>
@@ -560,7 +560,7 @@ long milliseconds = new Date().getTime();
                                             </div>
                                             
                                             <div>
-                                                <%=t.t("featured.iso")%></div>
+                                                <%=t.t("featured.isos")%></div>
                                         </div>
                                     </div>
                                 </div>
@@ -571,7 +571,7 @@ long milliseconds = new Date().getTime();
                                             </div>
                                             
                                             <div>
-                                                <%=t.t("community.iso")%></div>
+                                                <%=t.t("community.isos")%></div>
                                         </div>
                                     </div>
                                 </div>
@@ -584,8 +584,8 @@ long milliseconds = new Date().getTime();
                         <div class="leftmenu_firstindent">
                             <!-- <div class="leftmenu_arrows_firstlevel_open" id="expandable_first_level_arrow" style="display:none;"></div> -->
                             <div class="leftmenu_list_icons">
-                                <img src="images/accounts_leftmenuicon.png" alt="Account" /></div>
-                            <%=t.t("account")%>
+                                <img src="images/accounts_leftmenuicon.png" alt="Accounts" /></div>
+                            <%=t.t("accounts")%>
                         </div>
                     </div>
                     
@@ -595,8 +595,8 @@ long milliseconds = new Date().getTime();
                         <div class="leftmenu_firstindent">
                             <div class="leftmenu_arrows_firstlevel_open" id="expandable_first_level_arrow" style="display:none;"></div>
                             <div class="leftmenu_list_icons">
-                                <img src="images/domain_leftmenuicon.png" alt="Domain" /></div>
-                            <%=t.t("domain")%>
+                                <img src="images/domain_leftmenuicon.png" alt="Domains" /></div>
+                            <%=t.t("domains")%>
                         </div>
                     </div>
                     <div class="leftmenu_expandedbox" style="display: none">
@@ -619,8 +619,8 @@ long milliseconds = new Date().getTime();
                         <div class="leftmenu_firstindent">
                              <div class="leftmenu_arrows_firstlevel_open" id="expandable_first_level_arrow" style="display:none;"></div>
                             <div class="leftmenu_list_icons">
-                                <img src="images/events_leftmenuicon.png" alt="Event" /></div>
-                            <%=t.t("event")%>
+                                <img src="images/events_leftmenuicon.png" alt="Events" /></div>
+                            <%=t.t("events")%>
                         </div>
                     </div>
                     <div class="leftmenu_expandedbox" style="display: none">
@@ -630,7 +630,7 @@ long milliseconds = new Date().getTime();
                                     <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
                                     </div>
                                     
-                                    <%=t.t("event")%>
+                                    <%=t.t("events")%>
                                 </div>
                             </div>
                         </div>
@@ -640,7 +640,7 @@ long milliseconds = new Date().getTime();
                                     <div class="leftmenu_arrows white_nonexpanded_close" id="arrowIcon">
                                     </div>
                                     
-                                    <%=t.t("alert")%>
+                                    <%=t.t("alerts")%>
                                 </div>
                             </div>
                         </div>
@@ -652,8 +652,8 @@ long milliseconds = new Date().getTime();
                         <div class="leftmenu_firstindent">
                             <div class="leftmenu_arrows_firstlevel_open" id="expandable_first_level_arrow" style="display:none;"></div>
                             <div class="leftmenu_list_icons">
-                                <img src="images/resource_leftmenuicon.png" alt="resources" /></div>
-                            <%=t.t("resources")%>
+                                <img src="images/resource_leftmenuicon.png" alt="System" /></div>
+                            <%=t.t("system")%>
                         </div>
                     </div>
                     <div class="leftmenu_expandedbox" style="display: none">
@@ -693,7 +693,7 @@ long milliseconds = new Date().getTime();
                                             </div>
                                             
                                             <div>
-                                                <%=t.t("virtual.router")%></div>
+                                                <%=t.t("virtual.routers")%></div>
                                         </div>
                                     </div>
                                 </div>
@@ -704,7 +704,7 @@ long milliseconds = new Date().getTime();
                                             </div>
                                           
                                             <div>
-                                                <%=t.t("system.VM")%></div>
+                                                <%=t.t("system.vms")%></div>
                                         </div>
                                     </div>
                                 </div>                                
@@ -718,8 +718,8 @@ long milliseconds = new Date().getTime();
                         <div class="leftmenu_firstindent">
                             <div class="leftmenu_arrows_firstlevel_open" id="expandable_first_level_arrow" style="display:none;"></div>
                             <div class="leftmenu_list_icons">
-                                <img src="images/configuration_leftmenuicon.png" alt="System" /></div>
-                            <%=t.t("system")%>
+                                <img src="images/configuration_leftmenuicon.png" alt="Configuration" /></div>
+                            <%=t.t("configuration")%>
                         </div>
                     </div>
                     <div class="leftmenu_expandedbox" style="display: none">                                                          
diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index 038ab752c69..fa29b34d155 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -30,7 +30,7 @@
         <div class="content_tabs off" id="tab_statistics">
             <%=t.t("Statistics")%></div>
         <div class="content_tabs off" id="tab_router" style="display:none">
-            <%=t.t("Routers")%></div>
+            <%=t.t("Router")%></div>
     </div>
     <!--Details tab (start)-->
     <div  id="tab_content_details">