Repository: ambari Updated Branches: refs/heads/branch-2.5 67292971c -> adde3db03
AMBARI-19027. Manage JournalNode tweaks (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/adde3db0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/adde3db0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/adde3db0 Branch: refs/heads/branch-2.5 Commit: adde3db032bf538ba4c872c931c46e28feef3fc1 Parents: 6729297 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Wed Nov 30 13:19:43 2016 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Wed Nov 30 14:28:12 2016 +0200 ---------------------------------------------------------------------- ambari-web/app/messages.js | 12 +++++------- .../main/admin/highAvailability/journalNode/step2.hbs | 14 ++++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/adde3db0/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index e8517b2..7c3ccd3 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1255,7 +1255,7 @@ Em.I18n.translations = { 'admin.kerberos.disable.notice.completed': 'Services have been successfully tested without kerberos environment.', 'admin.kerberos.wizard.step1.notice.inProgress': 'Please wait while cluster is being unkerberized', - 'admin.manageJournalNode.label': 'Manage JournalNode', + 'admin.manageJournalNode.label': 'Manage JournalNodes', 'admin.manageJournalNode.wizard.header': 'Manage JournalNodes Wizard', 'admin.manageJournalNode.wizard.step1.header': 'Assign JournalNodes', 'admin.manageJournalNode.wizard.step2.header': 'Review', @@ -1263,14 +1263,12 @@ Em.I18n.translations = { 'admin.manageJournalNode.wizard.step4.header': 'Add/Remove JournalNodes', 'admin.manageJournalNode.wizard.step5.header': 'Format JournalNodes', 'admin.manageJournalNode.wizard.step6.header': 'Start Active NameNode', - 'admin.manageJournalNode.wizard.step7.header': 'BootStrap StandBy NameNode', + 'admin.manageJournalNode.wizard.step7.header': 'BootStrap Standby NameNode', 'admin.manageJournalNode.wizard.step8.header': 'Start All Services', 'admin.manageJournalNode.wizard.step1.body': 'Add, or Remove JournalNodes', - 'admin.manageJournalNode.wizard.step3.confirm.config.body':'<div class="alert alert-info">' + - '<b>Review Configuration Changes.</b></br>' + - 'The following lists the configuration changes that will be made by the Wizard to manage JournalNode. This information is for <b> review only </b>.' + - '</div>', + 'admin.manageJournalNode.wizard.step3.confirm.config.body': '<b>Configuration Change Review.</b></br>' + + 'As part of this process, configuration changes are required. Please review the changes below, and note that they are for <b>review only</b>. Future steps in this wizard will update this configuration, and restart <b>all</b> services automatically.', 'admin.manageJournalNode.wizard.step4.task0.title' : 'Stop Standby NameNode', 'admin.manageJournalNode.wizard.step4.task1.title': 'Stop Services', @@ -1294,7 +1292,7 @@ Em.I18n.translations = { 'admin.manageJournalNode.wizard.progressPage.notice.inProgress': 'Please wait while JournalNodes are being deployed', 'admin.manageJournalNode.wizard.step6.notice.inProgress': 'Please wait for related services to be started', 'admin.manageJournalNode.wizard.step4.notice.inProgress': 'Please wait while JournalNodes are being deployed', - 'admin.manageJournalNode.wizard.step8.notice.completed':'JournalNodes has been processed successfully.', + 'admin.manageJournalNode.wizard.step8.notice.completed':'Completed update to JournalNodes.', 'admin.manageJournalNode.wizard.step3.body': '<ol>' + http://git-wip-us.apache.org/repos/asf/ambari/blob/adde3db0/ambari-web/app/templates/main/admin/highAvailability/journalNode/step2.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/highAvailability/journalNode/step2.hbs b/ambari-web/app/templates/main/admin/highAvailability/journalNode/step2.hbs index de4e248..456e9ed 100644 --- a/ambari-web/app/templates/main/admin/highAvailability/journalNode/step2.hbs +++ b/ambari-web/app/templates/main/admin/highAvailability/journalNode/step2.hbs @@ -69,12 +69,14 @@ <div id="serviceConfig"> - {{#if controller.isLoaded}} - {{{t admin.manageJournalNode.wizard.step3.confirm.config.body}}} - {{view App.ServiceConfigView isNotEditableBinding="controller.isNotEditable"}} - {{else}} - {{view App.SpinnerView}} - {{/if}} + {{#if controller.isLoaded}} + <div class="alert alert-info"> + {{{t admin.manageJournalNode.wizard.step3.confirm.config.body}}} + </div> + {{view App.ServiceConfigView isNotEditableBinding="controller.isNotEditable"}} + {{else}} + {{view App.SpinnerView}} + {{/if}} </div> <div class="btn-area">