azkaban-memoizeit

diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index 2bffc0f..8650ae8 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -57,7 +57,6 @@
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 
@@ -92,6 +91,8 @@
 
 		<div class="container-full">
 
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
 	## Breadcrumb
 
 			<ol class="breadcrumb">

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
index b6369bf..41ce8d6 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
@@ -35,10 +35,6 @@
 #set ($current_page="executing")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
-#parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-		</div>
-
 ## Page header.
 
 		<div class="az-page-header">
@@ -47,9 +43,12 @@
 			</div>
 		</div>
 
+		<div class="container-full">
+      
+#parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
 ## Page Content
 
-		<div class="container-full">
       <ul class="nav nav-tabs" id="header-tabs">
         <li id="currently-running-view-link"><a href="#currently-running">Currently Running</a></li>
         <li id="recently-finished-view-link"><a href="#recently-finished">Recently Finished</a></li>

src/java/azkaban/webapp/servlet/velocity/flowpage.vm 10(+7 -3)

diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 59da59d..16fd5eb 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -59,7 +59,6 @@
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 	
 	## Page header.
@@ -80,14 +79,19 @@
 			</div>
 		</div>
 
-	## Breadcrumbs and tabs
-
 		<div class="container-full">
+      
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+  
+  ## Breadcrumbs
+
       <ol class="breadcrumb">
         <li><a href="${context}/manager?project=${project.name}"><strong>Project</strong> $project.name</a></li>
         <li class="active"><strong>Flow</strong> $flowid</li>
       </ol>
 
+  ## Tabs
+
 			<ul class="nav nav-tabs" id="headertabs">
 				<li id="graphViewLink"><a href="#graph">Graph</a></li>
 				<li id="executionsViewLink"><a href="#executions">Executions</a></li>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index 66f0965..a0cea62 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -41,7 +41,6 @@
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
   ## Page header.
@@ -70,7 +69,10 @@
 			</div>
 		</div>
 
-		<div class="container-full">
+    <div class="container-full">
+
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
 			<div class="row">
 				<div class="col-lg-12">
           <table id="executingJobs" class="table table-striped table-bordered table-hover table-condensed executions-table">

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index d726e52..159bd1a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -36,10 +36,6 @@
 #set ($current_page="all")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
-#parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-		</div>
-
 ## Page Header and project search form.
 
 		<div class="az-page-header">
@@ -81,9 +77,12 @@
 			</div>
 		</div>
 
+		<div class="container-full">
+      
+#parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
 ## Table of projects.
 
-		<div class="container-full">
 			<div class="row">
 				<div class="col-lg-12">
           <table class="table table-condensed table-striped table-bordered table-hover" id="all-jobs">

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index b126c03..d1614c6 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -46,7 +46,6 @@
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header.
@@ -66,16 +65,21 @@
 			</div>
 		</div>
 	
-	## Breadcrumb
+    <div class="container-full">
+
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
+  ## Breadcrumb
 
-		<div class="container-full">
 			<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>
 				<li><a href="${context}/executor?execid=${execid}#jobslist"><strong>Execution</strong> $execid</a></li>
         <li class="active"><strong>Job</strong> $jobid</li>
 			</ol>
-			
+
+  ## Tabs
+
 			<ul class="nav nav-tabs" id="headertabs">
 				<li id="jobSummaryViewLink"><a href="#jobsummary">Summary</a></li>
 				<li id="jobLogViewLink"><a href="#joblog">Log</a></li>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
index e5b8795..2461332 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
@@ -64,7 +64,6 @@
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 	
 	## Page header
@@ -77,6 +76,8 @@
 
 		<div class="container-full">
 	
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
   ## Breadcrumb
 
       <ol class="breadcrumb">
@@ -84,6 +85,8 @@
         <li class="active"><strong>Job History</strong> $jobid</li>
       </ol>
 
+  ## Time graph and job history table.
+
 			<div class="row">
 				<div class="col-lg-12">
 					<div class="well well-clear well-sm">

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index 2be1cc5..37dc9e8 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -42,7 +42,6 @@
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header
@@ -65,6 +64,8 @@
 
 		<div class="container-full">
 	
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+  
   ## Breadcrumb
 
       <ol class="breadcrumb">

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index 752e560..d0285cf 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -42,7 +42,6 @@
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header.
@@ -51,7 +50,10 @@
 
   ## Page content.
 
