Prosoft Git

azkaban-uncached

Remove old Azkaban web UI resources.

12/14/2013 4:45:37 AM
David Z. Chen

David Z. Chen

Commit: 9646b70

Tree: 770d2f0

Parents: d3b58c9

Changes

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

src/java/azkaban/webapp/servlet/velocity/executionspage.vm 8(+4 -4)

src/java/azkaban/webapp/servlet/velocity/flowpage.vm 8(+4 -4)

src/java/azkaban/webapp/servlet/velocity/historypage.vm 8(+4 -4)

src/java/azkaban/webapp/servlet/velocity/index.vm 4(+2 -2)

src/java/azkaban/webapp/servlet/velocity/jmxpage.vm 8(+4 -4)

src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm 8(+4 -4)

src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm 8(+4 -4)

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

src/java/azkaban/webapp/servlet/velocity/login.vm 4(+2 -2)

src/java/azkaban/webapp/servlet/velocity/nav.vm 90(+49 -41)

src/java/azkaban/webapp/servlet/velocity/nav2.vm 66(+0 -66)

src/java/azkaban/webapp/servlet/velocity/permissionspage.vm 4(+2 -2)

src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm 8(+4 -4)

src/java/azkaban/webapp/servlet/velocity/projectpage.vm 4(+2 -2)

src/java/azkaban/webapp/servlet/velocity/propertypage.vm 8(+4 -4)

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

src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm 8(+4 -4)

src/java/azkaban/webapp/servlet/velocity/style.vm 28(+13 -15)

src/java/azkaban/webapp/servlet/velocity/style2.vm 30(+0 -30)

src/java/azkaban/webapp/servlet/velocity/triggerspage.vm 8(+4 -4)

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

src/web/css/archive.css 44(+0 -44)

src/web/css/azkaban.css 3030(+0 -3030)

src/web/js/backbone-0.5.3-min.js 33(+0 -33)

src/web/js/jquery.simplemodal.js 25(+0 -25)

src/web/js/jquery.simplemodal-1.4.4.js 716(+0 -716)

src/web/js/underscore-1.2.1-min.js 30(+0 -30)

Details

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index 3937bde..7068095 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -15,10 +15,10 @@
 *#
 
 <!DOCTYPE html> 
-<html>
+<html lang="en">
 	<head>
 
-#parse("azkaban/webapp/servlet/velocity/style2.vm")
+#parse("azkaban/webapp/servlet/velocity/style.vm")
 #parse("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-1.10.1.custom.js"></script>
@@ -51,7 +51,7 @@
 
 #set ($current_page="all")
 #set ($show_schedule="false")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">

src/java/azkaban/webapp/servlet/velocity/executionspage.vm 8(+4 -4) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
index 9ca6f13..7a4997b 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
@@ -15,10 +15,10 @@
 *#
 
 <!DOCTYPE html> 
-<html>
-	<head lang="en">
+<html lang="en">
+	<head>
 
-#parse("azkaban/webapp/servlet/velocity/style2.vm")
+#parse("azkaban/webapp/servlet/velocity/style.vm")
 #parse("azkaban/webapp/servlet/velocity/javascript.vm")
 	
 		<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
@@ -33,7 +33,7 @@
 	<body>
 
 #set ($current_page="executing")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">

src/java/azkaban/webapp/servlet/velocity/flowpage.vm 8(+4 -4) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 9915e15..5e0b2af 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -15,10 +15,10 @@
 *#
 
 <!DOCTYPE html> 
-<html>
-	<head lang="en">
+<html lang="en">
+	<head>
 
-#parse("azkaban/webapp/servlet/velocity/style2.vm")
+#parse("azkaban/webapp/servlet/velocity/style.vm")
 #parse("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-1.10.1.custom.js"></script>
@@ -52,7 +52,7 @@
 	<body>
 
 #set ($current_page="all")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">

src/java/azkaban/webapp/servlet/velocity/historypage.vm 8(+4 -4) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index bf326b1..240825a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -15,10 +15,10 @@
 *#
 
 <!DOCTYPE html> 
-<html>
-	<head lang="en">
+<html lang="en">
+	<head>
 
-#parse("azkaban/webapp/servlet/velocity/style2.vm")
+#parse("azkaban/webapp/servlet/velocity/style.vm")
 #parse("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-1.10.1.custom.css" />
