ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject [1/2] git commit: AMBARI-4552 OOS status for component on host detail page makes button too big. (ababiichuk)
Date Fri, 07 Feb 2014 12:14:07 GMT
Updated Branches:
  refs/heads/trunk c9202e26c -> 522b6d2ea


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/522b6d2e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/522b6d2e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/522b6d2e

Branch: refs/heads/trunk
Commit: 522b6d2ea8b1c3fc8bf7fcd948ab38bf3856e3aa
Parents: 2e88be4
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Fri Feb 7 14:10:37 2014 +0200
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Fri Feb 7 14:10:50 2014 +0200

----------------------------------------------------------------------
 ambari-web/app/messages.js                                    | 1 +
 ambari-web/app/styles/application.less                        | 2 +-
 ambari-web/app/templates/main/host/details/host_component.hbs | 2 +-
 ambari-web/app/views/main/host/details/host_component_view.js | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/522b6d2e/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 5a9c796..344697a 100644
--- a/ambari-web/app/messages.js
+++ b/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.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.short.mode':'Out of Service',
   'hosts.host.passive.mode':'Host is in Out-of-Service mode',
   'hosts.host.alert.noAlerts':'No alerts',
   'hosts.host.alert.noAlerts.message':'There are no alerts for this host.',

http://git-wip-us.apache.org/repos/asf/ambari/blob/522b6d2e/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 86dc5a4..1645ac6 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -4384,7 +4384,7 @@ ul.inline li {
 /* TIME RANGE WIDGET END */
 
 #host-details .host-components .btn-group > .btn {
-  min-width: 130px;
+  width: 130px;
 }
 
 #host-details > .host-maintenance {

http://git-wip-us.apache.org/repos/asf/ambari/blob/522b6d2e/ambari-web/app/templates/main/host/details/host_component.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/details/host_component.hbs b/ambari-web/app/templates/main/host/details/host_component.hbs
index 945d2c3..a4973c9 100644
--- a/ambari-web/app/templates/main/host/details/host_component.hbs
+++ b/ambari-web/app/templates/main/host/details/host_component.hbs
@@ -24,7 +24,7 @@
       </a>
     {{/if}}
   {{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 component.displayNameAdvanced}}
     {{component.displayNameAdvanced}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/522b6d2e/ambari-web/app/views/main/host/details/host_component_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host/details/host_component_view.js b/ambari-web/app/views/main/host/details/host_component_view.js
index ab78d92..b515b18 100644
--- a/ambari-web/app/views/main/host/details/host_component_view.js
+++ b/ambari-web/app/views/main/host/details/host_component_view.js
@@ -74,7 +74,7 @@ App.HostComponentView = Em.View.extend({
    */
   componentTextStatus: function () {
     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 componentTextStatus = this.get('content.componentTextStatus');


Mime
View raw message