azkaban-developers

Issue #152 - Attach breadcrumb to page header.

2/10/2014 3:40:26 AM

David Z. Chen

Commit: 119652d

Tree: 9b1c991

Parents: ba5ba6d

Changes

src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm 23(+12 -11)

src/java/azkaban/webapp/servlet/velocity/flowpage.vm 19(+10 -9)

src/java/azkaban/webapp/servlet/velocity/jobdetailsheader.vm 24(+12 -12)

src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm 19(+10 -9)

src/java/azkaban/webapp/servlet/velocity/jobpage.vm 21(+11 -10)

src/java/azkaban/webapp/servlet/velocity/propertypage.vm 23(+12 -11)

src/less/header.less 22(+20 -2)

Details

src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm 23(+12 -11)

diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index 93575b0..f661e66 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -58,7 +58,7 @@
 
 	## Page header
 
-		<div class="az-page-header">
+		<div class="az-page-header page-header-bare">
 			<div class="container-full" id="flow-status">
         <div class="row">
           <div class="header-title">
@@ -83,20 +83,21 @@
           </div>
         </div>
 			</div>
-		</div>
+    </div>
+    <div class="page-breadcrumb">
+      <div class="container-full">
+        <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 class="active"><strong>Execution</strong> $execid</li>
+        </ol>
+      </div>
+    </div>
 
 		<div class="container-full">
 
   #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-
-	## Breadcrumb
-
-			<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 class="active"><strong>Execution</strong> $execid</li>
-			</ol>
-		
+	
 	## Tabs and buttons.
 
 			<ul class="nav nav-tabs" id="headertabs">

src/java/azkaban/webapp/servlet/velocity/flowpage.vm 19(+10 -9)

diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 99f111e..e4c9347 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -63,7 +63,7 @@
 	
 	## Page header.
 
-		<div class="az-page-header">
+		<div class="az-page-header page-header-bare">
 			<div class="container-full">
 				<div class="row">
 					<div class="header-title">
@@ -76,19 +76,20 @@
 					</div>
 				</div>
 			</div>
-		</div>
+    </div>
+    <div class="page-breadcrumb">
+      <div class="container-full">
+        <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>
+    </div>
 
 		<div class="container-full">
       
   #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
   
-  ## Breadcrumbs
-
-      <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>
-
   ## Tabs
 
 			<ul class="nav nav-tabs" id="headertabs">

src/java/azkaban/webapp/servlet/velocity/jobdetailsheader.vm 24(+12 -12)

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailsheader.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailsheader.vm
index 5037f49..904bbf0 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailsheader.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailsheader.vm
@@ -16,7 +16,7 @@
 
 	## Page header.
 
-		<div class="az-page-header">
+		<div class="az-page-header page-header-bare">
 			<div class="container-full">
 				<div class="row">
 					<div class="header-title">
@@ -29,22 +29,22 @@
 					</div>
 				</div>
 			</div>
-		</div>
-	
+    </div>
+    <div class="page-breadcrumb">
+      <div class="container-full">
+        <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}#jobslist"><strong>Execution</strong> $execid</a></li>
+          <li class="active"><strong>Job</strong> $jobid</li>
+        </ol>
+      </div>
+    </div>
 	
     <div class="container-full">
 
   #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 
-  ## Breadcrumb
-
-			<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}#jobslist"><strong>Execution</strong> $execid</a></li>
-				<li class="active"><strong>Job</strong> $jobid</li>
-			</ol>
-
   ## Tabs
 
 			<ul class="nav nav-tabs" id="headertabs">

src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm 19(+10 -9)

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
index e45e168..b1838bb 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
@@ -51,23 +51,24 @@
 	
 	## Page header
 
-		<div class="az-page-header">
+		<div class="az-page-header page-header-bare">
 			<div class="container-full">
         <h1><a href="${context}/manager?project=${projectName}&job=${jobid}&history">Job History <small>$jobid</small></a></h1>
 			</div>
-		</div>
+    </div>
+    <div class="page-breadcrumb">
+      <div class="container-full">
+        <ol class="breadcrumb">
+          <li><a href="${context}/manager?project=${projectName}"><strong>Project</strong> $projectName</a></li>
+          <li class="active"><strong>Job History</strong> $jobid</li>
+        </ol>
+      </div>
+    </div>
 
 		<div class="container-full">
 	
   #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 
-  ## Breadcrumb
-
-      <ol class="breadcrumb">
-        <li><a href="${context}/manager?project=${projectName}"><strong>Project</strong> $projectName</a></li>
-        <li class="active"><strong>Job History</strong> $jobid</li>
-      </ol>
-
   ## Time graph and job history table.
 
 			<div class="row">

src/java/azkaban/webapp/servlet/velocity/jobpage.vm 21(+11 -10)

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index 179cf8d..279a61e 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -44,7 +44,7 @@
 
 	## Page header
 
-		<div class="az-page-header">
+		<div class="az-page-header page-header-bare">
 			<div class="container-full">
         <div class="row">
           <div class="header-title">
@@ -58,20 +58,21 @@
           </div>
         </div>
 			</div>
-		</div>
+    </div>
+    <div class="page-breadcrumb">
+      <div class="container-full">
+        <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>
+      </div>
+    </div>
 
 		<div class="container-full">
 	
   #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
   
-  ## 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>
-
 			<div class="row row-offcanvas row-offcanvas-right">
 				<div class="col-xs-12 col-sm-9">

src/java/azkaban/webapp/servlet/velocity/propertypage.vm 23(+12 -11)

diff --git a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
index 9ddfeb5..f7ce6af 100644
--- a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
@@ -42,11 +42,21 @@
 
 	## Page header
 
-		<div class="az-page-header">
+		<div class="az-page-header page-header-bare">
 			<div class="container-full">
         <h1><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}&prop=${property}">Properties <small>$property</small></a></h1>
 			</div>
-		</div>
+    </div>
+    <div class="page-breadcrumb">
+      <div class="container-full">
+        <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><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}"><strong>Job</strong> $jobid</a></li>
+          <li class="active"><strong>Properties</strong> $property</li>
+        </ol>
+      </div>
+    </div>
 
     <div class="container-full">
 
@@ -55,15 +65,6 @@
 			<div class="row row-offcanvas row-offcanvas-right">
 				<div class="col-xs-12 col-sm-9">
 
-	## 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><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}"><strong>Job</strong> $jobid</a></li>
-            <li class="active"><strong>Properties</strong> $property</li>
-					</ol>
-	
 	## Properties
 
 					<div class="panel panel-default">

src/less/header.less 22(+20 -2)

diff --git a/src/less/header.less b/src/less/header.less
index 3e25b84..03ff1d2 100644
--- a/src/less/header.less
+++ b/src/less/header.less
@@ -1,8 +1,13 @@
 .az-page-header {
   padding: 5px 0 5px;
-  margin: 0 0 30px;
+  margin: 0 0 20px;
   border-bottom: 1px solid #dddddd;
-  background-color: #f4f4f4;
+  background-color: #f0f0f0;
+
+  &.page-header-bare {
+    margin-bottom: 0px;
+    border-bottom: 1px solid #dfdfdf;
+  }
 
   h1 {
     font-size: 22px;
@@ -51,3 +56,16 @@
     }
   }
 }
+
+.page-breadcrumb {
+  background-color: #f0f0f0;
+  border-bottom: 1px solid #dddddd;
+  padding: 5px 0 5px 0;
+  margin-bottom: 20px;
+
+  .breadcrumb {
+    margin: 0px;
+    padding: 0px;
+    background: transparent;
+  }
+}