@@ -38,7 +38,7 @@
 	<body>
 		
 #set ($current_page="history")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">

src/java/azkaban/webapp/servlet/velocity/index.vm 4(+2 -2) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index 1df272a..5ee0100 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -18,7 +18,7 @@
 <html lang="en">
 	<head>
 
-#parse("azkaban/webapp/servlet/velocity/style2.vm")
+#parse("azkaban/webapp/servlet/velocity/style.vm")
 #parse("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<script type="text/javascript" src="${context}/js/azkaban.table.sort.js"></script>
@@ -35,7 +35,7 @@
 	<body>
 
 #set ($current_page="all")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">

src/java/azkaban/webapp/servlet/velocity/jmxpage.vm 8(+4 -4) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm b/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm
index 5b7c321..bc86b0b 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm
@@ -15,10 +15,10 @@
 *#
 
 <!DOCTYPE html> 
-<html>
-	<head lang="en">
+<html lang="en">
+	<head>
 		
-#parse ("azkaban/webapp/servlet/velocity/style2.vm")
+#parse ("azkaban/webapp/servlet/velocity/style.vm")
 #parse ("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
@@ -35,7 +35,7 @@
 		
 #set ($current_page="all")
 #set ($counter = 0)
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">

src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm 8(+4 -4) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index b6fa521..50afd9f 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -15,10 +15,10 @@
 *#
 
 <!DOCTYPE html> 
-<html>
-	<head lang="en">
+<html lang="en">
+	<head>
 
-#parse("azkaban/webapp/servlet/velocity/style2.vm")
+#parse("azkaban/webapp/servlet/velocity/style.vm")
 #parse("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<script type="text/javascript" src="${context}/js/azkaban.ajax.utils.js"></script>
@@ -41,7 +41,7 @@
 	<body>
 
 #set ($current_page="executing")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">

src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm 8(+4 -4) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
index c6f2ebb..95fe515 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
@@ -15,10 +15,10 @@
 *#
 
 <!DOCTYPE html> 
-<html>
-	<head lang="en">
+<html lang="en">
+	<head>
 
-#parse("azkaban/webapp/servlet/velocity/style2.vm")
+#parse("azkaban/webapp/servlet/velocity/style.vm")
 #parse("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
@@ -59,7 +59,7 @@
 	<body>
 
 #set ($current_page="all")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index 74cc3bd..f32d9e1 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -15,10 +15,10 @@
 *#
 
 <!DOCTYPE html> 
-<html>
+<html lang="en">
 	<head>
 
-#parse ("azkaban/webapp/servlet/velocity/style2.vm")
+#parse ("azkaban/webapp/servlet/velocity/style.vm")
 #parse ("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-1.10.1.custom.css" />
@@ -39,7 +39,7 @@
 	<body>
 		
 #set ($current_page="all")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">

src/java/azkaban/webapp/servlet/velocity/login.vm 4(+2 -2) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/login.vm b/src/java/azkaban/webapp/servlet/velocity/login.vm
index 62a33f3..84b5e89 100644
--- a/src/java/azkaban/webapp/servlet/velocity/login.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/login.vm
@@ -18,7 +18,7 @@
 <html lang="en">
   <head>
 
-#parse("azkaban/webapp/servlet/velocity/style2.vm")
+#parse("azkaban/webapp/servlet/velocity/style.vm")
 #parse("azkaban/webapp/servlet/velocity/javascript.vm")
 
     <script type="text/javascript" src="${context}/js/azkaban.login.js"></script>
@@ -30,7 +30,7 @@
 
 #set ($current_page="all")
 #set ($navbar_disabled=1)
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">
 			<div class="row">

src/java/azkaban/webapp/servlet/velocity/nav.vm 90(+49 -41) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/nav.vm b/src/java/azkaban/webapp/servlet/velocity/nav.vm
index c2fef78..b0b89ac 100644
--- a/src/java/azkaban/webapp/servlet/velocity/nav.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/nav.vm
@@ -13,46 +13,54 @@
  * License for the specific language governing permissions and limitations under
  * the License.
 *#
