azkaban-uncached

Remove remaining duplicate invalid session code.

12/6/2013 5:31:22 AM

David Z. Chen

Commit: 19cc1d1

Tree: 47cdbb4

Parents: 717ca77

Changes

src/java/azkaban/webapp/servlet/velocity/historypage.vm 20(+1 -19)

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

src/java/azkaban/webapp/servlet/velocity/permissionspage.vm 20(+1 -19)

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

Details

src/java/azkaban/webapp/servlet/velocity/historypage.vm 20(+1 -19)

diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index 5366f1e..ad550a7 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -236,25 +236,7 @@
 				</div>
 			</div>
 			
-## Modal dialog to be displayed when the user sesion is invalid.
-			
-			<div class="modal fade" id="invalid-session-modal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-							<h4 class="modal-title">Invalid Session</h4>
-						</div>
-						<div class="modal-body">
-							<p>Session has expired. Please re-login.</p>
-						</div>
-						<div class="modal-footer">
-							<button type="button" class="btn btn-primary" id="login-btn">Re-login</button>
-						</div>
-					</div>
-				</div>
-			</div>
-
+#parse ("azkaban/webapp/servlet/velocity/invalidsessionmodal.vm")
 #parse ("azkaban/webapp/servlet/velocity/footer.vm")
 
 		</div><!-- /container -->

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index 1ebbf41..500f4f3 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -172,26 +172,8 @@
 				</div>
 			</div>
 
-## Modal dialog to be displayed when the user sesion is invalid. -->
-			
-			<div class="modal fade" id="invalid-session-modal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-							<h4 class="modal-title">Invalid Session</h4>
-						</div>
-						<div class="modal-body">
-							<p>Session has expired. Please re-login.</p>
-						</div>
-						<div class="modal-footer">
-							<button type="button" class="btn btn-primary" id="login-btn">Re-login</button>
-						</div>
-					</div>
-				</div>
-			</div>
-
-#parse("azkaban/webapp/servlet/velocity/footer.vm")
+#parse ("azkaban/webapp/servlet/velocity/invalidsessionmodal.vm")
+#parse ("azkaban/webapp/servlet/velocity/footer.vm")
 
 		</div><!-- /container -->
 	</body>

src/java/azkaban/webapp/servlet/velocity/permissionspage.vm 20(+1 -19)

diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index 9b9e747..a7c5e34 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -339,25 +339,7 @@
 				</div>
 			</div>
 
-## Modal dialog to be displayed when the user sesion is invalid. -->
-			
-			<div class="modal fade" id="invalid-session-modal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-							<h4 class="modal-title">Invalid Session</h4>
-						</div>
-						<div class="modal-body">
-							<p>Session has expired. Please re-login.</p>
-						</div>
-						<div class="modal-footer">
-							<button type="button" class="btn btn-primary" id="login-btn">Re-login</button>
-						</div>
-					</div>
-				</div>
-			</div>
-
+	#parse ("azkaban/webapp/servlet/velocity/invalidsessionmodal.vm")
 #end
 #parse ("azkaban/webapp/servlet/velocity/footer.vm")
 		</div><!-- /container -->

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

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index 6eb12fc..a58f95f 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -165,26 +165,7 @@
 				</div>
 			</div>
 
-## Modal dialog to be displayed when the user sesion is invalid.
-			
-			<div class="modal fade" id="invalid-session-modal">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-							<h4 class="modal-title">Invalid Session</h4>
-						</div>
-						<div class="modal-body">
-							<p>Session has expired. Please re-login.</p>
-						</div>
-						<div class="modal-footer">
-							<button type="button" class="btn btn-primary" id="login-btn">Re-login</button>
-						</div>
-					</div>
-				</div>
-			</div>
-
-## Delete project modal.
+	## Delete project modal.
 			
 			<div class="modal fade" id="delete-project-modal">
 				<div class="modal-dialog">
@@ -208,6 +189,7 @@
 				</div>
 			</div>
 
+	#parse ("azkaban/webapp/servlet/velocity/invalidsessionmodal.vm")
 	#parse ("azkaban/webapp/servlet/velocity/flowexecutionpanel.vm")
 	#parse ("azkaban/webapp/servlet/velocity/messagedialog.vm")
 #end