ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject git commit: AMBARI-4603 Host names goes under text, icons. (ababiichuk)
Date Tue, 11 Feb 2014 15:08:23 GMT
Updated Branches:
  refs/heads/trunk 776a39ebd -> 2ebdc7f15


AMBARI-4603 Host names goes under text, icons. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: 2ebdc7f15ec465883570374b9659ddc5dbfed9c9
Parents: 776a39e
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Tue Feb 11 17:06:07 2014 +0200
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Tue Feb 11 17:06:21 2014 +0200

----------------------------------------------------------------------
 ambari-web/app/models/host.js                                | 8 --------
 ambari-web/app/styles/application.less                       | 7 +++++++
 ambari-web/app/templates/main/host.hbs                       | 4 +++-
 .../main/service/info/summary/master_components.hbs          | 2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2ebdc7f1/ambari-web/app/models/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/host.js b/ambari-web/app/models/host.js
index 9eebda6..d392498 100644
--- a/ambari-web/app/models/host.js
+++ b/ambari-web/app/models/host.js
@@ -98,14 +98,6 @@ App.Host = DS.Model.extend({
   }.property('hostComponents.@each.passiveState'),
 
   /**
-   * Truncate hostName if it longer than 43 symbols
-   * @returns {String}
-   */
-  publicHostNameFormatted: function() {
-    return this.get('publicHostName').length < 43 ? this.get('publicHostName') : this.get('publicHostName').substr(0,
40) + '...';
-  }.property('publicHostName'),
-
-  /**
    * Count of mounted on host disks
    * @returns {Number}
    */

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ebdc7f1/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 4b68944..719c876 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2929,6 +2929,13 @@ table.graphs {
       overflow-wrap: break-word;
       white-space: nowrap;
     }
+    td.name .trim_hostname{
+      display: block;
+      float: left;
+      width: 90%!important;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
     th.first, td.first {
       border-left-width: 1px;
     }

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ebdc7f1/ambari-web/app/templates/main/host.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host.hbs b/ambari-web/app/templates/main/host.hbs
index 848c710..6a7e962 100644
--- a/ambari-web/app/templates/main/host.hbs
+++ b/ambari-web/app/templates/main/host.hbs
@@ -98,7 +98,9 @@
           </td>
 
           <td class="name">
-            <a title="{{unbound host.publicHostName}}" href="#" {{action "showDetails"
host}}>{{unbound host.publicHostNameFormatted}}</a>
+            <span class="trim_hostname">
+              <a title="{{unbound host.publicHostName}}" href="#" {{action "showDetails"
host}}>{{unbound host.publicHostName}}</a>
+            </span>
             {{#if host.criticalAlertsCount}}
               <span class="label label-important alerts-count" {{action "showAlertsPopup"
host target="controller"}}>{{host.criticalAlertsCount}}</span>
             {{/if}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/2ebdc7f1/ambari-web/app/templates/main/service/info/summary/master_components.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/summary/master_components.hbs b/ambari-web/app/templates/main/service/info/summary/master_components.hbs
index 0a0e62d..44d901b 100644
--- a/ambari-web/app/templates/main/service/info/summary/master_components.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/master_components.hbs
@@ -19,7 +19,7 @@
 {{#each masterComp in view.mastersComp}}
   <tr>
      <td>
-      <a href="#" {{action showDetails masterComp.host}} title="{{unbound masterComp.host.publicHostNameFormatted}}"
rel="UsageTooltip">
+      <a href="#" {{action showDetails masterComp.host}} title="{{unbound masterComp.host.publicHostName}}"
rel="UsageTooltip">
        {{#if masterComp.displayNameAdvanced}}
          {{masterComp.displayNameAdvanced}}
        {{else}}


Mime
View raw message