Details
diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index 175b1a4..5366f1e 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -107,7 +107,7 @@
<tbody>
#if (!$flowHistory.isEmpty())
#foreach ($flow in $flowHistory)
- <tr class="row" >
+ <tr>
<td class="tb-name execId">
<a href="${context}/executor?execid=${flow.executionId}">${flow.executionId}</a>
</td>
@@ -121,13 +121,16 @@
<td>$utils.formatDate(${flow.startTime})</td>
<td>$utils.formatDate(${flow.endTime})</td>
<td>$utils.formatDuration(${flow.startTime}, ${flow.endTime})</td>
- <td><div class="status ${flow.status}">$utils.formatStatus(${flow.status})</div></td>
+ <td>
+ <div class="status ${flow.status}">$utils.formatStatus(${flow.status})</div>
+ </td>
<td></td>
</tr>
#end
#else
<tr>
- <td class="last" colspan="9">No History Results Found</td></tr>
+ <td class="last" colspan="9">No History Results Found</td>
+ </tr>
#end
</tbody>
</table>
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
index e71e823..ffb9f8a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
@@ -104,6 +104,8 @@
<li><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}"><strong>Job</strong> $jobid</a></li>
</ol>
+ #set ($job_page="history")
+ #parse ("azkaban/webapp/servlet/velocity/jobnav.vm")
<div class="panel panel-default">
<div class="panel-heading">Job History</div>
@@ -175,11 +177,12 @@
</div><!-- /col-lg-8 -->
<div class="col-lg-4">
-
+ #parse ("azkaban/webapp/servlet/velocity/jobsidebar.vm")
</div><!-- /col-lg-4 -->
</div><!-- /row -->
#end
+#parse ("azkaban/webapp/servlet/velocity/footer.vm")
</div>
</body>
</html>
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobnav.vm b/src/java/azkaban/webapp/servlet/velocity/jobnav.vm
new file mode 100644
index 0000000..70f974e
--- /dev/null
+++ b/src/java/azkaban/webapp/servlet/velocity/jobnav.vm
@@ -0,0 +1,20 @@
+#*
+ * Copyright 2012 LinkedIn Corp.
+ *
+ * Licensed 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.
+*#
+
+ <ul class="nav nav-tabs">
+ <li#if($job_page == 'properties') class="active"#end><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}">Job</a></li>
+ <li#if($job_page == 'history') class="active"#end><a id="jobs-logs-btn" href="${context}/manager?project=${project.name}&job=$jobid&history">History</a></li>
+ </ul>
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index 9e09961..95a2368 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -86,19 +86,15 @@
<li><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}"><strong>Job</strong> $jobid</a></li>
</ol>
- ## Tabs
-
- <ul class="nav nav-tabs">
- <li class="active"><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}">Job</a></li>
- <li><a id="jobs-logs-btn" href="${context}/manager?project=${project.name}&job=$jobid&history">History</a></li>
- </ul>
+ #set ($job_page="properties")
+ #parse ("azkaban/webapp/servlet/velocity/jobnav.vm")
## Job details table
<div class="panel panel-default">
<div class="panel-heading">
<div class="pull-right">
- <button id="edit-job-btn" class="btn btn-xs btn-primary" onclick='jobEditView.show("${project.name}", "${flowid}", "${jobid}")'>Job Edit</button>
+ <button id="edit-job-btn" class="btn btn-xs btn-primary" onclick='jobEditView.show("${project.name}", "${flowid}", "${jobid}")'>Edit</button>
</div>
Job Properties
</div>
@@ -121,61 +117,7 @@
</div>
</div><!-- /col-lg-8 -->
<div class="col-lg-4">
- <div class="well" id="job-summary">
- <h3>Job <small>$jobid</small></h3>
- <p><strong>Job Type</strong> $jobtype</p>
- </div>
-
- ## Dependencies
-
- <div class="panel panel-default">
- <div class="panel-heading">Dependencies</div>
- <ul class="list-group">
- #if ($dependencies)
- #foreach($dependency in $dependencies)
- <li class="list-group-item">
- <a href="${context}/manager?project=${project.name}&flow=${flowid}&job=$dependency">$dependency</a>
- </li>
- #end
- #else
- <li class="list-group-item">No Dependencies</li>
- #end
- </ul>
- </div><!-- /panel -->
-
- ## Dependents
-
- <div class="panel panel-default">
- <div class="panel-heading">Dependents</div>
- <ul class="list-group">
- #if ($dependents)
- #foreach($dependent in $dependents)
- <li class="list-group-item">
- <a href="${context}/manager?project=${project.name}&flow=${flowid}&job=$dependent">$dependent</a>
- </li>
- #end
- #else
- <li class="list-group-item">No Dependencies</li>
- #end
-
- </ul>
- </div><!-- /panel -->
-
- <div class="panel panel-default">
- <div class="panel-heading">Properties</div>
- <ul class="list-group">
- #if ($properties)
- #foreach($property in $properties)
- <li class="list-group-item">
- <a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}&prop=$property">$property</a>
- </li>
- #end
- #else
- <li class="list-group-item">No Property Files For This Job</li>
- #end
- </ul>
- </div><!-- /panel -->
-
+ #parse ("azkaban/webapp/servlet/velocity/jobsidebar.vm")
</div><!-- /col-lg-4 -->
</div><!-- /row -->
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobsidebar.vm b/src/java/azkaban/webapp/servlet/velocity/jobsidebar.vm
new file mode 100644
index 0000000..b293ea5
--- /dev/null
+++ b/src/java/azkaban/webapp/servlet/velocity/jobsidebar.vm
@@ -0,0 +1,70 @@
+#*
+ * Copyright 2012 LinkedIn Corp.
+ *
+ * Licensed 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.
+*#
+
+ <div class="well" id="job-summary">
+ <h3>Job <small>$jobid</small></h3>
+ <p><strong>Job Type</strong> $jobtype</p>
+ </div>
+
+ ## Dependencies
+
+ <div class="panel panel-default">
+ <div class="panel-heading">Dependencies</div>
+ <ul class="list-group">
+ #if ($dependencies)
+ #foreach($dependency in $dependencies)
+ <li class="list-group-item">
+ <a href="${context}/manager?project=${project.name}&flow=${flowid}&job=$dependency">$dependency</a>
+ </li>
+ #end
+ #else
+ <li class="list-group-item">No Dependencies</li>
+ #end
+ </ul>
+ </div><!-- /panel -->
+
+ ## Dependents
+
+ <div class="panel panel-default">
+ <div class="panel-heading">Dependents</div>
+ <ul class="list-group">
+ #if ($dependents)
+ #foreach($dependent in $dependents)
+ <li class="list-group-item">
+ <a href="${context}/manager?project=${project.name}&flow=${flowid}&job=$dependent">$dependent</a>
+ </li>
+ #end
+ #else
+ <li class="list-group-item">No Dependencies</li>
+ #end
+
+ </ul>
+ </div><!-- /panel -->
+
+ <div class="panel panel-default">
+ <div class="panel-heading">Properties</div>
+ <ul class="list-group">
+ #if ($properties)
+ #foreach($property in $properties)
+ <li class="list-group-item">
+ <a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}&prop=$property">$property</a>
+ </li>
+ #end
+ #else
+ <li class="list-group-item">No Property Files For This Job</li>
+ #end
+ </ul>
+ </div><!-- /panel -->
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index b8695fb..6eb12fc 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -114,9 +114,9 @@
</div>
<div class="panel-footer">
#if (${exec})
- <button type="button" class="btn btn-primary execute-flow" flowId="${flow.id}">Execute Flow</button>
- <button type="button" class="btn btn-primary">Executions</button>
- <button type="button" class="btn btn-primary">Summary</button>
+ <button type="button" class="btn btn-sm btn-primary execute-flow" flowId="${flow.id}">Execute Flow</button>
+ <button type="button" class="btn btn-sm btn-primary">Executions</button>
+ <button type="button" class="btn btn-sm btn-primary">Summary</button>
#end
</div>
</div>
