[01/11] ambari git commit: AMBARI-17518. improve resourcemanager HA description (wang yaoxin via ncole)

2016-09-19 Thread ncole 
Repository: ambari
Updated Branches:
  refs/heads/branch-dev-patch-upgrade e2085dd6f -> 79e678653


AMBARI-17518. improve resourcemanager HA description (wang yaoxin via ncole)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 9dbf079d957b2b449030a1efa95b77614a3f1ea2
Parents: 9dbcac6
Author: Nate Cole 
Authored: Fri Sep 16 11:04:09 2016 -0400
Committer: Nate Cole 
Committed: Fri Sep 16 11:04:09 2016 -0400

--
 ambari-web/app/models/host_component.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9dbf079d/ambari-web/app/models/host_component.js
--
diff --git a/ambari-web/app/models/host_component.js 
b/ambari-web/app/models/host_component.js
index dca7ff0..11ea659 100644
--- a/ambari-web/app/models/host_component.js
+++ b/ambari-web/app/models/host_component.js
@@ -330,8 +330,8 @@ App.HostComponentActionMap = {
   },
   TOGGLE_RM_HA: {
 action: 'enableRMHighAvailability',
-label: Em.I18n.t('admin.rm_highAvailability.button.enable'),
-cssClass: 'icon-arrow-up',
+label: App.get('isRMHaEnabled') ? 
Em.I18n.t('admin.rm_highAvailability.button.disable') : 
Em.I18n.t('admin.rm_highAvailability.button.enable'),
+cssClass: App.get('isRMHaEnabled') ? 'icon-arrow-down' : 
'icon-arrow-up',
 isHidden: App.get('isRMHaEnabled'),
 disabled: App.get('isSingleNode') || !RM || RM.get('isNotInstalled')
   },

ambari git commit: AMBARI-17518. improve resourcemanager HA description (wang yaoxin via ncole)

2016-09-16 Thread ncole 
Repository: ambari
Updated Branches:
  refs/heads/trunk 9dbcac6d5 -> 9dbf079d9


AMBARI-17518. improve resourcemanager HA description (wang yaoxin via ncole)


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

Branch: refs/heads/trunk
Commit: 9dbf079d957b2b449030a1efa95b77614a3f1ea2
Parents: 9dbcac6
Author: Nate Cole 
Authored: Fri Sep 16 11:04:09 2016 -0400
Committer: Nate Cole 
Committed: Fri Sep 16 11:04:09 2016 -0400

--
 ambari-web/app/models/host_component.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9dbf079d/ambari-web/app/models/host_component.js
--
diff --git a/ambari-web/app/models/host_component.js 
b/ambari-web/app/models/host_component.js
index dca7ff0..11ea659 100644
--- a/ambari-web/app/models/host_component.js
+++ b/ambari-web/app/models/host_component.js
@@ -330,8 +330,8 @@ App.HostComponentActionMap = {
   },
   TOGGLE_RM_HA: {
 action: 'enableRMHighAvailability',
-label: Em.I18n.t('admin.rm_highAvailability.button.enable'),
-cssClass: 'icon-arrow-up',
+label: App.get('isRMHaEnabled') ? 
Em.I18n.t('admin.rm_highAvailability.button.disable') : 
Em.I18n.t('admin.rm_highAvailability.button.enable'),
+cssClass: App.get('isRMHaEnabled') ? 'icon-arrow-down' : 
'icon-arrow-up',
 isHidden: App.get('isRMHaEnabled'),
 disabled: App.get('isSingleNode') || !RM || RM.get('isNotInstalled')
   },