Details
diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index f427ce4..891f19c 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -92,7 +92,7 @@
<ol class="breadcrumb">
<li><a href="${context}/manager?project=${projectName}"><strong>Project</strong> $projectName</a></li>
<li><a href="${context}/manager?project=${projectName}&flow=${flowid}"><strong>Flow</strong> $flowid</a></li>
- <li><a href="${context}/executor?execid=${execid}"><strong>Execution</strong> $execid</a></li>
+ <li class="active"><strong>Execution</strong> $execid</li>
</ol>
## Flow status
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 1021787..cb48fbc 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -83,7 +83,7 @@
<div class="az-page-header">
<div class="container">
- <h1><a href="${context}/manager?project=${project.name}">Project <small>$project.name</small></a></h1>
+ <h1><a href="${context}/manager?project=${project.name}&flow=${flowid}">Flow <small>$flowid</small></a></h1>
<p>$project.description</p>
</div>
</div>
@@ -91,14 +91,10 @@
## Breadcrumbs and tabs
<div class="container">
- <div class="row">
- <div class="col-lg-12">
- <ol class="breadcrumb">
- <li><a href="${context}/manager?project=${project.name}"><strong>Project</strong> $project.name</a></li>
- <li><a href="${context}/manager?project=${project.name}&flow=${flowid}"><strong>Flow</strong> $flowid</a></li>
- </ol>
- </div>
- </div>
+ <ol class="breadcrumb">
+ <li><a href="${context}/manager?project=${project.name}"><strong>Project</strong> $project.name</a></li>
+ <li class="active"><strong>Flow</strong> $flowid</li>
+ </ol>
<div class="row">
<div class="col-lg-8">
diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index a587837..3b99772 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -62,10 +62,8 @@
<div class="container">
#if ($allProjects)
<h1>All Projects</h1>
- <p>My Projects</p>
#else
<h1>My Projects</h1>
- <p>All Projects</p>
#end
</div>
</div>
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index af48c17..639a70e 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -77,17 +77,25 @@
<li><a href="${context}/manager?project=${projectName}"><strong>Project</strong> $projectName</a></li>
<li><a href="${context}/manager?project=${projectName}&flow=${flowid}"><strong>Flow</strong> $flowid</a></li>
<li><a href="${context}/executor?execid=${execid}#jobslist"><strong>Execution</strong> $execid</a></li>
- <li><a href="${context}/manager?project=${projectName}&flow=${flowid}&job=$jobid"><strong>Job</strong> $jobid</a></li>
+ <li class="active"><strong>Job</strong> $jobid</li>
</ol>
-
- ## Tabs
-
- <ul class="nav nav-tabs" id="headertabs">
- <li id="jobSummaryViewLink"><a href="#jobsummary">Summary</a></li>
- <li id="jobLogViewLink"><a href="#joblog">Log</a></li>
- <li><a href="${context}/pigvisualizer?execid=${execid}&jobid=${jobid}">Visualization</a></li>
- </ul>
+ <div class="row">
+ <div class="col-lg-8">
+ <ul class="nav nav-pills" id="headertabs">
+ <li id="jobSummaryViewLink"><a href="#jobsummary">Summary</a></li>
+ <li id="jobLogViewLink"><a href="#joblog">Log</a></li>
+ <li><a href="${context}/pigvisualizer?execid=${execid}&jobid=${jobid}">Visualization</a></li>
+ </ul>
+ </div>
+ <div class="col-lg-4">
+ <div class="pull-right">
+ <a href="${context}/manager?project=${projectName}&flow=${flowid}&job=$jobid" class="btn btn-default">Job Properties</a>
+ </div>
+ <div class="clearfix"></div>
+ </div>
+ </div>
+
## Log content.
<div class="row" id="jobLogView">
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index e2fc5fc..fc2c378 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -70,25 +70,23 @@
<div class="az-page-header">
<div class="container">
- <h1>
- <a href="${context}/manager?project=${project.name}">$project.name</a> /
- <a href="${context}/manager?project=${project.name}&flow=${flowid}">$flowid</a>
- </h1>
+ <h1><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}">Job <small>$jobid</small></a></h1>
</div>
</div>
<div class="container">
- <div class="row">
- <div class="col-lg-8">
+
+ ## Breadcrumb
- ## Breadcrumb
+ <ol class="breadcrumb">
+ <li><a href="${context}/manager?project=${project.name}"><strong>Project</strong> $project.name</a></li>
+ <li><a href="${context}/manager?project=${project.name}&flow=${flowid}"><strong>Flow</strong> $flowid</a></li>
+ <li class="active"><strong>Job</strong> $jobid</li>
+ </ol>
- <ol class="breadcrumb">
- <li><a href="${context}/manager?project=${project.name}"><strong>Project</strong> $project.name</a></li>
- <li><a href="${context}/manager?project=${project.name}&flow=${flowid}"><strong>Flow</strong> $flowid</a></li>
- <li class="active"><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}"><strong>Job</strong> $jobid</a></li>
- </ol>
-
+ <div class="row">
+ <div class="col-lg-8">
+
#set ($job_page="properties")
#parse ("azkaban/webapp/servlet/velocity/jobnav.vm")
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index e9eebe6..49b652d 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -78,18 +78,19 @@
</div>
</div>
+
+ ## Breadcrumb
+
+ <div class="container">
+ <ol class="breadcrumb">
+ <li class="active"><strong>Project</strong> $project.name</li>
+ </ol>
+
## Page content.
- <div class="container">
<div class="row">
<div class="col-lg-8">
- ## Breadcrumb
-
- <ol class="breadcrumb">
- <li class="active"><a href="${context}/manager?project=${project.name}"><strong>Project</strong> $project.name</a></li>
- </ol>
-
#set ($project_page = "flows")
#parse ("azkaban/webapp/servlet/velocity/projectnav.vm")
