Repository: ambari Updated Branches: refs/heads/trunk 3eddc800d -> 221506eaa
AMBARI-6947. Remove HA category from 'Admin' tab. (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/221506ea Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/221506ea Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/221506ea Branch: refs/heads/trunk Commit: 221506eaa6f2ec17a46c1c786580c5da5ce80691 Parents: 3eddc80 Author: Aleksandr Kovalenko <akovale...@hortonworks.com> Authored: Wed Aug 20 19:59:32 2014 +0300 Committer: Aleksandr Kovalenko <akovale...@hortonworks.com> Committed: Wed Aug 20 19:59:32 2014 +0300 ---------------------------------------------------------------------- ambari-web/app/utils/host_progress_popup.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/221506ea/ambari-web/app/utils/host_progress_popup.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/host_progress_popup.js b/ambari-web/app/utils/host_progress_popup.js index 724f131..c78fbdb 100644 --- a/ambari-web/app/utils/host_progress_popup.js +++ b/ambari-web/app/utils/host_progress_popup.js @@ -70,7 +70,7 @@ App.HostPopup = Em.Object.create({ abortIcon: Em.View.extend({ tagName: 'i', - classNames: ['abort-icon', 'icon-remove-circle'], + classNames: ['abort-icon', 'icon-remove-circle', 'pointer'], click: function () { this.get('controller').abortRequest(this.get('servicesInfo')); return false; @@ -657,9 +657,9 @@ App.HostPopup = Em.Object.create({ headerClass: Em.View.extend({ controller: this, template: Ember.Handlebars.compile('{{popupHeaderName}} ' + - '{{#if App.supports.abortRequests}}{{#unless view.parentView.isHostListHidden}}' + + '{{#if App.supports.abortRequests}}{{#unless view.parentView.isHostListHidden}}{{#if controller.operationInfo.isAbortable}}' + '{{view controller.abortIcon servicesInfoBinding="controller.operationInfo"}}' + - '{{/unless}}{{/if}}') + '{{/if}}{{/unless}}{{/if}}') }), /**