소스 검색

AMBARI-4552 OOS status for component on host detail page makes button too big. (ababiichuk)

aBabiichuk 11 년 전
부모
커밋
522b6d2ea8

+ 1 - 0
ambari-web/app/messages.js

@@ -1441,6 +1441,7 @@ Em.I18n.translations = {
   'hosts.component.passive.implied.host.mode.tooltip':'Cannot Turn Off Out-of-Service mode because Host is in Out-of-Service mode',
   'hosts.component.passive.implied.host.mode.tooltip':'Cannot Turn Off Out-of-Service mode because Host is in Out-of-Service mode',
   'hosts.component.passive.implied.service.mode.tooltip':'Cannot Turn Off Out-of-Service mode because {0} is in Out-of-Service mode',
   'hosts.component.passive.implied.service.mode.tooltip':'Cannot Turn Off Out-of-Service mode because {0} is in Out-of-Service mode',
   'hosts.component.passive.mode':'Component is in Out-of-Service mode',
   'hosts.component.passive.mode':'Component is in Out-of-Service mode',
+  'hosts.component.passive.short.mode':'Out of Service',
   'hosts.host.passive.mode':'Host is in Out-of-Service mode',
   'hosts.host.passive.mode':'Host is in Out-of-Service mode',
   'hosts.host.alert.noAlerts':'No alerts',
   'hosts.host.alert.noAlerts':'No alerts',
   'hosts.host.alert.noAlerts.message':'There are no alerts for this host.',
   'hosts.host.alert.noAlerts.message':'There are no alerts for this host.',

+ 1 - 1
ambari-web/app/styles/application.less

@@ -4384,7 +4384,7 @@ ul.inline li {
 /* TIME RANGE WIDGET END */
 /* TIME RANGE WIDGET END */
 
 
 #host-details .host-components .btn-group > .btn {
 #host-details .host-components .btn-group > .btn {
-  min-width: 130px;
+  width: 130px;
 }
 }
 
 
 #host-details > .host-maintenance {
 #host-details > .host-maintenance {

+ 1 - 1
ambari-web/app/templates/main/host/details/host_component.hbs

@@ -24,7 +24,7 @@
       </a>
       </a>
     {{/if}}
     {{/if}}
   {{else}}
   {{else}}
-    <span rel='componentHealthTooltip' {{bindAttr class="view.statusClass :components-health" title="view.componentTextStatus"}}></span>&nbsp;
+    <span rel='componentHealthTooltip' {{bindAttr class="view.statusClass :components-health" data-original-title="view.componentTextStatus"}}></span>&nbsp;
   {{/if}}
   {{/if}}
   {{#if component.displayNameAdvanced}}
   {{#if component.displayNameAdvanced}}
     {{component.displayNameAdvanced}}
     {{component.displayNameAdvanced}}

+ 1 - 1
ambari-web/app/views/main/host/details/host_component_view.js

@@ -74,7 +74,7 @@ App.HostComponentView = Em.View.extend({
    */
    */
   componentTextStatus: function () {
   componentTextStatus: function () {
     if (this.get('content.passiveState') != 'ACTIVE') {
     if (this.get('content.passiveState') != 'ACTIVE') {
-      return Em.I18n.t('hosts.component.passive.mode');
+      return Em.I18n.t('hosts.component.passive.short.mode');
     }
     }
     var workStatus = this.get("workStatus");
     var workStatus = this.get("workStatus");
     var componentTextStatus = this.get('content.componentTextStatus');
     var componentTextStatus = this.get('content.componentTextStatus');