Repository: ambari Updated Branches: refs/heads/trunk 807b3b25c -> adb1ca450
AMBARI-17141 "Settings" button shown to cluster administrator, second patch (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/adb1ca45 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/adb1ca45 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/adb1ca45 Branch: refs/heads/trunk Commit: adb1ca4509f6fe15ec3f8cbd04842ebb58aca5ff Parents: 807b3b2 Author: Andrii Tkach <[email protected]> Authored: Fri Jun 10 14:06:41 2016 +0300 Committer: Andrii Tkach <[email protected]> Committed: Fri Jun 10 17:17:55 2016 +0300 ---------------------------------------------------------------------- .../common/host_progress_popup_footer.hbs | 30 ++++++++++++++++++++ ambari-web/app/templates/common/modal_popup.hbs | 4 --- ambari-web/app/utils/host_progress_popup.js | 8 ++++++ 3 files changed, 38 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/adb1ca45/ambari-web/app/templates/common/host_progress_popup_footer.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/host_progress_popup_footer.hbs b/ambari-web/app/templates/common/host_progress_popup_footer.hbs new file mode 100644 index 0000000..a3160f7 --- /dev/null +++ b/ambari-web/app/templates/common/host_progress_popup_footer.hbs @@ -0,0 +1,30 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} + +{{#isAuthorized "AMBARI.MANAGE_SETTINGS"}} + <label id="footer-checkbox">{{view Ember.Checkbox classNames="checkbox" checkedBinding="view.parentView.isNotShowBgChecked"}} + {{t app.settings.notShowBgOperations}}</label> +{{/isAuthorized}} +{{#if view.parentView.primary}} + <button {{bindAttr + disabled="view.parentView.disablePrimary" + class=":btn view.parentView.primaryClass"}} + {{action onPrimary target="view.parentView"}}> + {{view.parentView.primary}} + </button> +{{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/adb1ca45/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 2e6d13e..1d67a41 100644 --- a/ambari-web/app/templates/common/modal_popup.hbs +++ b/ambari-web/app/templates/common/modal_popup.hbs @@ -47,10 +47,6 @@ {{view view.footerClass}} {{else}} <div class="modal-footer"> - {{#isAuthorized "AMBARI.MANAGE_SETTINGS"}} - <label id="footer-checkbox">{{view Ember.Checkbox classNames="checkbox" checkedBinding="view.isNotShowBgChecked"}} - {{t app.settings.notShowBgOperations}}</label> - {{/isAuthorized}} {{#if view.third}} <button {{bindAttr disabled="view.disableThird" class=":btn view.thirdClass"}} {{action onThird target="view"}}>{{view.third}}</button> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/adb1ca45/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 6e0dd2f..a29aee5 100644 --- a/ambari-web/app/utils/host_progress_popup.js +++ b/ambari-web/app/utils/host_progress_popup.js @@ -846,6 +846,14 @@ App.HostPopup = Em.Object.create({ }), /** + * @type {Em.View} + */ + footerClass: Em.View.extend({ + classNames: ["modal-footer"], + templateName: require('templates/common/host_progress_popup_footer') + }), + + /** * @type {String[]} */ classNames: ['sixty-percent-width-modal', 'host-progress-popup', 'full-height-modal'],
