tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject tez git commit: TEZ-2112. Tez UI: fix offset calculation, add home button to breadcrumbs. (Sreenath Somarajapuram via hitesh)
Date Tue, 17 Feb 2015 19:08:23 GMT
Repository: tez
Updated Branches:
  refs/heads/master b6cb7f81c -> 1653d18b8


TEZ-2112. Tez UI: fix offset calculation, add home button to breadcrumbs. (Sreenath Somarajapuram
via hitesh)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/1653d18b
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/1653d18b
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/1653d18b

Branch: refs/heads/master
Commit: 1653d18b8414842c318d542c13ff075b915aeea0
Parents: b6cb7f8
Author: Hitesh Shah <hitesh@apache.org>
Authored: Tue Feb 17 11:07:56 2015 -0800
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Tue Feb 17 11:07:56 2015 -0800

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../webapp/app/scripts/views/dag-view-view.js   | 20 ++++++++++++--------
 tez-ui/src/main/webapp/app/styles/main.less     |  7 +++++++
 tez-ui/src/main/webapp/app/templates/dag.hbs    |  2 +-
 tez-ui/src/main/webapp/app/templates/dags.hbs   |  2 +-
 tez-ui/src/main/webapp/app/templates/error.hbs  |  6 ++++++
 tez-ui/src/main/webapp/app/templates/task.hbs   |  2 +-
 .../main/webapp/app/templates/task_attempt.hbs  |  2 +-
 tez-ui/src/main/webapp/app/templates/tasks.hbs  |  2 +-
 .../src/main/webapp/app/templates/tez-app.hbs   |  2 +-
 tez-ui/src/main/webapp/app/templates/vertex.hbs |  2 +-
 11 files changed, 33 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/1653d18b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6638e55..5458feb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -64,6 +64,7 @@ Release 0.6.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2112. Tez UI: fix offset calculation, add home button to breadcrumbs.
   TEZ-2038. TEZ-UI DAG is always running in tez-ui when the app is failed but no DAGFinishedEvent
is logged.
   TEZ-2102. Tez UI: DAG view has hidden edges, dragging DAG by holding vertex causes unintended
click.
   TEZ-2101. Tez UI: Issues on displaying a table.

