AMBARI-11077. Kerb: wizard should use non-button undo icon (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bd8a5f98 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bd8a5f98 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bd8a5f98 Branch: refs/heads/trunk Commit: bd8a5f98df2ec403480122a10b1d60d38f7507cc Parents: 81a3eeb Author: Alex Antonenko <hiv...@gmail.com> Authored: Tue May 12 20:46:01 2015 +0300 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Tue May 12 23:48:37 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 4 ++++ .../app/templates/common/configs/compare_property.hbs | 2 +- .../templates/common/configs/notifications_configs.hbs | 4 ++-- .../app/templates/common/configs/overriddenProperty.hbs | 4 ++-- .../templates/common/configs/service_config_category.hbs | 10 +++++----- .../widgets/comparison/config_widget_comparison.hbs | 2 +- .../templates/main/alerts/create_alert_notification.hbs | 2 +- ambari-web/app/views/common/controls_view.js | 2 +- 8 files changed, 17 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bd8a5f98/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 1e8e6d4..806d356 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -480,6 +480,10 @@ h1 { } } +.btn-small { + text-decoration: none !important; +} + .hide { visibility: hidden; } http://git-wip-us.apache.org/repos/asf/ambari/blob/bd8a5f98/ambari-web/app/templates/common/configs/compare_property.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/compare_property.hbs b/ambari-web/app/templates/common/configs/compare_property.hbs index a5e17dd..f593825 100644 --- a/ambari-web/app/templates/common/configs/compare_property.hbs +++ b/ambari-web/app/templates/common/configs/compare_property.hbs @@ -25,7 +25,7 @@ {{/if}} {{#unless compareConfig.isMock}} {{#if compareConfig.supportsFinal}} - <a disabled="disabled" {{bindAttr class=":btn :btn-small :btn-final compareConfig.isFinal:active compareConfig.hideFinalIcon:hidden" }}> + <a disabled="disabled" {{bindAttr class=":btn-small :btn-final compareConfig.isFinal:active compareConfig.hideFinalIcon:hidden" }}> <i class="icon-lock"></i> </a> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/bd8a5f98/ambari-web/app/templates/common/configs/notifications_configs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/notifications_configs.hbs b/ambari-web/app/templates/common/configs/notifications_configs.hbs index 27d1820..d58d076 100644 --- a/ambari-web/app/templates/common/configs/notifications_configs.hbs +++ b/ambari-web/app/templates/common/configs/notifications_configs.hbs @@ -48,7 +48,7 @@ {{#if isRemovable}} {{#isAccessible ADMIN}} {{#unless this.isComparison}} - <a class="btn btn-small" href="#" data-toggle="tooltip" + <a class="btn-small" href="#" data-toggle="tooltip" {{action "removeProperty" this target="view"}} {{translateAttr data-original-title="common.remove"}}> <i class="icon-minus-sign"></i> @@ -71,7 +71,7 @@ <div class="entry-row indent-1"> {{view Ember.RadioButton name="tlsOrSsl" disabledBinding="view.configsAreDisabled" selectionBinding="view.tlsOrSsl" value="ssl"}} {{t installer.step7.misc.notification.use_ssl}} </div> - + {{#isAccessible ADMIN}} {{#if view.canEdit}} {{#unless view.configsAreDisabled}} http://git-wip-us.apache.org/repos/asf/ambari/blob/bd8a5f98/ambari-web/app/templates/common/configs/overriddenProperty.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/overriddenProperty.hbs b/ambari-web/app/templates/common/configs/overriddenProperty.hbs index d9d8dd2..9484f7e 100644 --- a/ambari-web/app/templates/common/configs/overriddenProperty.hbs +++ b/ambari-web/app/templates/common/configs/overriddenProperty.hbs @@ -21,7 +21,7 @@ {{view overriddenSCP.viewClass serviceConfigBinding="overriddenSCP" categoryConfigsBinding="view.categoryConfigs"}} {{#if overriddenSCP.supportsFinal}} <a href="#" data-toggle="tooltip" - {{bindAttr class=":btn :btn-small :btn-final overriddenSCP.isFinal:active overriddenSCP.hideFinalIcon:hidden" disabled="overriddenSCP.isNotEditable"}} + {{bindAttr class=":btn-small :btn-final overriddenSCP.isFinal:active overriddenSCP.hideFinalIcon:hidden" disabled="overriddenSCP.isNotEditable"}} {{action "toggleFinalFlag" overriddenSCP target="view"}} {{translateAttr data-original-title="services.service.config.final"}}> <i class="icon-lock"></i> @@ -36,7 +36,7 @@ {{else}} {{#if overriddenSCP.isEditable}} {{#if isNotDefaultValue}} - <a class="btn btn-small" href="#" data-toggle="tooltip" + <a class="btn-small" href="#" data-toggle="tooltip" {{action "doRestoreDefaultValue" overriddenSCP target="view"}} {{translateAttr data-original-title="common.undo"}}> <i class="icon-undo"></i> http://git-wip-us.apache.org/repos/asf/ambari/blob/bd8a5f98/ambari-web/app/templates/common/configs/service_config_category.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/service_config_category.hbs b/ambari-web/app/templates/common/configs/service_config_category.hbs index fbc5c2a..a69fca0 100644 --- a/ambari-web/app/templates/common/configs/service_config_category.hbs +++ b/ambari-web/app/templates/common/configs/service_config_category.hbs @@ -68,7 +68,7 @@ {{/if}} {{#if supportsFinal}} <a href="#" data-toggle="tooltip" - {{bindAttr class=":btn :btn-small :btn-final isFinal:active hideFinalIcon:hidden" disabled="isNotEditable"}} + {{bindAttr class=":btn-small :btn-final isFinal:active hideFinalIcon:hidden" disabled="isNotEditable"}} {{action "toggleFinalFlag" this target="view"}} {{translateAttr data-original-title="services.service.config.final"}}> <i class="icon-lock"></i> @@ -79,7 +79,7 @@ {{#if view.supportsHostOverrides}} {{#isAccessible ADMIN}} {{#unless this.isComparison}} - <a class="btn btn-small" href="#" data-toggle="tooltip" + <a class="btn-small" href="#" data-toggle="tooltip" {{action "createOverrideProperty" this target="view"}} {{translateAttr data-original-title="common.override"}}> <i class="icon-plus-sign"></i> @@ -90,7 +90,7 @@ {{/if}} {{#unless cantBeUndone}} {{#if isNotDefaultValue}} - <a class="btn btn-small" href="#" data-toggle="tooltip" + <a class="btn-small" href="#" data-toggle="tooltip" {{action "doRestoreDefaultValue" this target="view"}} {{translateAttr data-original-title="common.undo"}}> <i class="icon-undo"></i> @@ -100,7 +100,7 @@ {{#if isRemovable}} {{#isAccessible ADMIN}} {{#unless this.isComparison}} - <a class="btn btn-small" href="#" data-toggle="tooltip" + <a class="btn-small" href="#" data-toggle="tooltip" {{action "removeProperty" this target="view"}} {{translateAttr data-original-title="common.remove"}}> <i class="icon-minus-sign"></i> @@ -118,7 +118,7 @@ {{/unless}} {{#if isEditable}} {{#if recommendedValueExists}} - <a class="btn btn-small" href="#" data-toggle="tooltip" + <a class="btn-small" href="#" data-toggle="tooltip" {{action "setRecommendedValue" this target="view"}} {{translateAttr data-original-title="services.service.config.setRecommendedValue"}}> <i class="icon-repeat"></i> http://git-wip-us.apache.org/repos/asf/ambari/blob/bd8a5f98/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs b/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs index f5860f3..cab83c3 100644 --- a/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs +++ b/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs @@ -27,7 +27,7 @@ {{/if}} {{#unless compareConfig.isMock}} {{#if compareConfig.supportsFinal}} - <a disabled="disabled" {{bindAttr class=":btn :btn-small :btn-final compareConfig.isFinal:active compareConfig.hideFinalIcon:hidden" }}> + <a disabled="disabled" {{bindAttr class=":btn-small :btn-final compareConfig.isFinal:active compareConfig.hideFinalIcon:hidden" }}> <i class="icon-lock"></i> </a> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/bd8a5f98/ambari-web/app/templates/main/alerts/create_alert_notification.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/create_alert_notification.hbs b/ambari-web/app/templates/main/alerts/create_alert_notification.hbs index 647ba98..0a83f63 100644 --- a/ambari-web/app/templates/main/alerts/create_alert_notification.hbs +++ b/ambari-web/app/templates/main/alerts/create_alert_notification.hbs @@ -242,7 +242,7 @@ <div class="controls"> {{view Em.TextField valueBinding="customProperty.value" class="input-xlarge"}} - <a href="#" {{action "removeCustomPropertyHandler" customProperty target="controller"}} class="btn btn-small"><span class="icon-minus-sign"></span></a> + <a href="#" {{action "removeCustomPropertyHandler" customProperty target="controller"}} class="btn-small"><span class="icon-minus-sign"></span></a> </div> </div> {{/each}} http://git-wip-us.apache.org/repos/asf/ambari/blob/bd8a5f98/ambari-web/app/views/common/controls_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js index 2b29ebc..3bafde1 100644 --- a/ambari-web/app/views/common/controls_view.js +++ b/ambari-web/app/views/common/controls_view.js @@ -1576,7 +1576,7 @@ App.CheckDBConnectionView = Ember.View.extend({ */ App.BaseUrlTextField = Ember.TextField.extend({ - layout: Ember.Handlebars.compile('<div class="pull-left">{{yield}}</div> {{#if view.valueWasChanged}}<div class="pull-right"><a class="btn btn-small" {{action "restoreValue" target="view"}}><i class="icon-undo"></i></a></div>{{/if}}'), + layout: Ember.Handlebars.compile('<div class="pull-left">{{yield}}</div> {{#if view.valueWasChanged}}<div class="pull-right"><a class="btn-small" {{action "restoreValue" target="view"}}><i class="icon-undo"></i></a></div>{{/if}}'), /** * Binding in the template
