Browse Source

AMBARI-8975. Alerts UI: Groups dialog Notifications cleanup. (akovalenko)

Aleksandr Kovalenko 10 years ago
parent
commit
c4fceabbc4

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

@@ -1910,6 +1910,8 @@ Em.I18n.translations = {
 
   'hosts.filters.clearSelection': 'clear selection',
 
+  'hosts.filters.filterComponents': 'Filter by <strong>Component</strong>',
+
   'hosts.table.restartComponents.withNames':'Restart {0}',
   'hosts.table.restartComponents.withoutNames':'{0} components should be restarted',
 

+ 6 - 0
ambari-web/app/styles/common.less

@@ -58,11 +58,17 @@
   max-width: 100%;
   white-space: nowrap;
   position: relative;
+  a {
+    color: #555;
+  }
 }
 
 .editable-list-container.edit-mode .items-box ul.items-list li.item.deletable{
   padding-right: 25px;
 }
+.editable-list-container .items-box ul.items-list li.item.global{
+  background-color: #f5f5f5;
+}
 
 .editable-list-container .items-box ul.items-list li.item .close{
   margin: -2px 0 0 5px;

+ 1 - 1
ambari-web/app/templates/common/editable_list.hbs

@@ -20,7 +20,7 @@
   <div class="items-box" {{action enableEditMode target="view"}}>
     <ul class="items-list">
       {{#each item in view.items}}
-        <li {{bindAttr class=":item item.global::deletable"}}>
+        <li {{bindAttr class=":item item.global:global:deletable"}}>
           <span>
             <a href>{{item.name}}</a>
             {{#unless item.global}}

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

@@ -18,7 +18,7 @@
 
 <button class="btn single-btn-group filter-btn" id="host-components-filter-button" {{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}}
+      <li id="title-bar">{{t hosts.filters.filterComponents}}
         <a class="close" {{action "closeFilter" target="view"}}>X</a>
       </li>
       <li id="list-area">

+ 8 - 7
ambari-web/app/views/common/editable_list.js

@@ -23,7 +23,7 @@ App.EditableList = Ember.View.extend({
   templateName: require('templates/common/editable_list'),
 
   items: [], // items show on list
-  resources: [], // originial resources including all items
+  resources: [], // original resources including all items
   itemsOriginal: [], //backup of items
 
   editMode: false,
@@ -31,6 +31,13 @@ App.EditableList = Ember.View.extend({
   typeahead: [],
   selectedTypeahed: 0,
 
+  init: function () {
+    this._super();
+    this.set('itemsOriginal', Em.copy(this.get('items')));
+    this.set('input', '');
+    this.set('editMode', false);
+  },
+
   onPrimary: function (event) {
     this.set('editMode', false);
     this.set('input', '');
@@ -57,12 +64,6 @@ App.EditableList = Ember.View.extend({
     this.set('input', '');
   },
 
-  updateCategory: function() {
-    this.set('itemsOriginal', Em.copy(this.get('items')));
-    this.set('input', '');
-    this.set('editMode', false);
-  }.observes('name'),
-
   /**
    * available items to add, will show up typing ahead
    */