azkaban-uncached

Clean up breadcrumbs on job page and job history page.

11/8/2013 12:02:02 AM

David Z. Chen

Commit: 2c639f0

Tree: a2bcdb2

Parents: cb4bb1d

Changes

src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm 8(+2 -6)

src/java/azkaban/webapp/servlet/velocity/jobpage.vm 2(+2 -0)

Details

src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm 8(+2 -6)

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
index 8776cc4..05d4240 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
@@ -74,15 +74,11 @@
 	#end
 			<div id="all-jobs-content">
 				<div class="section-hd">
-					<h2><a href="${context}/manager?project=${projectName}&job=${jobid}&history">Job <span>$jobid</span> History</a></h2>
+					<h2><a href="${context}/manager?project=${projectName}&job=${jobid}&history">Job History <span>$jobid</span></a></h2>
 					<div class="section-sub-hd">
 						<h4><a href="${context}/manager?project=${projectName}">Project <span>$projectName</span></a></h4>
 						<h4 class="separator">&gt;</h4>
-						<h4><a href="${context}/manager?project=${projectName}&flow=${job.flowId}">Flow <span>$job.flowId</span></a></h4>
-						<h4 class="separator">&gt;</h4>
-						<h4><a href="${context}/manager?project=${projectName}&flow=${job.flowId}&job=$jobid">Job <span>$jobid</span></a></h4>
-						<h4 class="separator">&gt;</h4>
-						<h4>History</h4>
+						<h4><a href="${context}/manager?project=${projectName}&job=${jobid}&history">Job History <span>$jobid</span></a></h4>
 					</div>
 				</div>
 			</div>

src/java/azkaban/webapp/servlet/velocity/jobpage.vm 2(+2 -0)

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index 2586adf..8c19a53 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -60,6 +60,8 @@
 						<h4><a href="${context}/manager?project=${project.name}">Project <span>$project.name</span></a></h4>
 						<h4 class="separator">&gt;</h4>
 						<h4><a href="${context}/manager?project=${project.name}&flow=${flowid}">Flow <span>$flowid</span></a></h4>
+						<h4 class="separator">&gt;</h4>
+						<h4><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}">Job <span>$jobid</span></a></h4>
 					</div>
 					
 					<a id="jobs-logs-btn" class="btn2" href="${context}/manager?project=${project.name}&job=$jobid&history">Job History</a>