-		<div class="container-full">
+    <div class="container-full">
+
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
 			<div class="row row-offcanvas row-offcanvas-right">
 				<div class="col-xs-12 col-sm-9">

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
index 923d0b7..771c3f3 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
@@ -45,7 +45,6 @@
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header.
@@ -54,7 +53,10 @@
 
 	## Page content.
 
-		<div class="container-full">
+    <div class="container-full">
+
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
 			<div class="row row-offcanvas row-offcanvas-right">
 				<div class="col-xs-12 col-sm-9">

src/java/azkaban/webapp/servlet/velocity/projectpage.vm 8(+5 -3)

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index b6199bf..5fe72ca 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -49,16 +49,18 @@
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header.
 	
   #parse ("azkaban/webapp/servlet/velocity/projectpageheader.vm")
 
-	## Page content.
-
     <div class="container-full">
+      
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
+  ## Page content.
+
 			<div class="row row-offcanvas row-offcanvas-right">
 				<div class="col-xs-12 col-sm-9" id="flow-tabs">

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
index 07b0cfa..0360517 100644
--- a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
@@ -40,7 +40,6 @@
 #if ($errorMsg)
   #parse("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header
@@ -51,7 +50,10 @@
 			</div>
 		</div>
 
-		<div class="container-full">
+    <div class="container-full">
+
+  #parse("azkaban/webapp/servlet/velocity/alerts.vm")
+
 			<div class="row row-offcanvas row-offcanvas-right">
 				<div class="col-xs-12 col-sm-9">

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
index 5a3c7f2..87c9956 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
@@ -50,8 +50,6 @@
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-#end
 		</div>
 
     <div class="az-page-header">
@@ -60,6 +58,8 @@
       </div>
     </div>
 
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
     <div class="container-full">
       <div class="row">
         <div class="col-lg-12">
@@ -73,6 +73,7 @@
       </div>
       
       <div id="contextMenu"></div>
+#end
     </div>
 	</body>
 </html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
index c877622..24a73d8 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
@@ -44,7 +44,6 @@
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header.
@@ -58,7 +57,10 @@
 	## Page content.
 
 		<div class="container-full">
-			<div class="row">
+
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+      
+      <div class="row">
 				<div class="col-lg-12">
           <table id="scheduledFlowsTbl" class="table table-striped table-condensed table-bordered table-hover">
             <thead>

src/java/azkaban/webapp/servlet/velocity/triggerspage.vm 16(+9 -7)

diff --git a/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm b/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
index 55912bd..762474d 100644
--- a/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
@@ -46,8 +46,6 @@
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-#end
 		</div>
 
     <div class="az-page-header">
@@ -57,6 +55,9 @@
     </div>
 			
     <div class="container-full">
+
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
 			<div class="row">
         <div class="col-lg-12">
           <table id="triggersTbl" class="table table-striped table-bordered table-condensed table-hover">
@@ -71,8 +72,8 @@
               </tr>
             </thead>
             <tbody>
-#if($triggers)
-  #foreach($trigger in $triggers)
+  #if ($triggers)
+    #foreach ($trigger in $triggers)
               <tr>
                 <td>${trigger.triggerId}</td>
                 <td>${trigger.source}</td>
@@ -81,14 +82,15 @@
                 <td>${trigger.getStatus()}</td>
                 <!--td><button id="expireTriggerBtn" onclick="expireTrigger(${trigger.triggerId})" >Expire Trigger</button></td-->
               </tr>
-  #end
-#else
+    #end
+  #else
               <tr><td class="last">No Trigger Found</td></tr>
-#end
+  #end
             </tbody>
           </table>
         </div>
       </div>
+#end
     </div>
 	</body>
 </html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/viewer.vm b/src/java/azkaban/webapp/servlet/velocity/viewer.vm
index 016e39c..5d25557 100644
--- a/src/java/azkaban/webapp/servlet/velocity/viewer.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/viewer.vm
@@ -46,9 +46,9 @@
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
   #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-#end
 
-#parse ($viewervm)
+  #parse ($viewervm)
+#end
 		</div>
 	</body>
 </html>