azkaban-developers

diff --git a/src/java/azkaban/webapp/servlet/velocity/alerts.vm b/src/java/azkaban/webapp/servlet/velocity/alerts.vm
new file mode 100644
index 0000000..d75fe4d
--- /dev/null
+++ b/src/java/azkaban/webapp/servlet/velocity/alerts.vm
@@ -0,0 +1,21 @@
+#*
+ * Copyright 2012 LinkedIn Corp.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * 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

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/errormsg.vm b/src/java/azkaban/webapp/servlet/velocity/errormsg.vm
new file mode 100644
index 0000000..d19f6e5
--- /dev/null
+++ b/src/java/azkaban/webapp/servlet/velocity/errormsg.vm
@@ -0,0 +1,20 @@
+#*
+ * Copyright 2012 LinkedIn Corp.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+*#
+
+			<div class="alert alert-danger">
+        <h4>Error</h4>
+        $errorMsg
+      </div>

src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm 23(+4 -19)

diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index 544ca6f..7a4e44e 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -54,29 +54,14 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">
-
+#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
-
-			<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>
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
+
 	## Page header
 
 		<div class="az-page-header">

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
index 8f69701..87b1d9e 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
@@ -36,13 +36,7 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">
-
-## Alert message
-
-			<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>
+#parse ("azkaban/webapp/servlet/velocity/message.vm")
 		</div>
 
 ## Page header.

src/java/azkaban/webapp/servlet/velocity/flowpage.vm 24(+3 -21)

diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index a8d86f9..332761d 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -56,29 +56,11 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">
-
-## Page error or success message.
-
+#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
-
-			<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>
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 	
 	## Page header.

src/java/azkaban/webapp/servlet/velocity/historypage.vm 51(+16 -35)

diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index dce1759..f139349 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -38,34 +38,14 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">
-			
-## Alert message
-
-			<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>
-
-## Page error or success message.
-
+#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
-#end
-
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
-## Page header.
+  ## Page header.
 
 		<div class="az-page-header">
       <div class="container">
@@ -109,8 +89,8 @@
               </tr>
             </thead>
             <tbody>
-#if (!$flowHistory.isEmpty())
-	#foreach ($flow in $flowHistory)
+  #if (!$flowHistory.isEmpty())
+    #foreach ($flow in $flowHistory)
               <tr>
                 <td class="tb-name execId">
                   <a href="${context}/executor?execid=${flow.executionId}">${flow.executionId}</a>
@@ -130,16 +110,16 @@
                 </td>
                 <td></td>
               </tr>
-	#end
-#else
+    #end
+  #else
               <tr>
                 <td class="last" colspan="9">No History Results Found</td>
               </tr>
-#end
+  #end
             </tbody>
           </table>
 					<ul class="pagination" id="pageSelection">
-#if ($search)
+  #if ($search)
 						<li id="previous" class="first"><a href="${context}/history?page=${previous.page}&size=${previous.size}&search=true&searchterm=${search_term}"><span class="arrow">&larr;</span>Previous</a></li>
 						<li id="page1" #if($page1.selected) class="selected" #end><a href="${context}/history?page=${page1.page}&size=${page1.size}&search=true&searchterm=${search_term}">${page1.page}</a></li>
 						<li id="page2" #if($page2.selected) class="selected" #end><a href="${context}/history?page=${page2.page}&size=${page2.size}&search=true&searchterm=${search_term}">${page2.page}</a></li>
@@ -147,7 +127,7 @@
 						<li id="page4" #if($page4.selected) class="selected" #end><a href="${context}/history?page=${page4.page}&size=${page4.size}&search=true&searchterm=${search_term}">${page4.page}</a></li>
 						<li id="page5" #if($page5.selected) class="selected" #end><a href="${context}/history?page=${page5.page}&size=${page5.size}&search=true&searchterm=${search_term}">${page5.page}</a></li>
 						<li id="next"><a href="${context}/history?page=${next.page}&size=${next.size}&search=true&searchterm=${search_term}">Next<span class="arrow">&rarr;</span></a></li>
