ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiw...@apache.org
Subject [2/2] git commit: AMBARI-3733_2. Register Host: need to check host OS type if specific os group been selected at Advanced Repo in step1. (xiwang)
Date Tue, 12 Nov 2013 01:46:30 GMT
AMBARI-3733_2. Register Host: need to check host OS type if specific os group been selected
at Advanced Repo in step1. (xiwang)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/5b4b5450
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/5b4b5450
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/5b4b5450

Branch: refs/heads/trunk
Commit: 5b4b545073901d414a48e0629ae3ab616e26a927
Parents: 1765b08
Author: Xi Wang <xiwang@apache.org>
Authored: Mon Nov 11 16:36:17 2013 -0800
Committer: Xi Wang <xiwang@apache.org>
Committed: Mon Nov 11 16:36:17 2013 -0800

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step3_controller.js | 2 +-
 ambari-web/app/messages.js                            | 3 ++-
 ambari-web/app/templates/common/modal_popup.hbs       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5b4b5450/ambari-web/app/controllers/wizard/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js
index 1078d06..3c10bdc 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -562,7 +562,7 @@ App.WizardStep3Controller = Em.Controller.extend({
     });
     if (hostsContext.length > 0) { // warning exist
       var repoWarning = {
-        name: 'Repository for OS not available',
+        name: Em.I18n.t('installer.step3.hostWarningsPopup.repositories.name'),
         hosts: hostsContext,
         category: 'repositories',
         onSingleHost: false

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5b4b5450/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 019be0a..f92d2b7 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -348,7 +348,7 @@ Em.I18n.translations = {
   'installer.step3.hosts.remove.popup.body':'Are you sure you want to remove the selected
host(s)?',
   'installer.step3.hostInformation.popup.header':'Error in retrieving host Information',
   'installer.step3.hostInformation.popup.body' : 'All bootstrapped hosts registered but unable
to retrieve cpu and memory related information',
-  'installer.step3.hostOsTypeCheck.popup.body' : 'Host registered successfully, but the host
operating system type NOT match the selected group in step 1:Advanced Repository Option.<br>
You can go back to step 1 OR remove this host. <br>' +
+  'installer.step3.hostOsTypeCheck.popup.body' : 'Host registered successfully, but the host
operating system type NOT match the selected group in "Select Stack" step: Advanced Repository
Option. You can go back to "Select Stack" step OR remove this host.' +
     'The host type is {0}, but you selected group {1} in step 1.',
   'installer.step3.hostWarningsPopup.report':'Show Report',
   'installer.step3.hostWarningsPopup.report.header': '<p style="font-family: monospace">######################################<br>#
Host Checks Report<br>#<br># Generated: ',
@@ -367,6 +367,7 @@ Em.I18n.translations = {
   'installer.step3.hostWarningsPopup.summary':'{0} on {1}',
   'installer.step3.hostWarningsPopup.firewall':'Firewall Issues',
   'installer.step3.hostWarningsPopup.repositories':'Repositories Issues',
+  'installer.step3.hostWarningsPopup.repositories.name':'Repository for OS not available',
   'installer.step3.hostWarningsPopup.repositories.context':'Host ({0}) has a {1} OS type,
But the repositories chosen in "Select Stack" step was {2}.',
   'installer.step3.hostWarningsPopup.repositories.message':'The following registered hosts
have different Operating System types from the local repositories chosen in "Select Stack"
step. You can go back to "Select Stack" step to select another os group OR remove related
host.',
   'installer.step3.hostWarningsPopup.firewall.message':'Firewall is running on the following
hosts. Please configure the firewall to allow communications on the ports documented in the
<i>Configuring Ports</i> section of  the <a target=\"_blank\" href=\"http://incubator.apache.org/ambari/current/installing-hadoop-using-ambari/content/\">Ambari
documentation</a>',

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5b4b5450/ambari-web/app/templates/common/modal_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popup.hbs b/ambari-web/app/templates/common/modal_popup.hbs
index a846231..1d7a0f8 100644
--- a/ambari-web/app/templates/common/modal_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popup.hbs
@@ -49,7 +49,7 @@
       <div class="modal-footer">
         {{#if view.hasFooterCheckbox}}
           <label id="footer-checkbox">{{view Ember.Checkbox classNames="checkbox" checkedBinding="view.isNotShowBgChecked"}}
&nbsp;
-          {{t admin.userSettings.notShowBgOperations}}</label>
+          {{t app.settings.notShowBgOperations}}</label>
         {{/if}}
         {{#if view.secondary}}
           <a class="btn" {{action onSecondary target="view"}}>{{view.secondary}}</a>


Mime
View raw message