Updated Branches: refs/heads/4.2 322b17a69 -> d4ebd51c2
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/d4ebd51c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d4ebd51c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d4ebd51c Branch: refs/heads/4.2 Commit: d4ebd51c2d810ec57981668b17a6dfbbe2d844b6 Parents: 322b17a Author: Jessica Wang <jessicaw...@apache.org> Authored: Fri Aug 9 15:10:13 2013 -0700 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Fri Aug 9 15:10:13 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/d4ebd51c/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/d4ebd51c/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.',
