From 62bccb08d42392d9bd43e2488cb581ee02e7dd81 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Tue, 15 Sep 2015 16:58:40 +0530
Subject: [PATCH] metrics: fix button string, as it causes other elements to
 spill out

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 .../classes/resources/messages.properties        |  2 +-
 ui/dictionary.jsp                                |  1 +
 ui/dictionary2.jsp                               |  1 -
 ui/scripts/instances.js                          |  4 ++--
 ui/scripts/storage.js                            |  4 ++--
 ui/scripts/system.js                             | 16 ++++++++--------
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index f82ba7106c6..663b71ea9c1 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -831,6 +831,7 @@ label.menu.templates=Templates
 label.menu.virtual.appliances=Virtual Appliances
 label.menu.virtual.resources=Virtual Resources
 label.menu.volumes=Volumes
+label.metrics=Metrics
 label.migrate.instance.to.host=Migrate instance to another host
 label.migrate.instance.to.ps=Migrate instance to another primary storage
 label.migrate.instance.to=Migrate instance to
@@ -1225,7 +1226,6 @@ label.version=Version
 label.view.all=View all
 label.view.console=View console
 label.view.more=View more
-label.view.metrics=View Metrics
 label.view=View
 label.viewing=Viewing
 label.virtual.appliance=Virtual Appliance
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 414dab8783c..caf0e5655d4 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -832,6 +832,7 @@ dictionary = {
 'label.menu.virtual.appliances': '<fmt:message key="label.menu.virtual.appliances" />',
 'label.menu.virtual.resources': '<fmt:message key="label.menu.virtual.resources" />',
 'label.menu.volumes': '<fmt:message key="label.menu.volumes" />',
+'label.metrics': '<fmt:message key="label.metrics" />',
 'label.migrate.instance.to': '<fmt:message key="label.migrate.instance.to" />',
 'label.migrate.instance.to.host': '<fmt:message key="label.migrate.instance.to.host" />',
 'label.migrate.instance.to.ps': '<fmt:message key="label.migrate.instance.to.ps" />',
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index 6e1dc19b35d..20f698f9876 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -203,7 +203,6 @@ $.extend(dictionary, {
 'label.version': '<fmt:message key="label.version" />',
 'label.view.all': '<fmt:message key="label.view.all" />',
 'label.view.console': '<fmt:message key="label.view.console" />',
-'label.view.metrics': '<fmt:message key="label.view.metrics" />',
 'label.view': '<fmt:message key="label.view" />',
 'label.viewing': '<fmt:message key="label.viewing" />',
 'label.virtual.appliance': '<fmt:message key="label.virtual.appliance" />',
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index c19e7d46241..298f85dd584 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -290,7 +290,7 @@
                 },
                 snapshot: vmSnapshotAction({ listView: true }),
                 viewMetrics: {
-                    label: 'label.view.metrics',
+                    label: 'label.metrics',
                     isHeader: true,
                     addRow: false,
                     action: {
@@ -298,7 +298,7 @@
                     },
                     messages: {
                         notification: function (args) {
-                            return 'label.view.metrics';
+                            return 'label.metrics';
                         }
                     }
                 },
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index b4242b93da8..78826a36024 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -254,7 +254,7 @@
                         },
 
                         viewMetrics: {
-                            label: 'label.view.metrics',
+                            label: 'label.metrics',
                             isHeader: true,
                             addRow: false,
                             action: {
@@ -262,7 +262,7 @@
                             },
                             messages: {
                                 notification: function (args) {
-                                    return 'label.view.metrics';
+                                    return 'label.metrics';
                                 }
                             }
                         },
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 32331e9acb9..3473b0ef576 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -7707,7 +7707,7 @@
                                     }
                                 },
                                 viewMetrics: {
-                                    label: 'label.view.metrics',
+                                    label: 'label.metrics',
                                     isHeader: true,
                                     addRow: false,
                                     action: {
@@ -7715,7 +7715,7 @@
                                     },
                                     messages: {
                                         notification: function (args) {
-                                            return 'label.view.metrics';
+                                            return 'label.metrics';
                                         }
                                     }
                                 },
@@ -14386,7 +14386,7 @@
                             }
                         },
                         viewMetrics: {
-                            label: 'label.view.metrics',
+                            label: 'label.metrics',
                             isHeader: true,
                             addRow: false,
                             action: {
@@ -14394,7 +14394,7 @@
                             },
                             messages: {
                                 notification: function (args) {
-                                    return 'label.view.metrics';
+                                    return 'label.metrics';
                                 }
                             }
                         }
@@ -15636,7 +15636,7 @@
                             }
                         },
                         viewMetrics: {
-                            label: 'label.view.metrics',
+                            label: 'label.metrics',
                             isHeader: true,
                             addRow: false,
                             action: {
@@ -15644,7 +15644,7 @@
                             },
                             messages: {
                                 notification: function (args) {
-                                    return 'label.view.metrics';
+                                    return 'label.metrics';
                                 }
                             }
                         }
@@ -17455,7 +17455,7 @@
                             }
                         },
                         viewMetrics: {
-                            label: 'label.view.metrics',
+                            label: 'label.metrics',
                             isHeader: true,
                             addRow: false,
                             action: {
@@ -17463,7 +17463,7 @@
                             },
                             messages: {
                                 notification: function (args) {
-                                    return 'label.view.metrics';
+                                    return 'label.metrics';
                                 }
                             }
                         }