浏览代码

AMBARI-11077. Kerb: wizard should use non-button undo icon (alexantonenko)

Alex Antonenko 10 年之前
父节点
当前提交
bd8a5f98df

+ 4 - 0
ambari-web/app/styles/application.less

@@ -480,6 +480,10 @@ h1 {
   }
 }
 
+.btn-small {
+  text-decoration: none !important;
+}
+
 .hide {
   visibility: hidden;
 }

+ 1 - 1
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}}

+ 2 - 2
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}}

+ 2 - 2
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>

+ 5 - 5
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>

+ 1 - 1
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}}

+ 1 - 1
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}}

+ 1 - 1
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