cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to 592cd75
Date Fri, 09 Aug 2013 22:12:38 GMT
Updated Branches:
  refs/heads/master ea717c18c -> 592cd7586


CLOUDSTACK-4102: UI > change label of scaleUp/changeServiceOffering action from "Scale
Up" to "Change Service Offering" for both running VM and stopped VM.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/592cd758
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/592cd758
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/592cd758

Branch: refs/heads/master
Commit: 592cd75867580e522a9e4283699676f3fd604b4f
Parents: ea717c1
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Aug 9 15:10:13 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Aug 9 15:12:28 2013 -0700

----------------------------------------------------------------------
 ui/scripts/instances.js | 4 ++--
 ui/scripts/system.js    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/592cd758/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index b98452b..cf718e5 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1275,9 +1275,9 @@
                     },
 
                     scaleUp: {
-                        label: 'Scale UP Virtual Machine',
+                        label: 'label.change.service.offering',
                         createForm: {
-                            title: 'Scale UP Virtual Machine',
+                            title: 'label.change.service.offering',
                             desc: 'For VMware-based Linux VMs, please read the dynamic scaling
section in the admin guide before scaling.',                            
                             fields: {
                                 serviceOffering: {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/592cd758/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index ffac3c1..09bc4f4 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6618,7 +6618,7 @@
                                                     },
 
                                                     scaleUp: {
-                                                        label: 'scaleUp System VM',
+                                                        label: 'label.change.service.offering',
                                                         createForm: {
                                                             title: 'label.change.service.offering',
                                                             desc: 'For VMware-based Linux
VMs, please read the dynamic scaling section in the admin guide before scaling.',  
@@ -7585,7 +7585,7 @@
                             },
 
                             scaleUp: {
-                                label: 'scaleUp Router VM',
+                                label: 'label.change.service.offering',
                                 createForm: {
                                     title: 'label.change.service.offering',
                                     desc: 'For VMware-based Linux VMs, please read the dynamic
scaling section in the admin guide before scaling.',  
@@ -8134,7 +8134,7 @@
                             },
 
                             scaleUp: {
-                                label: 'scaleUp System VM',
+                                label: 'label.change.service.offering',
                                 createForm: {
                                     title: 'label.change.service.offering',
                                     desc: 'For VMware-based Linux VMs, please read the dynamic
scaling section in the admin guide before scaling.',  


Mime
View raw message