Repository: tez
Updated Branches:
refs/heads/branch-0.7 09c92662e -> aa5a978a0
TEZ-2447. Tez UI: Generic changes based on feedbacks. (Sreenath Somarajapuram
via pramachandran)
(cherry picked from commit cea05e361b0c4150aadd91994ad69281d1e80695)
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/aa5a978a
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/aa5a978a
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/aa5a978a
Branch: refs/heads/branch-0.7
Commit: aa5a978a0d1ec2678a60c485e087a9e6a1acde5d
Parents: 09c9266
Author: Prakash Ramachandran <[email protected]>
Authored: Fri May 15 08:12:35 2015 +0530
Committer: Prakash Ramachandran <[email protected]>
Committed: Fri May 15 08:16:56 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 7 +++++++
.../main/webapp/app/scripts/controllers/dags_controller.js | 7 ++++++-
tez-ui/src/main/webapp/app/scripts/helpers/io.js | 2 +-
tez-ui/src/main/webapp/app/scripts/helpers/misc.js | 1 -
tez-ui/src/main/webapp/app/styles/colors.less | 2 +-
tez-ui/src/main/webapp/app/styles/main.less | 9 +++++++--
6 files changed, 22 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/aa5a978a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a8bc5d4..2929fd7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@ Apache Tez Change Log
=====================
+Release 0.7.1: Unreleased
+
+INCOMPATIBLE CHANGES
+
+ALL CHANGES:
+ TEZ-2447. Tez UI: Generic changes based on feedbacks.
+
Release 0.7.0: Unreleased
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/tez/blob/aa5a978a/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
b/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
index c02945c..2cc092c 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
@@ -183,7 +183,12 @@ App.DagsController =
Em.ObjectController.extend(App.PaginatedContentMixin, App.C
}
function onStatusChange() {
- this.set('status', this.get('dag.status'));
+ var status = this.get('dag.status');
+ this.setProperties({
+ status: status,
+ statusIcon: App.Helpers.misc.getStatusClassForEntity(status,
+ this.get('dag.hasFailedTaskAttempts'))
+ });
}
return [
http://git-wip-us.apache.org/repos/asf/tez/blob/aa5a978a/tez-ui/src/main/webapp/app/scripts/helpers/io.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/helpers/io.js
b/tez-ui/src/main/webapp/app/scripts/helpers/io.js
index e959e0a..ba374ce 100644
--- a/tez-ui/src/main/webapp/app/scripts/helpers/io.js
+++ b/tez-ui/src/main/webapp/app/scripts/helpers/io.js
@@ -176,7 +176,7 @@ App.Helpers.io = {
inProgress = false,
hasFailed = false;
- zip.createWriter(new zip.BlobWriter(), function(writer) {
+ zip.createWriter(new zip.BlobWriter("application/zip"), function(writer) {
zipWriter = writer;
checkForCompletion();
nextFile();
http://git-wip-us.apache.org/repos/asf/tez/blob/aa5a978a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
b/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
index da38129..a2130ab 100644
--- a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
+++ b/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
@@ -567,7 +567,6 @@ App.Helpers.misc = {
{ label: 'Running', id: 'RUNNING' },
{ label: 'Succeeded', id: 'SUCCEEDED' },
{ label: 'Failed', id: 'FAILED' },
- { label: 'Killed', id: 'KILLED' },
{ label: 'Error', id: 'ERROR' },
],
http://git-wip-us.apache.org/repos/asf/tez/blob/aa5a978a/tez-ui/src/main/webapp/app/styles/colors.less
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/styles/colors.less
b/tez-ui/src/main/webapp/app/styles/colors.less
index a426893..af470ff 100644
--- a/tez-ui/src/main/webapp/app/styles/colors.less
+++ b/tez-ui/src/main/webapp/app/styles/colors.less
@@ -30,7 +30,7 @@
@white: #fff;
-@text-color: #666666;
+@text-color: rgb(70, 70, 70);
@text-red: red;
@text-light: #BBBBBB;
@text-green: green;
http://git-wip-us.apache.org/repos/asf/tez/blob/aa5a978a/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..26f92bf 100644
--- a/tez-ui/src/main/webapp/app/styles/main.less
+++ b/tez-ui/src/main/webapp/app/styles/main.less
@@ -29,6 +29,7 @@
body, html, body > .ember-view {
height: 100%;
overflow: visible;
+ color: @text-color;
}
body, html {
min-width: 1024px;
@@ -45,8 +46,12 @@ body, html {
padding: 5px 15px;
border: 1px solid @border-lite;
font-size: 16px;
- .active .sub {
- font-size: 12px;
+
+ >.active {
+ color: @text-color;
+ .sub {
+ font-size: 12px;
+ }
}
.fa-home:before {
