azkaban-uncached

Add top margin to login screen. Remove breadcrumb from project …

12/15/2013 10:52:54 PM

pages.

David Z. Chen

Commit: b1cbaf3

Tree: c9c9475

Parents: 9e34701

Changes

src/java/azkaban/webapp/servlet/velocity/login.vm 6(+3 -3)

src/java/azkaban/webapp/servlet/velocity/permissionspage.vm 7(+0 -7)

src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm 7(+0 -7)

src/java/azkaban/webapp/servlet/velocity/projectpage.vm 9(+1 -8)

src/less/bootstrap-azkaban.less 7(+7 -0)

Details

src/java/azkaban/webapp/servlet/velocity/login.vm 6(+3 -3)

diff --git a/src/java/azkaban/webapp/servlet/velocity/login.vm b/src/java/azkaban/webapp/servlet/velocity/login.vm
index 84b5e89..bb8968b 100644
--- a/src/java/azkaban/webapp/servlet/velocity/login.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/login.vm
@@ -28,12 +28,12 @@
   </head>
   <body>
 
-#set ($current_page="all")
-#set ($navbar_disabled=1)
+#set ($current_page = "all")
+#set ($navbar_disabled = 1)
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">
-			<div class="row">
+			<div class="row az-login">
 				<div class="col-lg-4">
 				</div>
 				<div class="col-lg-4">

src/java/azkaban/webapp/servlet/velocity/permissionspage.vm 7(+0 -7)

diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index ae0e33f..85fedb6 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -71,13 +71,6 @@
 		</div>
 
 		<div class="container">
-	
-  ## Breadcrumb
-
-      <ol class="breadcrumb">
-        <li class="active"><strong>Project</strong> $project.name</li>
-      </ol>
-
 			<div class="row">
 				<div class="col-lg-8">

src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm 7(+0 -7)

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
index c392463..17d6f6b 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
@@ -72,13 +72,6 @@
 	## Page content.
 
 		<div class="container">
-	
-  ## Breadcrumb
-
-      <ol class="breadcrumb">
-        <li class="active"><strong>Project</strong> $project.name</li>
-      </ol>
-
 			<div class="row">
 				<div class="col-lg-8">

src/java/azkaban/webapp/servlet/velocity/projectpage.vm 9(+1 -8)

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index 49b652d..3258dd9 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -78,16 +78,9 @@
 			</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">

src/less/bootstrap-azkaban.less 7(+7 -0)

diff --git a/src/less/bootstrap-azkaban.less b/src/less/bootstrap-azkaban.less
index 203f867..d32a8aa 100644
--- a/src/less/bootstrap-azkaban.less
+++ b/src/less/bootstrap-azkaban.less
@@ -1,3 +1,10 @@
+// Since the azkaban navbar no longer has the 20px bottom margin so that the
+// page header sits flush below the navbar, add a 20px top margin to the login
+// form.
+.az-login {
+  margin-top: 20px;
+}
+
 // Wide modal used for certain panels such as executing flow panel.
 .modal-wide .modal-dialog {
   width: 80%;