http://git-wip-us.apache.org/repos/asf/tez/blob/1653d18b/tez-ui/src/main/webapp/app/scripts/views/dag-view-view.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/views/dag-view-view.js b/tez-ui/src/main/webapp/app/scripts/views/dag-view-view.js
index 749be3a..f660572 100644
--- a/tez-ui/src/main/webapp/app/scripts/views/dag-view-view.js
+++ b/tez-ui/src/main/webapp/app/scripts/views/dag-view-view.js
@@ -18,14 +18,18 @@
 
 App.DagViewView = Ember.View.extend({
   setHeight: function () {
-    var container = $('.dag-view-component-container');
-    container.height(
-      Math.max(
-        // 50 pixel is left at the bottom
-        $(window).height() - container.offset().top - 50,
-        450 // Minimum dag view component container height
-      )
-    );
+    var container = $('.dag-view-component-container'),
+        offset;
+    if(container) {
+      offset = container.offset();
+      container.height(
+        Math.max(
+          // 50 pixel is left at the bottom
+          offset ? $(window).height() - offset.top - 50 : 0,
+          450 // Minimum dag view component container height
+        )
+      );
+    }
   },
 
   didInsertElement: function() {

http://git-wip-us.apache.org/repos/asf/tez/blob/1653d18b/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 fef8c00..b29fa6e 100644
--- a/tez-ui/src/main/webapp/app/styles/main.less
+++ b/tez-ui/src/main/webapp/app/styles/main.less
@@ -104,10 +104,17 @@ body, html, body > .ember-view {
   }
 
   .breadcrumb {
+    padding: 5px 15px;
     font-size: 16px;
     .active .sub {
       font-size: 12px;
     }
+
+    .fa-home:before {
+      position: relative;
+      font-size: 1.5em;
+      top: 2px;
+    }
   }
 
   .navbar {

http://git-wip-us.apache.org/repos/asf/tez/blob/1653d18b/tez-ui/src/main/webapp/app/templates/dag.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/dag.hbs b/tez-ui/src/main/webapp/app/templates/dag.hbs
index b34aebe..c78de95 100644
--- a/tez-ui/src/main/webapp/app/templates/dag.hbs
+++ b/tez-ui/src/main/webapp/app/templates/dag.hbs
@@ -17,7 +17,7 @@
 }}
 
 <ul class="breadcrumb">
-  <li>{{#link-to 'dags'}}All Dags{{/link-to}} <span class="divider"></span></li>
+  <li>{{#link-to 'application'}}<i class="fa fa-home"> All Dags</i>{{/link-to}}
<span class="divider"></span></li>
   <li class="active">Dag - <span class='sub'>{{name}}</span></li>
 </ul>
 

http://git-wip-us.apache.org/repos/asf/tez/blob/1653d18b/tez-ui/src/main/webapp/app/templates/dags.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/dags.hbs b/tez-ui/src/main/webapp/app/templates/dags.hbs
index abe5ea5..7ea8924 100644
--- a/tez-ui/src/main/webapp/app/templates/dags.hbs
+++ b/tez-ui/src/main/webapp/app/templates/dags.hbs
@@ -17,7 +17,7 @@
 }}
 
 <ul class="breadcrumb">
-  <li class="active">All Dags</li>
+  <li>{{#link-to 'application'}}<i class="fa fa-home"> All Dags</i>{{/link-to}}
<span class="divider"></span></li>
 </ul>
 
 <div class='margin-small-vertical'>

http://git-wip-us.apache.org/repos/asf/tez/blob/1653d18b/tez-ui/src/main/webapp/app/templates/error.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/error.hbs b/tez-ui/src/main/webapp/app/templates/error.hbs
index 47e7cd5..3bd7bab 100644
--- a/tez-ui/src/main/webapp/app/templates/error.hbs
+++ b/tez-ui/src/main/webapp/app/templates/error.hbs
@@ -15,4 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 }}
+
+<ul class="breadcrumb">
+  <li>{{#link-to 'application'}}<i class="fa fa-home"> All Dags</i>{{/link-to}}
<span class="divider"></span></li>
+  <li class="active">Error</span></li>
+</ul>
+
 <h1>An Error Occurred</h1>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tez/blob/1653d18b/tez-ui/src/main/webapp/app/templates/task.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/task.hbs b/tez-ui/src/main/webapp/app/templates/task.hbs
index cf528c0..0965df5 100644
--- a/tez-ui/src/main/webapp/app/templates/task.hbs
+++ b/tez-ui/src/main/webapp/app/templates/task.hbs
@@ -17,7 +17,7 @@
 }}
 
 <ul class="breadcrumb">
-  <li>{{#link-to 'dags'}}All Dags{{/link-to}} <span class="divider"></span></li>
+  <li>{{#link-to 'application'}}<i class="fa fa-home"> All Dags</i>{{/link-to}}
<span class="divider"></span></li>
   <li>{{#link-to 'dag.vertices' dagID}}Dag{{/link-to}} <span class="divider"></span></li>
   <li>{{#link-to 'vertex.tasks' vertexID}}Vertex{{/link-to}} <span class="divider"></span></li>
   <li class="active">Task - <span class='sub'>{{id}}</span></li>

http://git-wip-us.apache.org/repos/asf/tez/blob/1653d18b/tez-ui/src/main/webapp/app/templates/task_attempt.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/task_attempt.hbs b/tez-ui/src/main/webapp/app/templates/task_attempt.hbs
index c8ffb3b..67a087d 100644
--- a/tez-ui/src/main/webapp/app/templates/task_attempt.hbs
+++ b/tez-ui/src/main/webapp/app/templates/task_attempt.hbs
@@ -17,7 +17,7 @@
 }}
 
 <ul class="breadcrumb">
-  <li>{{#link-to 'dags'}}All Dags{{/link-to}} <span class="divider"></span></li>
+  <li>{{#link-to 'application'}}<i class="fa fa-home"> All Dags</i>{{/link-to}}
<span class="divider"></span></li>
   <li>{{#link-to 'dag.vertices' dagID}}Dag{{/link-to}} <span class="divider"></span></li>
   <li>{{#link-to 'vertex.tasks' vertexID}}Vertex{{/link-to}} <span class="divider"></span></li>
   <li>{{#link-to 'task.attempts' taskID}}Task{{/link-to}} <span class="divider"></span></li>

http://git-wip-us.apache.org/repos/asf/tez/blob/1653d18b/tez-ui/src/main/webapp/app/templates/tasks.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/tasks.hbs b/tez-ui/src/main/webapp/app/templates/tasks.hbs
index f8096c4..14324c2 100644
--- a/tez-ui/src/main/webapp/app/templates/tasks.hbs
+++ b/tez-ui/src/main/webapp/app/templates/tasks.hbs
@@ -17,7 +17,7 @@
 }}
 
 <ul class="breadcrumb">
-  <li>{{#link-to 'dags'}}All Dags{{/link-to}} <span class="divider"></span></li>
+  <li>{{#link-to 'application'}}<i class="fa fa-home"> All Dags</i>{{/link-to}}
<span class="divider"></span></li>
   <li>{{#link-to 'dag.vertices' dagID}}Dag{{/link-to}} <span class="divider"></span></li>
   <li class="active">Tasks</li>
 </ul>

http://git-wip-us.apache.org/repos/asf/tez/blob/1653d18b/tez-ui/src/main/webapp/app/templates/tez-app.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/tez-app.hbs b/tez-ui/src/main/webapp/app/templates/tez-app.hbs
index 011fde7..d96103f 100644
--- a/tez-ui/src/main/webapp/app/templates/tez-app.hbs
+++ b/tez-ui/src/main/webapp/app/templates/tez-app.hbs
@@ -17,7 +17,7 @@
 }}
 
 <ul class="breadcrumb">
-  <li>{{#link-to 'dags'}}All Dags{{/link-to}} <span class="divider"></span></li>
+  <li>{{#link-to 'application'}}<i class="fa fa-home"> All Dags</i>{{/link-to}}
<span class="divider"></span></li>
   <li class="active">Tez App - <span class='sub'>{{id}}</span></li>
 </ul>
 

http://git-wip-us.apache.org/repos/asf/tez/blob/1653d18b/tez-ui/src/main/webapp/app/templates/vertex.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/vertex.hbs b/tez-ui/src/main/webapp/app/templates/vertex.hbs
index 923869c..86e0f70 100644
--- a/tez-ui/src/main/webapp/app/templates/vertex.hbs
+++ b/tez-ui/src/main/webapp/app/templates/vertex.hbs
@@ -17,7 +17,7 @@
 }}
 
 <ul class="breadcrumb">
-  <li>{{#link-to 'dags'}}All Dags{{/link-to}} <span class="divider"></span></li>
+  <li>{{#link-to 'application'}}<i class="fa fa-home"> All Dags</i>{{/link-to}}
<span class="divider"></span></li>
   <li>{{#link-to 'dag.vertices' dagID}}Dag{{/link-to}} <span class="divider"></span></li>
   <li class="active">Vertex - <span class='sub'>{{name}}</span></li>
 </ul>


Mime
View raw message