azkaban-uncached

diff --git a/src/java/azkaban/webapp/servlet/velocity/messagedialog.vm b/src/java/azkaban/webapp/servlet/velocity/messagedialog.vm
index e0aec19..97ce566 100644
--- a/src/java/azkaban/webapp/servlet/velocity/messagedialog.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/messagedialog.vm
@@ -14,12 +14,21 @@
  * the License.
 *#
 
-<script type="text/javascript" src="${context}/js/azkaban.message.dialog.view.js"></script>
-
-<div id="azkabanMessageDialog" class="modal">
-	<h3 id="azkabanMessageDialogTitle"></h3>
-	<div id="azkabanMessageDialogText"></div>
-	<div class="actions">
-		<a class="yes btn2 continueclass" id="continue-btn" href="#">Continue</a>
-	</div>
-</div>
+			<script type="text/javascript" src="${context}/js/azkaban.message.dialog.view.js"></script>
+			
+			<div class="modal fade" id="azkaban-message-dialog">
+				<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" id="azkaban-message-dialog-title"></h4>
+						</div><!-- /modal-header -->
+						<div class="modal-body">
+							<p id="azkaban-message-dialog-text"></p>
+						</div>
+						<div class="modal-footer">
+							<button type="button" class="btn btn-primary" data-dismiss="modal">Continue</button>
+						</div>
+					</div>
+				</div>
+			</div>

diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index 64ee46a..e0b5bf9 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -21,6 +21,8 @@
 #parse ("azkaban/webapp/servlet/velocity/style2.vm")
 #parse ("azkaban/webapp/servlet/velocity/javascript.vm")
 
+		<link rel="stylesheet" type="text/css" href="${context}/css/jquery-ui-1.10.1.custom.css" />
+		<link rel="stylesheet" type="text/css" href="${context}/css/azkaban-svg.css" />
 		<script type="text/javascript" src="${context}/js/jqueryui/jquery-ui-1.10.1.custom.js"></script>
 		<script type="text/javascript" src="${context}/js/azkaban.ajax.utils.js"></script>
 		<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>

