Prosoft Git

azkaban-developers

Merge pull request #96 from davidzchen/ui-tweaks Clean …

1/7/2014 10:01:26 PM
David Z. Chen

David Z. Chen

Commit: 39039f8

Tree: cecf8b5

Parents: c6f2b0d
6e55f7a

Changes

src/java/azkaban/webapp/servlet/velocity/alerts.vm 25(+20 -5)

src/java/azkaban/webapp/servlet/velocity/errormsg.vm 7(+7 -0)

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

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

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

src/java/azkaban/webapp/servlet/velocity/historypage.vm 11(+5 -6)

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

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

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

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

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

src/java/azkaban/webapp/servlet/velocity/message.vm 22(+0 -22)

src/java/azkaban/webapp/servlet/velocity/permissionspage.vm 11(+5 -6)

src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm 10(+5 -5)

src/java/azkaban/webapp/servlet/velocity/projectpage.vm 13(+6 -7)

src/java/azkaban/webapp/servlet/velocity/propertypage.vm 12(+5 -7)

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

src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm 13(+6 -7)

src/java/azkaban/webapp/servlet/velocity/triggerspage.vm 19(+9 -10)

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

Details

src/java/azkaban/webapp/servlet/velocity/alerts.vm 25(+20 -5) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/alerts.vm b/src/java/azkaban/webapp/servlet/velocity/alerts.vm
index d75fe4d..8877728 100644
--- a/src/java/azkaban/webapp/servlet/velocity/alerts.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/alerts.vm
@@ -14,8 +14,23 @@
  * the License.
 *#
 
-	#if ($error_message != "null")
-			<div class="alert alert-danger">$error_message</div>
-	#elseif ($success_message != "null")
-			<div class="alert alert-success">$success_message</div>
-	#end
+## Alert message set by servlet.
+
+#if ($error_message != "null")
+      <div class="alert alert-danger alert-dismissable">
+				<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+        $error_message
+      </div>
+#elseif ($success_message != "null")
+      <div class="alert alert-success">
+				<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+        $success_message
+      </div>
+#end
+
+## Alert message triggered by JavaScript.
+
+			<div class="alert alert-dismissable alert-messaging" id="messaging">
+				<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+				<p id="messaging-message"></p>
+			</div>

src/java/azkaban/webapp/servlet/velocity/errormsg.vm 7(+7 -0) 

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 9(+3 -6) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index b0c63ca..693a707 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -53,14 +53,9 @@
 #set ($show_schedule="false")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
-#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-		</div>
-
 
 	## Page header
 
@@ -93,6 +88,8 @@
 
 		<div class="container-full">
 
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
 	## Breadcrumb
 
 			<ol class="breadcrumb">
@@ -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/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 d3d9c77..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/message.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 17(+8 -9) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 91834a6..83dfff0 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -55,13 +55,9 @@
 #set ($current_page="all")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
-#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-		</div>
 	
 	## Page header.
 
@@ -81,14 +77,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>
@@ -147,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 11(+5 -6) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index 9ba5947..63db454 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -37,13 +37,9 @@
 #set ($current_page="history")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
-#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-		</div>
 
   ## Page header.
 
@@ -71,7 +67,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">
@@ -218,7 +217,7 @@
 			</div>
 			
   #parse ("azkaban/webapp/servlet/velocity/invalidsessionmodal.vm")
-#end
 		</div><!-- /container-full -->
+#end
 	</body>
 <html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index 35812b2..159bd1a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -36,11 +36,6 @@
 #set ($current_page="all")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
-#parse ("azkaban/webapp/servlet/velocity/message.vm")
-#parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-		</div>
-
 ## Page Header and project search form.
 
 		<div class="az-page-header">
@@ -82,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/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 16(+9 -7) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index b126c03..a8df9c2 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -42,12 +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
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-		</div>
 
 	## Page header.
 
