Author: yusaku
Date: Sat Jan 19 01:20:07 2013
New Revision: 1435439
URL: http://svn.apache.org/viewvc?rev=1435439&view=rev
Log:
AMBARI-1218. Refactor Job Browser User filter. (yusaku)
Added:
incubator/ambari/trunk/ambari-web/app/templates/main/apps/user_filter.hbs
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1435439&r1=1435438&r2=1435439&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Jan 19 01:20:07 2013
@@ -17,6 +17,8 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-1218. Refactor Job Browser User filter. (yusaku)
+
AMBARI-1217. Tighten up spacing for the rows in the Hosts table. (yusaku)
AMBARI-1216. Add filters module. (yusaku)
Added: incubator/ambari/trunk/ambari-web/app/templates/main/apps/user_filter.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/apps/user_filter.hbs?rev=1435439&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/apps/user_filter.hbs
(added)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/apps/user_filter.hbs
Sat Jan 19 01:20:07 2013
@@ -0,0 +1,34 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
+<button class="btn btn-info single-btn-group" {{action "clickFilterButton"
target="view"}}>
+ User <span class="caret"></span>
+</button>
+<ul class="dropdown-menu filter-components">
+ <li>
+ <label class="checkbox">{{view Ember.Checkbox
checkedBinding="view.allComponentsChecked"}} All</label>
+ </li>
+ {{#each user in view.users}}
+ <li>
+ <label class="checkbox">{{view Ember.Checkbox
checkedBinding="user.checked"}} {{user.name}}</label>
+ </li>
+ {{/each}}
+ <li>
+ <button class="btn" {{action "closeFilter" target="view"}}>Cancel</button>
+ <button class="btn btn-primary" {{action "applyFilter"
target="view"}}>Apply</button>
+ </li>
+</ul>
Modified: incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js?rev=1435439&r1=1435438&r2=1435439&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js Sat Jan 19
01:20:07 2013
@@ -836,23 +836,7 @@ App.MainAppsView = Em.View.extend({
}));
return users;
}.property('parentView.users'),
- template: Ember.Handlebars.compile(
- '<button class="btn btn-info single-btn-group"'+
- '{{action "clickFilterButton" target="view"}}>'+
- 'User <span class="caret"></span></button>'+
- '<ul class="dropdown-menu filter-components">'+
- '<li><label class="checkbox">' +
- '{{view Ember.Checkbox checkedBinding="view.allComponentsChecked"}}
All</label></li>'+
- '{{#each user in view.users}}<li><label class="checkbox">' +
- '{{view Ember.Checkbox checkedBinding="user.checked"}} {{user.name}}'+
- '</label></li>{{/each}}'+
- '<li>' +
- '<button class="btn" {{action "closeFilter" target="view"}}>' +
- 'Cancel</button>' +
- '<button class="btn btn-primary" {{action "applyFilter"
target="view"}}>'+
- 'Apply</button>'+
- '</li></ul>'
- ),
+ templateName:require('templates/main/apps/user_filter'),
allComponentsChecked:false,
toggleAllComponents: function() {
var checked = this.get('allComponentsChecked');
