azkaban-uncached
Changes
src/less/bootstrap-azkaban.less 65(+61 -4)
Details
diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index b332247..7eafaae 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -34,8 +34,8 @@
</head>
<body>
-#set($current_page="all")
-#parse("azkaban/webapp/servlet/velocity/nav2.vm")
+#set ($current_page="all")
+#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
<div class="container">
diff --git a/src/java/azkaban/webapp/servlet/velocity/login.vm b/src/java/azkaban/webapp/servlet/velocity/login.vm
index 4064be3..62a33f3 100644
--- a/src/java/azkaban/webapp/servlet/velocity/login.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/login.vm
@@ -27,20 +27,10 @@
</script>
</head>
<body>
- <div class="navbar navbar-inverse navbar-static-top">
- <div class="container">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
-#parse("azkaban/webapp/servlet/velocity/title2.vm")
- </div>
- <div class="navbar-collapse collapse">
- </div>
- </div>
- </div>
+
+#set ($current_page="all")
+#set ($navbar_disabled=1)
+#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
<div class="container">
<div class="row">
diff --git a/src/java/azkaban/webapp/servlet/velocity/nav2.vm b/src/java/azkaban/webapp/servlet/velocity/nav2.vm
index 44f2134..b0b89ac 100644
--- a/src/java/azkaban/webapp/servlet/velocity/nav2.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/nav2.vm
@@ -17,31 +17,40 @@
<div class="navbar navbar-inverse navbar-static-top">
<div class="container">
<div class="navbar-header">
+#if ($navbar_disabled != 1)
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
-#parse("azkaban/webapp/servlet/velocity/title2.vm")
+#end
+ <div class="navbar-logo">
+ <a href="${context}/">Azkaban</a>
+ </div>
</div>
+ <div class="navbar-left navbar-enviro">
+ <div class="navbar-enviro-name">${azkaban_name}</div>
+ <div class="navbar-enviro-server">${azkaban_label}</div>
+ </div>
<div class="navbar-collapse collapse">
+#if ($navbar_disabled != 1)
<ul class="nav navbar-nav">
<li#if($current_page == 'all') class="active"#end><a href="$!context/index">Projects</a></li>
<li#if($current_page == 'schedule') class="active"#end><a href="$!context/schedule">Scheduling</a></li>
<!--<li#if($current_page == 'triggers') class="active"#end><a href="$!context/triggers">Triggers</a></li>-->
<li#if($current_page == 'executing') class="active"#end><a href="$!context/executor">Executing</a></li>
<li#if($current_page == 'history') class="active"#end><a href="$!context/history">History</a></li>
-#foreach($viewer in $viewers)
- #if(!$viewer.hidden)
+ #foreach ($viewer in $viewers)
+ #if (!$viewer.hidden)
<li#if($current_page == $viewer.pluginName) class="active"#end><a href="$!context/$viewer.pluginPath">$viewer.pluginName</a></li>
+ #end
#end
-#end
-#foreach($trigger in $triggerPlugins)
- #if(!$trigger.hidden)
+ #foreach ($trigger in $triggerPlugins)
+ #if (!$trigger.hidden)
<li#if($current_page == $trigger.pluginName) class="active"#end><a href="$!context/$trigger.pluginPath">$trigger.pluginName</a></li>
+ #end
#end
-#end
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
@@ -51,6 +60,7 @@
</ul>
</li>
</ul>
+#end
</div><!--/.nav-collapse -->
</div>
</div>
src/less/bootstrap-azkaban.less 65(+61 -4)
diff --git a/src/less/bootstrap-azkaban.less b/src/less/bootstrap-azkaban.less
index cbd8101..55c12c3 100644
--- a/src/less/bootstrap-azkaban.less
+++ b/src/less/bootstrap-azkaban.less
@@ -138,6 +138,50 @@ table .worksheet-key {
}
}
+
+.navbar-logo {
+ float: left;
+ padding: 15px 15px;
+ font-size: 18px;
+ line-height: 20px;
+
+ a {
+ &:hover,
+ &:focus {
+ text-decoration: none;
+ }
+ }
+}
+
+@media (min-width: 768px) {
+ .navbar > .container .navbar-logo {
+ margin-left: -15px;
+ }
+}
+
+@media (min-width: 768px) {
+ .navbar-enviro {
+ width: auto;
+ }
+}
+
+.navbar-enviro {
+ margin: 25px 20px 0px 10px;
+
+ .navbar-enviro-name {
+ color: #ff3601;
+ font-family: Helvetica, Arial, Sans-Serif;
+ font-size: 118.75%;
+ font-weight: bold;
+ }
+
+ .navbar-enviro-server {
+ color: #999;
+ font-family: Helvetica, Arial, Sans-Serif;
+ font-size: 75%;
+ }
+}
+
.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%);
@@ -154,20 +198,28 @@ table .worksheet-key {
border-top: 5px solid #ff3601;
box-shadow: 0 1px 4px 1px #000;
- .navbar-brand {
+ .navbar-logo {
background: url('../../images/logo.png') top left no-repeat;
color: #ffffff;
font-size: 156.25%;
font-weight: bold;
margin: 15px 0.6% 15px 4.75%;
- padding: 10px 0 11px 42px;
-
- &:hover, &:focus {
+ padding: 12px 0 11px 42px;
+
+ a {
color: #ffffff;
+ &:hover,
+ &:focus {
+ color: #ffffff;
+ background-color: transparent;
+ }
}
}
.navbar-nav {
+ font-family: Arial;
+ font-size: 81.25%;
+
> li {
padding: 25px 12px 25px 12px;
cursor: pointer;
@@ -194,5 +246,10 @@ table .worksheet-key {
background-color: transparent;
}
}
+
+ > .active > .open {
+ background-color: transparent;
+ }
}
}
+