You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by pr...@apache.org on 2015/05/13 08:41:12 UTC
tez git commit: TEZ-2436. Tez UI: Add cancel button in column
selector. (Sreenath Somarajapuram via pramachandran)
Repository: tez
Updated Branches:
refs/heads/master 7d0ae69e2 -> ec6bbbf95
TEZ-2436. Tez UI: Add cancel button in column selector. (Sreenath Somarajapuram via pramachandran)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/ec6bbbf9
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/ec6bbbf9
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/ec6bbbf9
Branch: refs/heads/master
Commit: ec6bbbf958878d9dfa7e2a32f467e1e6de8c1a9b
Parents: 7d0ae69
Author: Prakash Ramachandran <pr...@hortonworks.com>
Authored: Wed May 13 12:06:54 2015 +0530
Committer: Prakash Ramachandran <pr...@hortonworks.com>
Committed: Wed May 13 12:09:51 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../app/scripts/mixins/column-selector-mixin.js | 3 +++
tez-ui/src/main/webapp/app/styles/main.less | 11 +++++++++--
.../webapp/app/templates/views/multi-select.hbs | 18 +++++++++---------
4 files changed, 22 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/ec6bbbf9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 24a862d..c1e1c31 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ Release 0.8.0: Unreleased
INCOMPATIBLE CHANGES
ALL CHANGES:
+ TEZ-2436. Tez UI: Add cancel button in column selector.
TEZ-2351. Remove GroupByOrderbyMRRTest example from tez-tests.
TEZ-2419. Inputs/Outputs should inform the Processor about Interrupts when interrupted during a blocking Op.
TEZ-1752. Inputs / Outputs in the Runtime library should be interruptable.
http://git-wip-us.apache.org/repos/asf/tez/blob/ec6bbbf9/tez-ui/src/main/webapp/app/scripts/mixins/column-selector-mixin.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/mixins/column-selector-mixin.js b/tez-ui/src/main/webapp/app/scripts/mixins/column-selector-mixin.js
index 3a76d61..22e131d 100644
--- a/tez-ui/src/main/webapp/app/scripts/mixins/column-selector-mixin.js
+++ b/tez-ui/src/main/webapp/app/scripts/mixins/column-selector-mixin.js
@@ -113,6 +113,9 @@ App.ColumnSelectorMixin = Em.Mixin.create({
title: 'Ok',
dismiss: 'modal',
clicked: 'selectionChange'
+ }), Ember.Object.create({
+ title: 'Cancel',
+ dismiss: 'modal',
})],
this
);
http://git-wip-us.apache.org/repos/asf/tez/blob/ec6bbbf9/tez-ui/src/main/webapp/app/styles/main.less
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/styles/main.less b/tez-ui/src/main/webapp/app/styles/main.less
index e89d4c3..fdad3ac 100644
--- a/tez-ui/src/main/webapp/app/styles/main.less
+++ b/tez-ui/src/main/webapp/app/styles/main.less
@@ -883,8 +883,15 @@ body, html {
.inline-block;
.align-top;
- width: 470px;
- margin: 4px 0px 0px 20px;
+ width: 100%;
+ margin: 0px;
+ }
+
+ .select-all {
+ .inline-block;
+
+ height: 15px;
+ margin-top: 3px;
}
}
}
http://git-wip-us.apache.org/repos/asf/tez/blob/ec6bbbf9/tez-ui/src/main/webapp/app/templates/views/multi-select.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/views/multi-select.hbs b/tez-ui/src/main/webapp/app/templates/views/multi-select.hbs
index ebab317..da83d87 100644
--- a/tez-ui/src/main/webapp/app/templates/views/multi-select.hbs
+++ b/tez-ui/src/main/webapp/app/templates/views/multi-select.hbs
@@ -21,15 +21,6 @@
</div>
<div class="selection-list">
<div class="search-option highlight">
- <div class="inline-block">
- Select All<br/>
- {{view App.Checkbox
- classNames='inline-display checkbox'
- checked=view.selectAll
- action='selectAll'
- target=view
- }}
- </div>
<div {{bind-attr class=":form-group view._validRegEx::has-error"}}>
{{input
class="form-control"
@@ -37,6 +28,15 @@
value=view.searchRegex
}}
</div>
+ <div class="select-all">
+ {{view App.Checkbox
+ classNames='inline-display checkbox'
+ checked=view.selectAll
+ action='selectAll'
+ target=view
+ }}
+ Select All
+ </div>
</div>
{{#if view.visibleOptions.length}}
{{#each option in view.visibleOptions}}