@@ -66,16 +63,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>
@@ -165,7 +167,7 @@
 				</div>
 			</div>
 
-#end
 		</div>
+#end
 	</body>
 </html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
index ab32567..0177383 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
@@ -60,13 +60,9 @@
 #set ($current_page="all")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
-#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-		</div>
 	
 	## Page header
 
@@ -78,6 +74,8 @@
 
 		<div class="container-full">
 	
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
   ## Breadcrumb
 
       <ol class="breadcrumb">
@@ -85,6 +83,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">
@@ -155,7 +155,7 @@
 				</div><!-- /.col-lg-12 -->
 			</div><!-- /.row -->
 
-#end
 		</div>
+#end
 	</body>
 </html>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index 21cddcb..36c7d9e 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -38,13 +38,9 @@
 #set ($current_page="all")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
-#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-		</div>
 
 	## Page header
 
@@ -66,6 +62,8 @@
 
 		<div class="container-full">
 	
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+  
   ## Breadcrumb
 
       <ol class="breadcrumb">
@@ -206,7 +204,7 @@
 				</div>
 			</div>
 
-#end
 		</div><!-- /container-full -->
+#end
 	</body>
 </html>

src/java/azkaban/webapp/servlet/velocity/permissionspage.vm 11(+5 -6) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index 7c5db72..43d29c4 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -38,13 +38,9 @@
 #set ($current_page = "all")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-	<div class="container-full">
-#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-		</div>
 
 	## Page header.
 	
@@ -52,7 +48,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">
 	
@@ -342,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 10(+5 -5) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
index 923d0b7..dbb998a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
@@ -41,12 +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
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-		</div>
 
 	## Page header.
 	
@@ -54,7 +51,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">
 	
@@ -88,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 13(+6 -7) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index 7921241..8d6e865 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -45,21 +45,20 @@
 #set ($current_page="all")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
-#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #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">
 					
@@ -103,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 12(+5 -7) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
index 07b0cfa..c1d3097 100644
--- a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
@@ -36,12 +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
-  #parse("azkaban/webapp/servlet/velocity/alerts.vm")
-		</div>
 
 	## Page header
 
@@ -51,7 +48,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">
 
@@ -121,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 8(+3 -5) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
index 8e857de..761350d 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
@@ -46,14 +46,9 @@
 #set ($current_page="schedule")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-    <div class="container-full">
-#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-#end
-		</div>
 
     <div class="az-page-header">
       <div class="container-full">
@@ -61,6 +56,8 @@
       </div>
     </div>
 
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
+
     <div class="container-full">
       <div class="row">
         <div class="col-lg-12">
@@ -75,5 +72,6 @@
       
       <div id="contextMenu"></div>
     </div>
+#end
 	</body>
 </html>

src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm 13(+6 -7) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
index 65cc466..87285cf 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
@@ -40,13 +40,9 @@
 #set ($current_page="schedule")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-		<div class="container-full">
-#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-		</div>
 
 	## Page header.
 
@@ -59,7 +55,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>
@@ -106,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">
@@ -152,7 +151,7 @@
 					</div>
 				</div>
 			</div>
-#end
 		</div>
+#end
 	</body>
 </html>

src/java/azkaban/webapp/servlet/velocity/triggerspage.vm 19(+9 -10) 

diff --git a/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm b/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
index 3e84bb2..542e699 100644
--- a/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
@@ -42,14 +42,9 @@
 #set ($current_page="triggers")
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
-    <div class="container-full">
-#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
   #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
-#end
-		</div>
 
     <div class="az-page-header">
       <div class="container-full">
@@ -58,6 +53,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">
@@ -72,8 +70,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>
@@ -82,14 +80,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>
     </div>
+#end
 	</body>
 </html>

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 016e39c..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")
-#end
 
-#parse ($viewervm)
+  #parse ($viewervm)
 		</div>
+#end
 	</body>
 </html>

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