diff --git a/src/web/js/azkaban.ajax.utils.js b/src/web/js/azkaban.ajax.utils.js
index 22647b7..342e2af 100644
--- a/src/web/js/azkaban.ajax.utils.js
+++ b/src/web/js/azkaban.ajax.utils.js
@@ -15,7 +15,6 @@
  */
 
 function ajaxCall(requestURL, data, callback) {
-	
 	var successHandler = function(data) {
 		if (data.error == "session") {
 			// We need to relogin.
@@ -46,9 +45,11 @@ function executeFlow(executingData) {
 	executeURL = contextURL + "/executor";
 	var successHandler = function(data) {
 		if (data.error) {
+			flowExecuteDialogView.hideExecutionOptionPanel();
 			messageDialogView.show("Error Executing Flow", data.error);
 		}
 		else {
+			flowExecuteDialogView.hideExecutionOptionPanel();
 			messageDialogView.show("Flow submitted", data.message,
 				function() {
 					var redirectURL = contextURL + "/executor?execid=" + data.execid;
@@ -77,7 +78,10 @@ function fetchFlowInfo(model, projectName, flowId, execId) {
 				"successEmails": data.successEmails, 
 				"failureEmails": data.failureEmails,
 				"failureAction": data.failureAction,
-				"notifyFailure": {"first": data.notifyFailureFirst, "last":data.notifyFailureLast},
+				"notifyFailure": {
+					"first": data.notifyFailureFirst, 
+					"last": data.notifyFailureLast
+				},
 				"flowParams": data.flowParam,
 				"isRunning": data.running,
 				"nodeStatus": data.nodeStatus,
@@ -114,7 +118,11 @@ function fetchFlow(model, projectName, flowId, sync) {
 		}
 		else {
 			var disabled = data.disabled ? data.disabled : {};
-			model.set({flowId: data.flowId, data:data, disabled: disabled});
+			model.set({
+				flowId: data.flowId, 
+				data: data, 
+				disabled: disabled
+			});
 			
 			var nodeMap = {};
 			for (var i = 0; i < data.nodes.length; ++i) {

diff --git a/src/web/js/azkaban.flow.execute.view.js b/src/web/js/azkaban.flow.execute.view.js
index a3a0bb0..3fe3104 100644
--- a/src/web/js/azkaban.flow.execute.view.js
+++ b/src/web/js/azkaban.flow.execute.view.js
@@ -47,7 +47,7 @@ azkaban.FlowExecuteDialogView = Backbone.View.extend({
 	initialize: function(settings) {
 		this.model.bind('change:flowinfo', this.changeFlowInfo, this);
 		$("#overrideSuccessEmails").click(function(evt) {
-			if($(this).is(':checked')) {
+			if ($(this).is(':checked')) {
 				$('#successEmails').attr('disabled', null);
 			}
 			else {
@@ -56,7 +56,7 @@ azkaban.FlowExecuteDialogView = Backbone.View.extend({
 		});
 				
 		$("#overrideFailureEmails").click(function(evt) {
-			if($(this).is(':checked')) {
+			if ($(this).is(':checked')) {
 				$('#failureEmails').attr('disabled', null);
 			}
 			else {
@@ -207,10 +207,14 @@ azkaban.FlowExecuteDialogView = Backbone.View.extend({
 		
 		if (flowParams) {
 			for (var key in flowParams) {
-				editTableView.handleAddRow({paramkey: key, paramvalue: flowParams[key]});
+				editTableView.handleAddRow({
+					paramkey: key, 
+					paramvalue: flowParams[key]
+				});
 			}
 		}
 	},
+	
 	show: function(data) {
 		var projectName = data.project;
 		var flowId = data.flow;
@@ -271,8 +275,7 @@ azkaban.FlowExecuteDialogView = Backbone.View.extend({
 	},
 	
 	hideExecutionOptionPanel: function() {
-		$('#modalBackground').hide();
-		$('#execute-flow-panel').hide();
+		$('#execute-flow-panel').modal("hide");
 	},
 	
 	scheduleClick: function() {
@@ -368,10 +371,9 @@ azkaban.EditTableView = Backbone.View.extend({
 		
 		$(input).keypress(function(evt) {
 			if (evt.which == 13) {
-					obj.closeEditingTarget(evt);
+				obj.closeEditingTarget(evt);
 			}
 		});
-
 	},
 	
 	handleRemoveColumn: function(evt) {
@@ -451,7 +453,7 @@ var handleJobMenuClick = function(action, el, pos) {
 	if (action == "open") {
 		window.location.href = requestURL;
 	}
-	else if(action == "openwindow") {
+	else if (action == "openwindow") {
 		window.open(requestURL);
 	}
 }

diff --git a/src/web/js/azkaban.message.dialog.view.js b/src/web/js/azkaban.message.dialog.view.js
index f58cc4c..767047f 100644
--- a/src/web/js/azkaban.message.dialog.view.js
+++ b/src/web/js/azkaban.message.dialog.view.js
@@ -17,38 +17,29 @@
 $.namespace('azkaban');
 
 var messageDialogView;
-
 azkaban.MessageDialogView = Backbone.View.extend({
-  events : {
-  },
-  initialize : function(settings) {
+	events: {
+	},
 
-  },
-  show: function(title, message, callback) {
-  	$("#azkabanMessageDialogTitle").text(title);
-  	$("#azkabanMessageDialogText").text(message);
-  	this.callback = callback;
-  	
-      $(this.el).modal({
-          position: ["20%",],
-          closeClass: "continueclass",
-          containerId: 'confirm-container',
-          containerCss: {
-            'height': '220px',
-            'width': '565px'
-          },
-          onShow: function (dialog) {
-          },
-          onClose: function() {
-          	if (callback) {
-          		callback.call();
-          	}
-          }
-     });
-  }
+	initialize: function(settings) {
+	},
+	
+	show: function(title, message, callback) {
+		$("#azkaban-message-dialog-title").text(title);
+		$("#azkaban-message-dialog-text").text(message);
+		this.callback = callback;
+		$(this.el).on('hidden.bs.modal', function() {
+			if (callback) {
+				callback.call();
+			}
+		});
+		$(this.el).modal();
+	}
 });
 
 
 $(function() {
-	messageDialogView = new azkaban.MessageDialogView({el: $('#azkabanMessageDialog')});
+	messageDialogView = new azkaban.MessageDialogView({
+		el: $('#azkaban-message-dialog')
+	});
 });