Updated Branches: refs/heads/trunk 6909d1108 -> 5072b0375
Revert "AMBARI-2791. NameNode HA Wizard: Review page. (Antonenko Alexander via yusaku)" This reverts commit 6909d11086559ac40cb93b31e0a05d41e27ccf95. Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/36f483fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/36f483fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/36f483fa Branch: refs/heads/trunk Commit: 36f483fa1c096801f71eaaed3e5c1a8417ed662c Parents: 6909d11 Author: Yusaku Sako <[email protected]> Authored: Thu Aug 1 10:38:11 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Thu Aug 1 10:39:03 2013 -0700 ---------------------------------------------------------------------- .../admin/highAvailability/step3_controller.js | 4 +--- ambari-web/app/messages.js | 6 ----- .../main/admin/highAvailability/step3.hbs | 25 ++------------------ .../main/admin/highAvailability/step3_view.js | 18 +------------- 4 files changed, 4 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/36f483fa/ambari-web/app/controllers/main/admin/highAvailability/step3_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step3_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step3_controller.js index e9fe9bb..7e59574 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/step3_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/step3_controller.js @@ -18,7 +18,5 @@ var App = require('app'); -App.HighAvailabilityWizardStep3Controller = Em.Controller.extend({ - name:"highAvailabilityWizardStep3Controller" -}); +App.HighAvailabilityWizardStep3Controller = Em.Controller.extend(); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/36f483fa/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index e225e19..751d0db 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -645,12 +645,6 @@ Em.I18n.translations = { 'admin.highAvailability.wizard.step3.header':'Review', 'admin.highAvailability.wizard.step4.header':'Apply', - 'admin.highAvailability.wizard.step3.nn1':'Current NameNode is on {0}.', - 'admin.highAvailability.wizard.step3.nn2':'Additional NameNode will be installed on {0}.', - 'admin.highAvailability.wizard.step3.sn':'Existing Secondary NameNode on {0} will be disabled.', - 'admin.highAvailability.wizard.step3.jn':'JournalNode will be installed on following hosts:', - - 'admin.highAvailability.wizard.step3.body':'Confirm your host selection and click Deploy to activate NameNode HA.', 'admin.highAvailability.wizard.step2.body':'Select a host that will be running an additional NameNode.<br/> In addition,' + ' select 3 hosts that will be running JournalNodes to store NameNode edit logs in a fault tolerant maner.', 'admin.highAvailability.wizard.step1.body':'We will walk you through enabling NameNode HA with this wizard.<br/>' + http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/36f483fa/ambari-web/app/templates/main/admin/highAvailability/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/highAvailability/step3.hbs b/ambari-web/app/templates/main/admin/highAvailability/step3.hbs index cd43342..d640e68 100644 --- a/ambari-web/app/templates/main/admin/highAvailability/step3.hbs +++ b/ambari-web/app/templates/main/admin/highAvailability/step3.hbs @@ -16,28 +16,7 @@ * limitations under the License. }} - <h2>{{t admin.highAvailability.wizard.step3.header}}</h2> - -<div class="alert alert-info"> - {{t admin.highAvailability.wizard.step3.body}} -</div> - -<div id="step8-content" class="well pre-scrollable"> - <div id="step8-info"> - {{view.curNameNode}} <br/> - {{view.addNameNode}} <br/> - {{view.secondaryNameNode}} <br/> - {{t admin.highAvailability.wizard.step3.jn}} <br/> - <ul> - {{#each item in view.journalNodes}} - <li>{{item.hostName}}</li> - {{/each}} - </ul> - </div> +<div class="btn-area"> + <a class="btn btn-success pull-right" {{action next}}>{{t common.next}} →</a> </div> - - - <div class="btn-area"> - <a class="btn btn-success pull-right" {{action next}}>{{t common.next}} →</a> - </div> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/36f483fa/ambari-web/app/views/main/admin/highAvailability/step3_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/highAvailability/step3_view.js b/ambari-web/app/views/main/admin/highAvailability/step3_view.js index ca63098..1f06988 100644 --- a/ambari-web/app/views/main/admin/highAvailability/step3_view.js +++ b/ambari-web/app/views/main/admin/highAvailability/step3_view.js @@ -21,22 +21,6 @@ var App = require('app'); App.HighAvailabilityWizardStep3View = Em.View.extend({ - templateName: require('templates/main/admin/highAvailability/step3'), - - curNameNode: function () { - var nN = this.get('controller.content.masterComponentHosts').findProperty('isCurNameNode', true); - return Em.I18n.t('admin.highAvailability.wizard.step3.nn1').format(nN.hostName); - }.property('controller.content.masterComponentHosts'), - addNameNode: function () { - var addNN = this.get('controller.content.masterComponentHosts').findProperty('isAddNameNode', true); - return Em.I18n.t('admin.highAvailability.wizard.step3.nn2').format(addNN.hostName); - }.property('controller.content.masterComponentHosts'), - secondaryNameNode: function () { - var sn = this.get('controller.content.masterComponentHosts').findProperty('component', "SECONDARY_NAMENODE"); - return Em.I18n.t('admin.highAvailability.wizard.step3.sn').format(sn.hostName); - }.property('controller.content.masterComponentHosts'), - journalNodes: function () { - return this.get('controller.content.masterComponentHosts').filterProperty('component', "JOURNALNODE"); - }.property('controller.content.masterComponentHosts') + templateName: require('templates/main/admin/highAvailability/step3') });
