AMBARI-3784. Host page UI tweaks. (Jeff Sposetti via yusaku)

ambari-web/app/messages.js

@@ -1605,10 +1605,11 @@ Em.I18n.translations = {
   'apps.avgTable.mostRecent': 'Most Recent',
   'apps.filters.all': 'All',
   'apps.filters.filtered': 'Filtered',
+  'apps.filters.filter': 'Filter',
   'apps.filters.clearFilters': 'Clear filters',
   'apps.filters.paginationInfo': '{0} - {1} of {2}',
-  'apps.filters.clearAllFilters': 'Clear filters',
-  'apps.filters.filteredHostsInfo': '{0} of {1} hosts showing',
+  'apps.filters.clearAllFilters': 'clear filters',
+  'apps.filters.filteredHostsInfo': '{0} of {1} hosts showing - ',
   'apps.filters.customRunDate':'Run Date custom filter',
   'apps.filters.nothingToShow': 'No jobs to display',
   'apps.dagCharts.popup':'Job Charts',

ambari-web/app/templates/main/host.hbs

@@ -28,12 +28,12 @@
         {{#each category in view.categories}}
           {{#if category.isVisible}}
             |
-            <span {{bindAttr class=":category-item category.itemClass"}}>
+            <span {{bindAttr class="aaa :category-item category.itemClass"}}>
               <a {{action selectCategory category target="view"}} href="#">
                 {{#if category.alerts}}
                   <span class="label label-important">{{t hosts.host.alerts.st}}</span>
                 {{else}}
-                  <span {{bindAttr class="category.healthStatusValue"}}> &nbsp;&nbsp;&nbsp; </span>
+                  <span {{bindAttr class=":health-status category.healthStatusValue"}}> &nbsp;&nbsp;&nbsp; </span>
                 {{/if}}
                 {{category.label}}
               </a>
@@ -55,8 +55,7 @@
 
   <table class="datatable table table-bordered table-striped" id="hosts-table">
     <thead>
-    <tr>
-        {{#view view.sortView contentBinding="view.filteredContent"}}
+        {{#view view.sortView classNames="label-row" contentBinding="view.filteredContent"}}
           <th class="first"> </th>
           {{view view.parentView.nameSort}}
           {{view view.parentView.ipSort}}
@@ -65,9 +64,8 @@
           {{view view.parentView.diskUsageSort}}
           {{view view.parentView.loadAvgSort}}
           <th>{{t common.components}}</th>
-        {{/view}}
-    </tr>
-    <tr>
+      {{/view}}
+    <tr id="filter-row">
       <th class="first"> </th>
       <th>{{view view.nameFilterView}}</th>
       <th>{{view view.ipFilterView}}</th>
@@ -125,7 +123,7 @@
 
   <div class="page-bar">
     <div class="filtered-hosts-info span4">
-      <label>{{view.filteredHostsInfo}} &nbsp; <a {{action clearFilters target="view"}} href="#">{{t apps.filters.clearAllFilters}}</a></label>
+      <label>{{view.filteredHostsInfo}} <a {{action clearFilters target="view"}} href="#">{{t apps.filters.clearAllFilters}}</a></label>
     </div>
     <div class="items-on-page">
       <label>{{t common.show}}: {{view view.rowsPerPageSelectView selectionBinding="view.displayLength"}}</label>

ambari-web/app/templates/main/host/component_filter.hbs

@@ -16,9 +16,7 @@
 * limitations under the License.
 }}
 
-    <button class="btn btn-info single-btn-group" {{action "clickFilterButton" target="view"}}>
-        {{t common.components}} <span class="caret"></span>
-    </button>
+    <button class="btn single-btn-group filter-btn" {{action "clickFilterButton" target="view"}}><i class="icon-filter"></i> {{t apps.filters.filter}}</button>
     <ul class="dropdown-menu filter-components">
         <li>
             <ul>