-#elseif($advfilter)
+  #elseif($advfilter)
 						<li id="previous" class="first"><a href="${context}/history?page=${previous.page}&size=${previous.size}&advfilter=true&projcontain=${projcontain}&flowcontain=${flowcontain}&usercontain=${usercontain}&status=${status}&begin=${begin}&end=${end}"><span class="arrow">&larr;</span>Previous</a></li>
 						<li id="page1" #if($page1.selected) class="selected" #end><a href="${context}/history?page=${page1.page}&size=${page1.size}&advfilter=true&projcontain=${projcontain}&flowcontain=${flowcontain}&usercontain=${usercontain}&status=${status}&begin=${begin}&end=${end}">${page1.page}</a></li>
 						<li id="page2" #if($page2.selected) class="selected" #end><a href="${context}/history?page=${page2.page}&size=${page2.size}&advfilter=true&projcontain=${projcontain}&flowcontain=${flowcontain}&usercontain=${usercontain}&status=${status}&begin=${begin}&end=${end}">${page2.page}</a></li>
@@ -155,7 +135,7 @@
 						<li id="page4" #if($page4.selected) class="selected" #end><a href="${context}/history?page=${page4.page}&size=${page4.size}&advfilter=true&projcontain=${projcontain}&flowcontain=${flowcontain}&usercontain=${usercontain}&status=${status}&begin=${begin}&end=${end}">${page4.page}</a></li>
 						<li id="page5" #if($page5.selected) class="selected" #end><a href="${context}/history?page=${page5.page}&size=${page5.size}&advfilter=true&projcontain=${projcontain}&flowcontain=${flowcontain}&usercontain=${usercontain}&status=${status}&begin=${begin}&end=${end}">${page5.page}</a></li>
 						<li id="next"><a href="${context}/history?page=${next.page}&size=${next.size}&advfilter=true&projcontain=${projcontain}&flowcontain=${flowcontain}&usercontain=${usercontain}&status=${status}&begin=${begin}&end=${end}">Next<span class="arrow">&rarr;</span></a></li>
-#else
+  #else
 						<li id="previous" class="first"><a href="${context}/history?page=${previous.page}&size=${previous.size}"><span class="arrow">&larr;</span>Previous</a></li>
 						<li id="page1" #if($page1.selected) class="selected" #end><a href="${context}/history?page=${page1.page}&size=${page1.size}">${page1.page}</a></li>
 						<li id="page2" #if($page2.selected) class="selected" #end><a href="${context}/history?page=${page2.page}&size=${page2.size}">${page2.page}</a></li>
@@ -163,12 +143,12 @@
 						<li id="page4" #if($page4.selected) class="selected" #end><a href="${context}/history?page=${page4.page}&size=${page4.size}">${page4.page}</a></li>
 						<li id="page5" #if($page5.selected) class="selected" #end><a href="${context}/history?page=${page5.page}&size=${page5.size}">${page5.page}</a></li>
 						<li id="next"><a href="${context}/history?page=${next.page}&size=${next.size}">Next<span class="arrow">&rarr;</span></a></li>
-#end
+  #end
 					</ul>
 				</div><!-- /col-lg-12 -->
 			</div><!-- /row -->
 
-## Advanced Filter Modal.
+  ## Advanced Filter Modal.
 
 			<div class="modal" id="adv-filter">
 				<div class="modal-dialog">
@@ -239,7 +219,8 @@
 				</div>
 			</div>
 			
-#parse ("azkaban/webapp/servlet/velocity/invalidsessionmodal.vm")
+  #parse ("azkaban/webapp/servlet/velocity/invalidsessionmodal.vm")
+#end
 #parse ("azkaban/webapp/servlet/velocity/footer.vm")
 
 		</div><!-- /container -->

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index a098c24..5f61e0e 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -37,23 +37,8 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">
-
-## Page error or success message.
-
-#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
-## TODO: See if this can be removed.
-
-			<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>
-
+#parse ("azkaban/webapp/servlet/velocity/message.vm")
+#parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 ## Page Header and project search form.

