From 73ff8a022a11741d9157bda5c235e102bffdfa31 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 7 Oct 2011 15:40:08 -0700 Subject: [PATCH] bug 11481: cloudStack 2.2 - router page - add "Migration System VM" action. --- .../classes/resources/messages.properties | 7 +- ui/jsp/router.jsp | 26 ++++++ ui/jsp/systemvm.jsp | 4 +- ui/scripts/cloud.core.router.js | 87 ++++++++++++++++++- ui/scripts/cloud.core.systemvm.js | 8 +- 5 files changed, 121 insertions(+), 11 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 669203fa868..abaf69aa7ac 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -4,9 +4,14 @@ #Labels +label.action.migrate.router=Migrate Router +label.action.migrate.router.processing=Migrating Router.... +message.migrate.router.confirm=Please confirm the host you wish to migrate the router to: +label.migrate.router.to=Migrate Router to + label.action.migrate.systemvm=Migrate System VM label.action.migrate.systemvm.processing=Migrating System VM.... -message.migrate.systemvm.confirm=Please confirm the host you wish to migrate the System VM to: +message.migrate.systemvm.confirm=Please confirm the host you wish to migrate the system VM to: label.migrate.systemvm.to=Migrate System VM to mode=Mode diff --git a/ui/jsp/router.jsp b/ui/jsp/router.jsp index 5974587bcdf..fa30c28b655 100644 --- a/ui/jsp/router.jsp +++ b/ui/jsp/router.jsp @@ -19,6 +19,11 @@ dictionary = { 'label.action.change.service': '', 'label.action.change.service.processing': '', 'message.action.change.service.warning.for.router': '', + 'message.migrate.router.confirm' : '', + 'label.action.migrate.router': '', + 'label.action.migrate.router.processing': '', + 'label.full': '', + 'label.available': '' }; @@ -226,6 +231,27 @@ dictionary = { + + +