From 0db22e44e8cb2fdae7e8de0f2fb20a125c0686d7 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Wed, 21 Mar 2012 11:13:41 -0700
Subject: [PATCH] bug 14375

Use 'Management IP Addresses' in place of 'Private IP Addresses' for
label on system dashboards
---
 client/WEB-INF/classes/resources/messages.properties | 3 +--
 ui/index.jsp                                         | 1 +
 ui/scripts/sharedFunctions.js                        | 2 +-
 ui/scripts/ui-custom/zoneChart.js                    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index df8e762d9c4..7eeff9314ad 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1,6 +1,5 @@
 #new labels (begin) **********************************************************************************************
-
-
+label.management.ips=Management IP Addresses
 #new labels (end) ************************************************************************************************
 
 
diff --git a/ui/index.jsp b/ui/index.jsp
index 295acffc6d4..b2905bf4fc5 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1645,6 +1645,7 @@
 
 <script language="javascript">
 dictionary = {
+'label.management.ips': '<fmt:message key="label.management.ips"/>',
 'label.edit.traffic.type': '<fmt:message key="label.edit.traffic.type"/>',
 'message.edit.traffic.type': '<fmt:message key="message.edit.traffic.type"/>',
 'label.label': '<fmt:message key="label.label"/>',
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 2842a425e11..b534ae87bee 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -318,7 +318,7 @@ cloudStack.converters = {
     case 2 : return _l('label.storage');
     case 3 : return _l('label.primary.storage');
     case 4 : return _l('label.public.ips');
-    case 5 : return _l('label.private.ips');
+    case 5 : return _l('label.management.ips');
     case 6 : return _l('label.secondary.storage');
     case 7 : return 'VLAN';
     case 8 : return _l('label.direct.ips');
diff --git a/ui/scripts/ui-custom/zoneChart.js b/ui/scripts/ui-custom/zoneChart.js
index 354d4b2b89f..4042e558303 100644
--- a/ui/scripts/ui-custom/zoneChart.js
+++ b/ui/scripts/ui-custom/zoneChart.js
@@ -328,8 +328,8 @@
           3: { name: _l('label.primary.allocated') },
           6: { name: _l('label.secondary.storage') },
           9: { name: _l('label.local.storage') },
-          4: { name: _l('label.public.ip') },
-          5: { name: _l('label.private.ip') },
+          4: { name: _l('label.public.ips') },
+          5: { name: _l('label.management.ips') },
           8: { name: _l('label.direct.ips') },
           7: { name: 'VLAN' }
         };