-		<div id="header" class="header">
-#parse( "azkaban/webapp/servlet/velocity/title.vm" )
-			<script type="text/javascript">
-				function navMenuClick(url) {
-					window.location.href=url;
-				}
 
-			</script>
-
-			<ul id="nav" class="nav">
-				<li id="all-jobs-tab" #if($current_page == 'all')class="selected"#end onClick="navMenuClick('$!context/index')"><a href="$!context/index">Projects</a></li>
-				<li id="scheduled-jobs-tab" #if($current_page == 'schedule')class="selected"#end onClick="navMenuClick('$!context/schedule')"><a href="$!context/schedule">Scheduled</a></li>
-
-				<!--li id="triggers-tab" #if($current_page == 'triggers')class="selected"#end onClick="navMenuClick('$!context/triggers')"><a href="$!context/triggers">Triggers</a></li-->
-
-				<li id="executing-jobs-tab" #if($current_page == 'executing')class="selected"#end onClick="navMenuClick('$!context/executor')"><a href="$!context/executor">Executing</a></li>
-				<li id="history-jobs-tab" #if($current_page == 'history')class="selected"#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="selected"#end onClick="navMenuClick('$!context/$viewer.pluginPath')">
-						<a href="$!context/$viewer.pluginPath">$viewer.pluginName</a>
-					</li>
-					#end
-				#end
-				
-				#foreach($triggerPlugin in $triggerPlugins)
-					#if(!$triggerPlugin.hidden)
-					<li #if($current_page == $triggerPlugin.pluginName) class="selected"#end onClick="navMenuClick('$!context/$triggerPlugin.pluginPath')">
-						<a href="$!context/$triggerPlugin.pluginPath">$triggerPlugin.pluginName</a>
-					</li>
-					#end
-				#end
-				
-			</ul>
-			
-			<div id="user-id">
-				<a>${user_id}<div id="user-down"></div></a>    
-				<div id="user-menu">
-					<ul><li><a id="logout" href="$!context?logout">logout</a></li></ul>
+    <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>
+#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>
-		</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)
+						<li#if($current_page == $viewer.pluginName) class="active"#end><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>
+		#end
+	#end
+          </ul>
+          <ul class="nav navbar-nav navbar-right">
+            <li class="dropdown">
+							<a href="#" class="dropdown-toggle" data-toggle="dropdown">${user_id} <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><a href="$!context?logout">Logout</a></li>
+              </ul>
+            </li>
+          </ul>
+#end
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>

src/java/azkaban/webapp/servlet/velocity/permissionspage.vm 4(+2 -2) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index 9252f9c..25d5cf4 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -18,7 +18,7 @@
 <html lang="en">
 	<head>
 
-#parse ("azkaban/webapp/servlet/velocity/style2.vm")
+#parse ("azkaban/webapp/servlet/velocity/style.vm")
 #parse ("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
@@ -36,7 +36,7 @@
 	<body>
 
 #set ($current_page = "all")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 	<div class="container">

src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm 8(+4 -4) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
index a5cabf7..a3b437f 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
@@ -15,10 +15,10 @@
 *#
 
 <!DOCTYPE html> 
-<html>
-	<head lang="en">
+<html lang="en">
+	<head>
 
-#parse ("azkaban/webapp/servlet/velocity/style2.vm")
+#parse ("azkaban/webapp/servlet/velocity/style.vm")
 #parse ("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<script type="text/javascript" src="${context}/js/azkaban.date.utils.js"></script>
@@ -39,7 +39,7 @@
 	<body>
 
 #set ($current_page="executing")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">

src/java/azkaban/webapp/servlet/velocity/projectpage.vm 4(+2 -2) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index c9fcc8b..1aab424 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -18,7 +18,7 @@
 <html lang="en">
 	<head>
 
-#parse ("azkaban/webapp/servlet/velocity/style2.vm")
+#parse ("azkaban/webapp/servlet/velocity/style.vm")
 #parse ("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-1.10.1.custom.css" />
@@ -42,7 +42,7 @@
 	<body>
 
 #set ($current_page="all")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">

src/java/azkaban/webapp/servlet/velocity/propertypage.vm 8(+4 -4) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
index f033dd3..0e47472 100644
--- a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
@@ -15,10 +15,10 @@
 *#
 
 <!DOCTYPE html> 
