azkaban-memoizeit

diff --git a/src/java/azkaban/webapp/servlet/velocity/errormsg.vm b/src/java/azkaban/webapp/servlet/velocity/errormsg.vm
index d19f6e5..4c745c8 100644
--- a/src/java/azkaban/webapp/servlet/velocity/errormsg.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/errormsg.vm
@@ -14,7 +14,14 @@
  * the License.
 *#
 
+		<div class="az-page-header">
+			<div class="container-full">
+        <h1 class="danger">Something's wrong</h1>
+			</div>
+    </div>
+    <div class="container-full">
 			<div class="alert alert-danger">
         <h4>Error</h4>
         $errorMsg
       </div>
+    </div>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index 8650ae8..693a707 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -53,12 +53,9 @@
 #set ($show_schedule="false")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-		</div>
-
 
 	## Page header
 
@@ -190,7 +187,7 @@
 	#parse ("azkaban/webapp/servlet/velocity/invalidsessionmodal.vm")
 	#parse ("azkaban/webapp/servlet/velocity/flowexecutionpanel.vm")
 	#parse ("azkaban/webapp/servlet/velocity/messagedialog.vm")
-#end
 		</div>
+#end
 	</body>
 </html>

src/java/azkaban/webapp/servlet/velocity/flowpage.vm 6(+1 -5)

diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 16fd5eb..83dfff0 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -55,11 +55,9 @@
 #set ($current_page="all")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-		</div>
 	
 	## Page header.
 
@@ -150,9 +148,7 @@
 	#parse ("azkaban/webapp/servlet/velocity/invalidsessionmodal.vm")
 	#parse ("azkaban/webapp/servlet/velocity/flowexecutionpanel.vm")
 	#parse ("azkaban/webapp/servlet/velocity/messagedialog.vm")
-#end
-
-##parse("azkaban/webapp/servlet/velocity/footer.vm")
 		</div><!-- /.container -->
+#end
 	</body>
 </body>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index a0cea62..63db454 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -37,11 +37,9 @@
 #set ($current_page="history")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-		</div>
 
   ## Page header.
 
@@ -219,7 +217,7 @@
 			</div>
 			
   #parse ("azkaban/webapp/servlet/velocity/invalidsessionmodal.vm")
-#end
 		</div><!-- /container-full -->
+#end
 	</body>
 <html>

src/java/azkaban/webapp/servlet/velocity/jmxpage.vm 35(+16 -19)

diff --git a/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm b/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm
index f11e330..30c8f74 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm
@@ -36,13 +36,9 @@
 #set ($counter = 0)
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
-			
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
-#end
-
-		</div>
+#else
 
 		<div class="az-page-header">
 			<div class="container-full">
@@ -52,7 +48,7 @@
 
 		<div class="container-full">
 
-## Web Client JMX 
+  ## Web Client JMX 
 
 			<div class="row">
 				<div class="col-lg-12">
@@ -68,7 +64,7 @@
 								</tr>
 							</thead>
 							<tbody>
-#foreach ($bean in $mbeans)
+  #foreach ($bean in $mbeans)
 							<tr>
 								<td>${bean.keyPropertyList.get("name")}</td>
 								<td>${bean.domain}</td>
@@ -94,8 +90,8 @@
 									<button type="button" class="btn btn-default btn-sm collapse-btn">Collapse</button>
 								</td>
 							</tr>
-	#set ($counter = $counter + 1)
-#end
+    #set ($counter = $counter + 1)
+  #end
 							</tbody>
 						</table>
 
@@ -103,7 +99,7 @@
 				</div>
 			</div>
 			
-#foreach ($executor in $executorRemoteMBeans.entrySet())
+  #foreach ($executor in $executorRemoteMBeans.entrySet())
 			<div class="row">
 				<div class="col-lg-12">
 					<div class="panel panel-default">
@@ -118,7 +114,7 @@
 								</tr>
 							</thead>
 							<tbody>
-	#foreach ($bean in $executor.value)
+    #foreach ($bean in $executor.value)
 								<tr>
 									<td>${bean.get("keyPropertyList").get("name")}</td>
 									<td>${bean.get("domain")}</td>
@@ -143,16 +139,16 @@
 										<button type="button" class="btn btn-default btn-sm collapse-btn">Collapse</button>
 									</td>
 							</tr>
-		#set ($counter = $counter + 1)
-	#end 
+      #set ($counter = $counter + 1)
+    #end 
 							</tbody>
 						</table>
 					</div>
 				</div>
 			</div>
-#end
+  #end
 			
-#foreach ($triggerserver in $triggerserverRemoteMBeans.entrySet())
+  #foreach ($triggerserver in $triggerserverRemoteMBeans.entrySet())
 			<div class="row">
 				<div class="col-lg-12">
 					<div class="panel panel-default">
@@ -167,7 +163,7 @@
 								</tr>
 							</thead>
 							<tbody>
-	#foreach ($bean in $triggerserver.value)
+    #foreach ($bean in $triggerserver.value)
 								<tr>
 									<td>${bean.get("keyPropertyList").get("name")}</td>
 									<td>${bean.get("domain")}</td>
