tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rbalamo...@apache.org
Subject [1/2] tez git commit: TEZ-1757. Column selector for tables (Sreenath Somarajapuram via Rajesh Balamohan)
Date Thu, 20 Nov 2014 22:44:36 GMT
Repository: tez
Updated Branches:
  refs/heads/TEZ-8 8af5ea389 -> 3a0b70c18


http://git-wip-us.apache.org/repos/asf/tez/blob/3a0b70c1/tez-ui/src/main/webapp/app/templates/dag/tasks.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/dag/tasks.hbs b/tez-ui/src/main/webapp/app/templates/dag/tasks.hbs
index bbe9b40..af40041 100644
--- a/tez-ui/src/main/webapp/app/templates/dag/tasks.hbs
+++ b/tez-ui/src/main/webapp/app/templates/dag/tasks.hbs
@@ -1,28 +1,49 @@
+{{!
+* 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.
+}}
+
 {{#unless loading}}
-	<div class='margin-small'>
-		<span class='align-right'>
-			{{page-nav-component
-				hasPrev=hasPrev
-				hasNext=hasNext
-				navNext='navigateNext'
-				navPrev='navigatePrev'
-				navFirst='navigateFirst'
-			}}
-		</span>
-		<div class='align-clear'> </div>
-	</div>
+  <div class='margin-small'>
+    <span class="left-divider align-right">
+      <i {{bind-attr class=':fa-action :fa-cog'}} {{action 'selectColumns'}}></i>
+    </span>
+    <span class='align-right'>
+      {{page-nav-component
+        hasPrev=hasPrev
+        hasNext=hasNext
+        navNext='navigateNext'
+        navPrev='navigatePrev'
+        navFirst='navigateFirst'
+      }}
+    </span>
+    <div class='align-clear'> </div>
+  </div>
 
-	<div class='table-container'>
-	{{extended-table-component 
-		hasFooter=false
-		enableContentSelection=true
-		columnsBinding="columns"
-		contentBinding="sortedContent"
-		forceFillColumns=true
-		hasFilter=true
+  <div class='table-container'>
+  {{extended-table-component
+    hasFooter=false
+    enableContentSelection=true
+    columnsBinding="columns"
+    contentBinding="sortedContent"
+    forceFillColumns=true
+    hasFilter=true
     onFilterUpdated='filterUpdated'
-	}}
-	</div>
+  }}
+  </div>
 {{else}}
-	{{partial 'utils/loadingSpinner'}}	
+  {{partial 'utils/loadingSpinner'}}
 {{/unless}}

http://git-wip-us.apache.org/repos/asf/tez/blob/3a0b70c1/tez-ui/src/main/webapp/app/templates/dag/vertices.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/dag/vertices.hbs b/tez-ui/src/main/webapp/app/templates/dag/vertices.hbs
index 04f631b..6d3e765 100644
--- a/tez-ui/src/main/webapp/app/templates/dag/vertices.hbs
+++ b/tez-ui/src/main/webapp/app/templates/dag/vertices.hbs
@@ -1,28 +1,49 @@
+{{!
+* 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.
+}}
+
 {{#unless loading}}
-	<div class='margin-small'>
-		<span class='align-right'>
-			{{page-nav-component
-				hasPrev=hasPrev
-				hasNext=hasNext
-				navNext='navigateNext'
-				navPrev='navigatePrev'
-				navFirst='navigateFirst'
-			}}
-		</span>
-		<div class='align-clear'> </div>
-	</div>
+  <div class='margin-small'>
+    <span class="left-divider align-right">
+      <i {{bind-attr class=':fa-action :fa-cog'}} {{action 'selectColumns'}}></i>
+    </span>
+    <span class='align-right'>
+      {{page-nav-component
+        hasPrev=hasPrev
+        hasNext=hasNext
+        navNext='navigateNext'
+        navPrev='navigatePrev'
+        navFirst='navigateFirst'
+      }}
+    </span>
+    <div class='align-clear'> </div>
+  </div>
 
-	<div class='table-container'>
-	{{extended-table-component 
-		hasFooter=false
-		enableContentSelection=true
-		columnsBinding="columns"
-		contentBinding="sortedContent"
-		forceFillColumns=true
-		hasFilter=true
+  <div class='table-container'>
+  {{extended-table-component
+    hasFooter=false
+    enableContentSelection=true
+    columnsBinding="columns"
+    contentBinding="sortedContent"
+    forceFillColumns=true
+    hasFilter=true
     onFilterUpdated='filterUpdated'
-	}}
-	</div>
+  }}
+  </div>
 {{else}}
-	{{partial 'utils/loadingSpinner'}}	
+  {{partial 'utils/loadingSpinner'}}
 {{/unless}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tez/blob/3a0b70c1/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 4ecf3f3..10784dd 100644
--- a/tez-ui/src/main/webapp/app/templates/dags.hbs
+++ b/tez-ui/src/main/webapp/app/templates/dags.hbs
@@ -29,6 +29,9 @@
         navFirst='navigateFirst'
       }}
     </span>
+    <span class="left-divider align-left">
+      <i {{bind-attr class=':fa-action :fa-cog'}} {{action 'selectColumns'}}></i>
+    </span>
     <span class='align-right'>
       Number of Dags to Show
       {{view Ember.Select 

http://git-wip-us.apache.org/repos/asf/tez/blob/3a0b70c1/tez-ui/src/main/webapp/app/templates/task/attempts.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/task/attempts.hbs b/tez-ui/src/main/webapp/app/templates/task/attempts.hbs
index 04f631b..1f9970d 100644
--- a/tez-ui/src/main/webapp/app/templates/task/attempts.hbs
+++ b/tez-ui/src/main/webapp/app/templates/task/attempts.hbs
@@ -1,5 +1,8 @@
 {{#unless loading}}
 	<div class='margin-small'>
+		<span class="left-divider align-right">
+		  <i {{bind-attr class=':fa-action :fa-cog'}} {{action 'selectColumns'}}></i>
+		</span>
 		<span class='align-right'>
 			{{page-nav-component
 				hasPrev=hasPrev

http://git-wip-us.apache.org/repos/asf/tez/blob/3a0b70c1/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 4c84164..34c7fff 100644
--- a/tez-ui/src/main/webapp/app/templates/tasks.hbs
+++ b/tez-ui/src/main/webapp/app/templates/tasks.hbs
@@ -19,40 +19,33 @@
 {{partial 'utils/pageHeader'}}
 
 {{#unless loading}}
-	<div class='margin-small'>
-		<span class='align-left'>
-			{{page-nav-component
-				hasPrev=hasPrev
-				hasNext=hasNext
-				navNext='navigateNext'
-				navPrev='navigatePrev'
-				navFirst='navigateFirst'
-			}}
-		</span>
-		<div class='align-clear'> </div>
-	</div>
+  <div class='margin-small'>
+    <span class='align-left'>
+      {{page-nav-component
+        hasPrev=hasPrev
+        hasNext=hasNext
+        navNext='navigateNext'
+        navPrev='navigatePrev'
+        navFirst='navigateFirst'
+      }}
+    </span>
+    <span class="left-divider align-left">
+      <i {{bind-attr class=':fa-action :fa-cog'}} {{action 'selectColumns'}}></i>
+    </span>
+    <div class='align-clear'> </div>
+  </div>
 
-	<div class='table-container'>
-	  {{table-component
-	    hasFooter=false
-	    columnsBinding='columns'
-	    contentBinding='sortedContent'
-	    forceFillColumns=true
-	  }}
-	</div>
-
-	<div class='margin-small'>
-		<span class='align-left'>
-			{{page-nav-component
-				hasPrev=hasPrev
-				hasNext=hasNext
-				navNext='navigateNext'
-				navPrev='navigatePrev'
-				navFirst='navigateFirst'
-			}}
-		</span>
-		<div class='align-clear'></div>
-	</div>
+  <div class='table-container'>
+    {{extended-table-component
+      hasFooter=false
+      enableContentSelection=true
+      columnsBinding="columns"
+      contentBinding="sortedContent"
+      forceFillColumns=true
+      hasFilter=true
+      onFilterUpdated='filterUpdated'
+    }}
+  </div>
 {{else}}
-	{{partial 'utils/loadingSpinner'}}	
+  {{partial 'utils/loadingSpinner'}}
 {{/unless}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tez/blob/3a0b70c1/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 e4fba4e..64c4fc8 100644
--- a/tez-ui/src/main/webapp/app/templates/tez-app.hbs
+++ b/tez-ui/src/main/webapp/app/templates/tez-app.hbs
@@ -23,7 +23,7 @@
       <table class='detail-list'>
         <tbody>
           <tr>
-            <td>App Id</td>
+            <td>YARN RM Tracking URL</td>
             <td><a href="{{unbound RMWebUrl}}/cluster/app/tez_{{unbound id}}">{{unbound
id}}</a></td>
           </tr>
           <tr>

http://git-wip-us.apache.org/repos/asf/tez/blob/3a0b70c1/tez-ui/src/main/webapp/app/templates/tez-app/dags.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/tez-app/dags.hbs b/tez-ui/src/main/webapp/app/templates/tez-app/dags.hbs
index 4662279..c478edb 100644
--- a/tez-ui/src/main/webapp/app/templates/tez-app/dags.hbs
+++ b/tez-ui/src/main/webapp/app/templates/tez-app/dags.hbs
@@ -18,6 +18,9 @@
 
 {{#unless loading}}
   <div class='margin-small'>
+    <span class="left-divider align-right">
+      <i {{bind-attr class=':fa-action :fa-cog'}} {{action 'selectColumns'}}></i>
+    </span>
     <span class='align-right'>
       {{page-nav-component
         hasPrev=hasPrev

http://git-wip-us.apache.org/repos/asf/tez/blob/3a0b70c1/tez-ui/src/main/webapp/app/templates/vertex/index.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/vertex/index.hbs b/tez-ui/src/main/webapp/app/templates/vertex/index.hbs
index f6b7502..41ce349 100644
--- a/tez-ui/src/main/webapp/app/templates/vertex/index.hbs
+++ b/tez-ui/src/main/webapp/app/templates/vertex/index.hbs
@@ -95,6 +95,10 @@
           <td>{{t common.time.duration}}</td>
           <td>{{formatDuration startTime endTime}}</td>
         </tr>
+        <tr>
+          <td>Processor Class</td>
+          <td>{{processorClassName}}</td>
+        </tr>
       </tbody>
     </table>
   </div>

http://git-wip-us.apache.org/repos/asf/tez/blob/3a0b70c1/tez-ui/src/main/webapp/app/templates/vertex/inputs.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/vertex/inputs.hbs b/tez-ui/src/main/webapp/app/templates/vertex/inputs.hbs
index dfee676..b6ca986 100644
--- a/tez-ui/src/main/webapp/app/templates/vertex/inputs.hbs
+++ b/tez-ui/src/main/webapp/app/templates/vertex/inputs.hbs
@@ -19,6 +19,9 @@
 {{#unless loading}}
   {{#if inputsAvailable}}
     <div class='margin-small'>
+      <span class="left-divider align-right">
+        <i {{bind-attr class=':fa-action :fa-cog'}} {{action 'selectColumns'}}></i>
+      </span>
       <span class='align-right'>
         {{page-nav-component
           hasPrev=hasPrev

http://git-wip-us.apache.org/repos/asf/tez/blob/3a0b70c1/tez-ui/src/main/webapp/app/templates/vertex/task_attempts.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/vertex/task_attempts.hbs b/tez-ui/src/main/webapp/app/templates/vertex/task_attempts.hbs
index 7224117..6525358 100644
--- a/tez-ui/src/main/webapp/app/templates/vertex/task_attempts.hbs
+++ b/tez-ui/src/main/webapp/app/templates/vertex/task_attempts.hbs
@@ -27,6 +27,9 @@
         navFirst='navigateFirst'
       }}
     </span>
+    <span class="left-divider align-left">
+      <i {{bind-attr class=':fa-action :fa-cog'}} {{action 'selectColumns'}}></i>
+    </span>
     <div class='align-clear'> </div>
   </div>
 

http://git-wip-us.apache.org/repos/asf/tez/blob/3a0b70c1/tez-ui/src/main/webapp/app/templates/vertex/tasks.hbs
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/templates/vertex/tasks.hbs b/tez-ui/src/main/webapp/app/templates/vertex/tasks.hbs
index 7224117..6525358 100644
--- a/tez-ui/src/main/webapp/app/templates/vertex/tasks.hbs
+++ b/tez-ui/src/main/webapp/app/templates/vertex/tasks.hbs
@@ -27,6 +27,9 @@
         navFirst='navigateFirst'
       }}
     </span>
+    <span class="left-divider align-left">
+      <i {{bind-attr class=':fa-action :fa-cog'}} {{action 'selectColumns'}}></i>
+    </span>
     <div class='align-clear'> </div>
   </div>
 


Mime
View raw message