azkaban-uncached
Changes
src/less/bootstrap-azkaban.less 10(+10 -0)
Details
diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index cec8db1..3937bde 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -75,17 +75,21 @@
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<p id="messaging-message"></p>
</div>
+ </div>
## Page header
- <div class="page-header">
+ <div class="az-page-header">
+ <div class="container">
<h1>
<a href="${context}/executor?execid=${execid}">Flow Execution <small>$execid</small></a>
</h1>
</div>
+ </div>
+
+ <div class="container">
## 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>
diff --git a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
index 7ec5a6c..9ca6f13 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
@@ -43,15 +43,19 @@
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<p id="messaging-message"></p>
</div>
+ </div>
## Page header.
- <div class="page-header">
+ <div class="az-page-header">
+ <div class="container">
<h1>Executing Flows</h1>
</div>
+ </div>
## Page Content
+ <div class="container">
<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index b9833fe..9915e15 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -78,16 +78,20 @@
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<p id="messaging-message"></p>
</div>
+ </div>
## Page header.
- <div class="page-header">
+ <div class="az-page-header">
+ <div class="container">
<h1><a href="${context}/manager?project=${project.name}">Project <small>$project.name</small></a></h1>
<p>$project.description</p>
</div>
+ </div>
## Breadcrumbs and tabs
+ <div class="container">
<div class="row">
<div class="col-lg-12">
<ol class="breadcrumb">
diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index e31bc0d..bf326b1 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -66,12 +66,17 @@
#end
#end
+ </div>
+
## Page header.
- <div class="page-header">
+ <div class="az-page-header">
+ <div class="container">
<h1>History</h1>
</div>
+ </div>
+ <div class="container">
<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index 7eafaae..1df272a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -41,9 +41,9 @@
## Page error or success message.
-#if($error_message != "null")
+#if ($error_message != "null")
<div class="alert alert-danger">$error_message</div>
-#elseif($success_message != "null")
+#elseif ($success_message != "null")
<div class="alert alert-success">$success_message</div>
#end
@@ -55,9 +55,12 @@
<p id="messaging-message"></p>
</div>
+ </div>
+
## Page Header and project search form.
- <div class="page-header">
+ <div class="az-page-header">
+ <div class="container">
#if ($allProjects)
<h1>All Projects</h1>
<p>My Projects</p>
@@ -66,9 +69,11 @@
<p>All Projects</p>
#end
</div>
+ </div>
## Table of projects.
+ <div class="container">
<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index f6abad7..b6fa521 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -60,15 +60,20 @@
#elseif ($success_message != "null")
<div class="alert alert-success">$success_message</div>
#end
-
+
+ </div>
+
## Page header.
- <div class="page-header">
+ <div class="az-page-header">
+ <div class="container">
<h1><a href="${context}/executor?execid=${execid}&job=${jobid}">Job Execution <small>$jobid</small></a></h1>
</div>
+ </div>
## Breadcrumb
+ <div class="container">
<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>
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
index ffb9f8a..c6f2ebb 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
@@ -83,16 +83,20 @@
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<p id="messaging-message"></p>
</div>
+ </div>
## Page header
- <div class="page-header">
+ <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>
</div>
+ </div>
+ <div class="container">
<div class="row">
<div class="col-lg-8">
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index db11bdd..74cc3bd 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -65,16 +65,20 @@
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<p id="messaging-message"></p>
</div>
+ </div>
## Page header
- <div class="page-header">
+ <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>
</div>
+ </div>
+ <div class="container">
<div class="row">
<div class="col-lg-8">
diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index e6bcdeb..9252f9c 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -62,12 +62,16 @@
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<p id="messaging-message"></p>
</div>
+ </div>
- <div class="page-header">
+ <div class="az-page-header">
+ <div class="container">
<h1><a href="${context}/manager?project=${project.name}">Project <small>$project.name</small></a></h1>
<p>$project.description</p>
</div>
+ </div>
+ <div class="container">
<div class="row">
<div class="col-lg-8">
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
index 3a5a7c7..a5cabf7 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
@@ -59,15 +59,20 @@
<div class="alert alert-success">$success_message</div>
#end
+ </div>
+
## Page header.
- <div class="page-header">
+ <div class="az-page-header">
+ <div class="container">
<h1><a href="${context}/manager?project=${project.name}">Project <small>$project.name</small></a></h1>
<p>$project.description</p>
</div>
+ </div>
## Page content.
+ <div class="container">
<div class="row">
<div class="col-lg-8">
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index 73546c6..c9fcc8b 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -68,16 +68,20 @@
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<p id="messaging-message"></p>
</div>
+ </div>
## Page header.
- <div class="page-header">
+ <div class="az-page-header">
+ <div class="container">
<h1><a href="${context}/manager?project=${project.name}">Project <small>$project.name</small></a></h1>
<p>$project.description</p>
</div>
+ </div>
## Page content.
+ <div class="container">
<div class="row">
<div class="col-lg-8">
diff --git a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
index 81eb31f..f033dd3 100644
--- a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
@@ -54,16 +54,20 @@
#elseif ($success_message != "null")
<div class="alert alert-success">$success_message</div>
#end
+ </div>
## Page header
- <div class="page-header">
+ <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>
</div>
+ </div>
+ <div class="container">
<div class="row">
<div class="col-lg-8">
diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
index ee51a3c..e5b9ffc 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
@@ -66,15 +66,19 @@
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<p id="messaging-message"></p>
</div>
+ </div>
## Page header.
- <div class="page-header">
+ <div class="az-page-header">
+ <div class="container">
<h1>Scheduled Flows</h1>
</div>
+ </div>
## Page content.
+ <div class="container">
<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
src/less/bootstrap-azkaban.less 10(+10 -0)
diff --git a/src/less/bootstrap-azkaban.less b/src/less/bootstrap-azkaban.less
index 55c12c3..645e769 100644
--- a/src/less/bootstrap-azkaban.less
+++ b/src/less/bootstrap-azkaban.less
@@ -182,6 +182,7 @@ table .worksheet-key {
}
}
+// Restyle navbar-inverse for Azkaban navbar.
.navbar-inverse {
background-image: -o-linear-gradient(bottom, rgb(56,56,56) 33%, rgb(73,73,73) 66%);
background-image: -moz-linear-gradient(bottom, rgb(56,56,56) 33%, rgb(73,73,73) 66%);
@@ -253,3 +254,12 @@ table .worksheet-key {
}
}
+.az-page-header {
+ padding-bottom: 9px;
+ margin: 0 0 30px;
+ border-bottom: 1px solid #eeeeee;
+
+ h1 {
+ font-size: 32px;
+ }
+}