@@ -192,15 +188,16 @@
 										<button type="button" class="btn btn-default btn-sm collapse-btn">Collapse</button>
 									</td>
 							</tr>
-		#set ($counter = $counter + 1)
-	#end 
+      #set ($counter = $counter + 1)
+    #end 
 							</tbody>
 						</table>
 
 					</div>
 				</div>
 			</div>
+  #end
+  </div>
 #end
-		</div>
 	</body>
 </html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index d1614c6..a8df9c2 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -42,11 +42,9 @@
 #set ($current_page="executing")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-		</div>
 
 	## Page header.
 
@@ -169,7 +167,7 @@
 				</div>
 			</div>
 
-#end
 		</div>
+#end
 	</body>
 </html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
index 2461332..0177383 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
@@ -60,11 +60,9 @@
 #set ($current_page="all")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-		</div>
 	
 	## Page header
 
@@ -157,7 +155,7 @@
 				</div><!-- /.col-lg-12 -->
 			</div><!-- /.row -->
 
-#end
 		</div>
+#end
 	</body>
 </html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index 37dc9e8..36c7d9e 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -38,11 +38,9 @@
 #set ($current_page="all")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-		</div>
 
 	## Page header
 
@@ -206,7 +204,7 @@
 				</div>
 			</div>
 
-#end
 		</div><!-- /container-full -->
+#end
 	</body>
 </html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index d0285cf..43d29c4 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -38,11 +38,9 @@
 #set ($current_page = "all")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-	<div class="container-full">
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-		</div>
 
 	## Page header.
 	
@@ -343,7 +341,7 @@
 
 	#parse ("azkaban/webapp/servlet/velocity/projectmodals.vm")
 	#parse ("azkaban/webapp/servlet/velocity/invalidsessionmodal.vm")
-#end
 		</div><!-- /container-full -->
+#end
 	</body>
 </html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
index 771c3f3..dbb998a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
@@ -41,11 +41,9 @@
 #set ($current_page="all")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-		</div>
 
 	## Page header.
 	
@@ -90,8 +88,8 @@
 			</div>
 
 	#parse ("azkaban/webapp/servlet/velocity/projectmodals.vm")
-#end
 
 		</div><!-- /container-full -->
+#end
 	</body>
 </html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index 5fe72ca..8d6e865 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -45,11 +45,9 @@
 #set ($current_page="all")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-		</div>
 
 	## Page header.
 	
@@ -104,9 +102,9 @@
 	#parse ("azkaban/webapp/servlet/velocity/invalidsessionmodal.vm")
 	#parse ("azkaban/webapp/servlet/velocity/flowexecutionpanel.vm")
 	#parse ("azkaban/webapp/servlet/velocity/messagedialog.vm")
-#end
 
 		</div><!-- /container -->
+#end
 	</body>
 </html>

src/java/azkaban/webapp/servlet/velocity/propertypage.vm 6(+1 -5)

diff --git a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
index 0360517..c1d3097 100644
--- a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
@@ -36,11 +36,9 @@
 #set($current_page="all")
 #parse("azkaban/webapp/servlet/velocity/nav.vm")
 		
-		<div class="container-full">
 #if ($errorMsg)
   #parse("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-		</div>
 
 	## Page header
 
@@ -123,9 +121,7 @@
 				</div>
 			</div><!-- /row -->
 
-#end
-#parse ("azkaban/webapp/servlet/velocity/footer.vm")
-
 		</div><!-- /container-full -->
+#end
 	</body>
 </html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
index 87c9956..761350d 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
@@ -46,11 +46,9 @@
 #set ($current_page="schedule")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-    <div class="container-full">
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-		</div>
 
     <div class="az-page-header">
       <div class="container-full">
@@ -73,7 +71,7 @@
       </div>
       
       <div id="contextMenu"></div>
-#end
     </div>
+#end
 	</body>
 </html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
index 24a73d8..87285cf 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
@@ -40,11 +40,9 @@
 #set ($current_page="schedule")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-		</div>
 
 	## Page header.
 
@@ -107,7 +105,7 @@
 				</div><!-- /col-lg-12 -->
 			</div><!-- /row -->
 
-## Set SLA modal.
+  ## Set SLA modal.
 
 			<div class="modal modal-wide" id="sla-options">
 				<div class="modal-dialog">
@@ -153,7 +151,7 @@
 					</div>
 				</div>
 			</div>
-#end
 		</div>
+#end
 	</body>
 </html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm b/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
index 762474d..542e699 100644
--- a/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
@@ -42,11 +42,9 @@
 #set ($current_page="triggers")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-    <div class="container-full">
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-		</div>
 
     <div class="az-page-header">
       <div class="container-full">
@@ -90,7 +88,7 @@
           </table>
         </div>
       </div>
-#end
     </div>
+#end
 	</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 5d25557..cb5e8d6 100644
--- a/src/java/azkaban/webapp/servlet/velocity/viewer.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/viewer.vm
@@ -41,14 +41,14 @@
 #set ($current_page="viewer")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-    <div class="container-full">
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
+    <div class="container-full">
   #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 
   #parse ($viewervm)
-#end
 		</div>
+#end
 	</body>
 </html>