src/java/azkaban/webapp/servlet/velocity/jmxpage.vm 7(+1 -6)

diff --git a/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm b/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm
index b4e3425..cbddd02 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm
@@ -39,12 +39,7 @@
 		<div class="container">
 			
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #end
 
 		</div>

src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm 17(+2 -15)

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index 5b296bb..d202a1f 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -43,23 +43,10 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">
-
-## Page error or success message.
-
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
-
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header.

src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm 22(+3 -19)

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
index 3ca1afb..36f9359 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
@@ -61,27 +61,11 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">
-
+#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
-
-			<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>
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 	
 	## Page header

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index 1626c5e..e796208 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -39,29 +39,11 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">
-
-## Page error or success message.
-
+#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
-
-			<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>
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/message.vm b/src/java/azkaban/webapp/servlet/velocity/message.vm
new file mode 100644
index 0000000..13b989a
--- /dev/null
+++ b/src/java/azkaban/webapp/servlet/velocity/message.vm
@@ -0,0 +1,22 @@
+#*
+ * Copyright 2012 LinkedIn Corp.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+*#
+
+	## Alert message
+
+			<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/permissionspage.vm 24(+3 -21)

diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index ab7c22c..e477244 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -39,29 +39,11 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 	<div class="container">
-
-## Page error or success message.
-
+#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
-
-			<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>
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header.

src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm 17(+2 -15)

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
index 75afd98..bec33e7 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
@@ -42,23 +42,10 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">
-
-## Page error or success message.
-
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
-
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header.

src/java/azkaban/webapp/servlet/velocity/projectpage.vm 24(+3 -21)

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index e09811d..aa537dc 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -46,29 +46,11 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">
-
-## Page error or success message.
-
+#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
-
-			<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>
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header.

src/java/azkaban/webapp/servlet/velocity/propertypage.vm 16(+2 -14)

diff --git a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
index f23f4e7..a4f5798 100644
--- a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
@@ -37,22 +37,10 @@
 #parse("azkaban/webapp/servlet/velocity/nav.vm")
 		
 		<div class="container">
-
-## Page error or success message.
-
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
+  #parse("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
index 6285330..18ad3f7 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
@@ -47,30 +47,12 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
     <div class="container">
-
-## Page error or success message.
-
+#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 #end
-
-	## Alert message
-
-			<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>
 		</div>
 
     <div class="az-page-header">

src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm 24(+3 -21)

diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
index 16cb339..ab281d0 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
@@ -41,29 +41,11 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
 		<div class="container">
-
-## Page error or success message.
-
+#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
-
-			<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>
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 		</div>
 
 	## Page header.

src/java/azkaban/webapp/servlet/velocity/triggerspage.vm 24(+3 -21)

diff --git a/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm b/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
index 48f6473..e2bb94e 100644
--- a/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
@@ -43,29 +43,11 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
     <div class="container">
-
-## Alert message
-
-			<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>
-
-## Page error or success message.
-
+#parse ("azkaban/webapp/servlet/velocity/message.vm")
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 #end
 		</div>

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/viewer.vm b/src/java/azkaban/webapp/servlet/velocity/viewer.vm
index 558702e..3ff5761 100644
--- a/src/java/azkaban/webapp/servlet/velocity/viewer.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/viewer.vm
@@ -42,20 +42,10 @@
 #parse ("azkaban/webapp/servlet/velocity/nav.vm")
 
     <div class="container">
-
 #if ($errorMsg)
-			<div class="panel panel-danger">
-				<div class="panel-heading">Error</div>
-				<div class="panel-body">
-					$errorMsg
-				</div>
-			</div>
+  #parse ("azkaban/webapp/servlet/velocity/errormsg.vm")
 #else
-	#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
+  #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 #end
 
 #parse ($viewervm)