-<html>
-	<head lang="en">
+<html lang="en">
+	<head>
 
-#parse("azkaban/webapp/servlet/velocity/style2.vm")
+#parse("azkaban/webapp/servlet/velocity/style.vm")
 #parse ("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
@@ -35,7 +35,7 @@
 	<body>
 
 #set($current_page="all")
-#parse("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse("azkaban/webapp/servlet/velocity/nav.vm")
 		
 		<div class="container">

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
index 6db76fa..5a11331 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
@@ -15,10 +15,10 @@
 *#
 
 <!DOCTYPE html> 
-<html>
+<html lang="en">
 	<head>
 
-#parse ("azkaban/webapp/servlet/velocity/style2.vm")
+#parse ("azkaban/webapp/servlet/velocity/style.vm")
 #parse ("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-1.10.1.custom.css" />
@@ -45,7 +45,7 @@
 	<body>
 
 #set ($current_page="schedule")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
     <div class="container">

src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm 8(+4 -4) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
index e5b9ffc..66a2dd1 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
@@ -15,10 +15,10 @@
 *#
 
 <!DOCTYPE html> 
-<html>
-	<head lang="en">
+<html lang="en">
+  <head>
 
-#parse ("azkaban/webapp/servlet/velocity/style2.vm")
+#parse ("azkaban/webapp/servlet/velocity/style.vm")
 #parse ("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-1.10.1.custom.css" />
@@ -40,7 +40,7 @@
 	<body>
 
 #set ($current_page="schedule")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">

src/java/azkaban/webapp/servlet/velocity/style.vm 28(+13 -15) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/style.vm b/src/java/azkaban/webapp/servlet/velocity/style.vm
index 67a7e4a..6f65f36 100644
--- a/src/java/azkaban/webapp/servlet/velocity/style.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/style.vm
@@ -14,19 +14,17 @@
  * the License.
 *#
 
-		<title>#appname()
-		</title>
-		<link rel="stylesheet" type="text/css" href="${context}/css/azkaban.css" /> 
+    <meta charset="utf-8">
+    <title>#appname()</title>
+    
 		<link rel="shortcut icon" href="${context}/favicon.ico" />
-		<style type="text/css">
-			.enviro-name {
-				color: ${azkaban_color};
-			}
-			.header {
-				border-top-color: ${azkaban_color};
-			}
-			.nav .selected a {
-				border-bottom-color: ${azkaban_color};
-			}
-		</style>
-		<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+    <!-- Bootstrap core CSS -->
+    <link href="/css/bootstrap.css" rel="stylesheet">
+    <link href="/css/bootstrap-fileinput.css" rel="stylesheet">
+    <link href="/css/bootstrap-azkaban.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="/js/html5shiv.js"></script>
+      <script src="/js/respond.min.js"></script>
+    <![endif]-->

src/java/azkaban/webapp/servlet/velocity/triggerspage.vm 8(+4 -4) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm b/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
index 73f0c5c..be065ec 100644
--- a/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
@@ -15,10 +15,10 @@
 *#
 
 <!DOCTYPE html> 
-<html>
-	<head lang="en">
+<html lang="en">
+	<head>
 
-#parse("azkaban/webapp/servlet/velocity/style2.vm")
+#parse("azkaban/webapp/servlet/velocity/style.vm")
 #parse("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-1.10.1.custom.css" />
@@ -41,7 +41,7 @@
 	<body>
 
 #set ($current_page="triggers")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
     <div class="container">

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/viewer.vm b/src/java/azkaban/webapp/servlet/velocity/viewer.vm
index 9887bb9..42f3393 100644
--- a/src/java/azkaban/webapp/servlet/velocity/viewer.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/viewer.vm
@@ -18,8 +18,8 @@
 <html>
 	<head>
 
-#parse("azkaban/webapp/servlet/velocity/style2.vm")
-#parse("azkaban/webapp/servlet/velocity/javascript.vm")
+#parse ("azkaban/webapp/servlet/velocity/style.vm")
+#parse ("azkaban/webapp/servlet/velocity/javascript.vm")
 
 		<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
 		<script type="text/javascript">
@@ -40,7 +40,7 @@
 	<body>
 
 #set ($current_page="viewer")
-#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+#parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
     <div class="container">

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github