You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/02/04 12:23:22 UTC
git commit: AMBARI-4516. Hosts page filter: label changes.
(onechiporenko)
Updated Branches:
refs/heads/trunk 9bf73024d -> 6ad7de9d1
AMBARI-4516. Hosts page filter: label changes. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6ad7de9d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ad7de9d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ad7de9d
Branch: refs/heads/trunk
Commit: 6ad7de9d1bee1f41a7db0feef1bbf031a28bb0aa
Parents: 9bf7302
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Tue Feb 4 13:21:44 2014 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Tue Feb 4 13:21:44 2014 +0200
----------------------------------------------------------------------
ambari-web/app/messages.js | 2 +-
ambari-web/app/styles/application.less | 11 ++++++++++-
ambari-web/app/templates/main/host.hbs | 7 +++++--
ambari-web/app/templates/main/host/component_filter.hbs | 2 +-
ambari-web/app/views/main/host.js | 1 +
5 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ad7de9d/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index e4414f8..23aae11 100644
--- a/ambari-web/app/messages.js
+++ b/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>',
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ad7de9d/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index e764d7c..859b46c 100644
--- a/ambari-web/app/styles/application.less
+++ b/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 {
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ad7de9d/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 9d29b22..f90f93e 100644
--- a/ambari-web/app/templates/main/host.hbs
+++ b/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"}}>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ad7de9d/ambari-web/app/templates/main/host/component_filter.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/component_filter.hbs b/ambari-web/app/templates/main/host/component_filter.hbs
index ca71b79..9902708 100644
--- a/ambari-web/app/templates/main/host/component_filter.hbs
+++ b/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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ad7de9d/ambari-web/app/views/main/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host.js b/ambari-web/app/views/main/host.js
index 82da4de..edaa4d5 100644
--- a/ambari-web/app/views/main/host.js
+++ b/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'));