azkaban-memoizeit

Hover area for navbar is now clickable. Fix hover and focus background

1/8/2014 6:10:35 AM

Details

diff --git a/src/java/azkaban/webapp/servlet/velocity/nav.vm b/src/java/azkaban/webapp/servlet/velocity/nav.vm
index 5c4f4eb..f709390 100644
--- a/src/java/azkaban/webapp/servlet/velocity/nav.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/nav.vm
@@ -14,6 +14,11 @@
  * the License.
 *#
 
+    <script type="text/javascript">
+      function navMenuClick(url) {
+        window.location.href = url;
+      }
+    </script>
     <div class="navbar navbar-inverse navbar-static-top">
       <div class="container-full">
         <div class="navbar-header">
@@ -35,20 +40,20 @@
         <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>
+						<li#if($current_page == 'all') class="active"#end onClick="navMenuClick('$!context/')"><a href="$!context/index">Projects</a></li>
+						<li#if($current_page == 'schedule') class="active"#end onClick="navMenuClick('$!context/schedule')"><a href="$!context/schedule">Scheduling</a></li>
+						<!--<li#if($current_page == 'triggers') class="active"#end onClick="navMenuClick('$!context/triggers')"><a href="$!context/triggers">Triggers</a></li>-->
+						<li#if($current_page == 'executing') class="active"#end onClick="navMenuClick('$!context/executor')"><a href="$!context/executor">Executing</a></li>
+						<li#if($current_page == 'history') class="active"#end onClick="navMenuClick('$!context/history')"><a href="$!context/history">History</a></li>
 	#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>
+						<li#if($current_page == $viewer.pluginName) class="active"#end onClick="navMenuClick('$!context/$viewer.pluginPath')"><a href="$!context/$viewer.pluginPath">$viewer.pluginName</a></li>
 		#end
 	#end
 
 	#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>
+						<li#if($current_page == $trigger.pluginName) class="active"#end onClick="navMenuClick('$!context/$trigger.pluginPath')"><a href="$!context/$trigger.pluginPath">$trigger.pluginName</a></li>
 		#end
 	#end
           </ul>
diff --git a/src/less/navbar.less b/src/less/navbar.less
index e4265ed..78d79a3 100644
--- a/src/less/navbar.less
+++ b/src/less/navbar.less
@@ -81,6 +81,11 @@
     > li > a {
       padding: 0px;
       color: #ccc;
+      &:focus,
+      &:hover {
+        color: #ccc;
+        background-color: transparent;
+      }
     }
 
     > .active {
@@ -93,11 +98,15 @@
       background-color: transparent;
       border-bottom: 1px solid #ff3601;
       &:hover {
+        color: #fff;
         background-color: transparent;
       }
     }
 
-    > .active > .open {
+    > .open > a,
+    > .open > a:hover,
+    > .open > a:focus {
+      color: #ccc;
       background-color: transparent;
     }
   }