AMBARI-4516. Hosts page filter: label changes. (onechiporenko)

ambari-web/app/messages.js

@@ -65,6 +65,7 @@ Em.I18n.translations = {
   'common.remove':'Remove',
   'common.retry':'Retry',
   'common.skip':'Skip',
+  'common.filter': 'Filter',
   'common.rollBack':'Rollback',
   'common.show':'Show',
   'common.hide':'Hide',
@@ -1740,7 +1741,6 @@ Em.I18n.translations = {
   'apps.avgTable.duration': 'Duration',
   'apps.avgTable.oldest': 'Oldest',
   'apps.avgTable.mostRecent': 'Most Recent',
-  'apps.filters.filter': 'Filter',
   'apps.filters.customRunDate':'Run Date custom filter',
   'apps.filters.nothingToShow': 'No jobs to display',
   'apps.filters.filterComponents': 'Filter by <strong>Component</strong>',

ambari-web/app/styles/application.less

@@ -2653,6 +2653,16 @@ table.graphs {
     }
   }
 
+  .filters-label {
+    display: block;
+    float: left;
+    padding-right: 10px;
+  }
+  .icon-question-sign {
+    color:#FFD13D;
+  }
+
+
   #hosts-table {
     margin-top: 10px;
     margin-bottom: 10px;
@@ -2786,7 +2796,6 @@ table.graphs {
       background-image: none !important;
       display: inline !important;
       float: none !important;
-      color:#FFD13D;
     }
   }
   .passive-state {

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

@@ -26,9 +26,12 @@
       {{#view view.statusFilter categoriesBinding="view.categories"}}
         <div class="btn-group display-inline-block">
           <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-            <span {{bindAttr class="view.class"}}></span>
+            <span class="filters-label">{{t common.filter}}: </span>
+            <span>
+              <span {{bindAttr class="view.class"}}></span>
               {{view.comboBoxLabel}}
-            <span class="caret"></span>
+              <span class="caret"></span>
+            </span>
           </a>
           <ul class="dropdown-menu">
             <li {{bindAttr class=":category-item view.filtersUsed::active"}}>

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

@@ -16,7 +16,7 @@
 * limitations under the License.
 }}
 
-<button class="btn single-btn-group filter-btn" {{action "clickFilterButton" target="view"}}>{{t apps.filters.filter}} <i class="icon-filter"></i></button>
+<button class="btn single-btn-group filter-btn" {{action "clickFilterButton" target="view"}}>{{t common.filter}} <i class="icon-filter"></i></button>
     <ul class="dropdown-menu filter-components">
       <li id="title-bar">{{t apps.filters.filterComponents}}
         <a class="close" {{action "closeFilter" target="view"}}>X</a>

ambari-web/app/views/main/host.js

@@ -449,6 +449,7 @@ App.MainHostView = App.TableView.extend({
         });
       }
       else {
+        this.get('parentView').updateFilter(0, '', 'string');
         this.get('categories').filterProperty('isHealthStatus', false).forEach(function(c) {
           if (c.get('column') === category.get('column')) {
             self.get('parentView').updateFilter(category.get('column'), category.get('filterValue'), category.get('type'));