azkaban-uncached

Fix buttons on executing flow page.

12/15/2013 9:40:35 AM

Details

diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index 4f88d3d..f427ce4 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -113,9 +113,9 @@
 
 	## Tabs and buttons.
 
-			<div class="row">
+			<div class="row" id="headertabs">
 				<div class="col-lg-8">
-					<ul class="nav nav-pills" id="headertabs">
+					<ul class="nav nav-pills">
 						<li id="graphViewLink"><a href="#graph">Graph</a></li>
 						<li id="jobslistViewLink"><a href="#jobslist">Job List</a></li>
 						<li id="flowLogViewLink"><a href="#log">Flow Log</a></li>
@@ -123,11 +123,11 @@
 				</div>
 				<div class="col-lg-4">
 					<div class="pull-right">
-						<button id="pausebtn" class="btn btn-primary">Pause</button>
-						<button id="resumebtn" class="btn btn-primary">Resume</button>
-						<button id="cancelbtn" class="btn btn-danger">Cancel</button>
-						<button id="retrybtn" class="btn btn-success">Retry Failed</button>
-						<button id="executebtn" class="btn btn-success">Prepare Execution</button>
+						<button type="button" id="pausebtn" class="btn btn-primary">Pause</button>
+						<button type="button" id="resumebtn" class="btn btn-primary">Resume</button>
+						<button type="button" id="cancelbtn" class="btn btn-danger">Cancel</button>
+						<button type="button" id="retrybtn" class="btn btn-success">Retry Failed</button>
+						<button type="button" id="executebtn" class="btn btn-success">Prepare Execution</button>
 					</div>
 					<div class="clearfix"></div>
 				</div>
@@ -189,11 +189,14 @@
 						<div class="modal-body" id="messageDiv">
 							<p id="messageBox"></p>
 						</div>
+						<div class="modal-footer">
+							<button type="button" class="btn btn-primary" data-dismiss="modal">Dismiss</button>
+						</div>
 					</div>
 				</div>
 			</div>
 
-		<div id="contextMenu"></div>
+      <div id="contextMenu"></div>
 
 	#parse ("azkaban/webapp/servlet/velocity/invalidsessionmodal.vm")
 	#parse ("azkaban/webapp/servlet/velocity/flowexecutionpanel.vm")
diff --git a/src/web/js/azkaban.exflow.view.js b/src/web/js/azkaban.exflow.view.js
index 0d70f37..4672d9c 100644
--- a/src/web/js/azkaban.exflow.view.js
+++ b/src/web/js/azkaban.exflow.view.js
@@ -158,7 +158,7 @@ azkaban.FlowTabView = Backbone.View.extend({
 		$("#retrybtn").hide();
 
 		if (data.status == "SUCCEEDED") {
-				$("#executebtn").show();
+      $("#executebtn").show();
 		}
 		else if (data.status == "FAILED") {
 			$("#executebtn").show();
@@ -203,7 +203,7 @@ azkaban.FlowTabView = Backbone.View.extend({
 	handleRetryClick: function(evt) {
 		var graphData = graphModel.get("data");
 		var requestURL = contextURL + "/executor";
-		var requestData = {"execid": execId, "ajax":"retryFailedJobs"};
+		var requestData = {"execid": execId, "ajax": "retryFailedJobs"};
 		var successHandler = function(data) {
 			console.log("cancel clicked");
 			if (data.error) {
@@ -218,6 +218,7 @@ azkaban.FlowTabView = Backbone.View.extend({
 	},
 	
 	handleRestartClick: function(evt) {
+    console.log("handleRestartClick");
 		var data = graphModel.get("data");
 		var nodes = data.nodes;
 		var executingData = {
@@ -729,7 +730,8 @@ $(function() {
 		el: $('#headertabs'), 
 		model: graphModel
 	});
-	mainSvgGraphView = new azkaban.SvgGraphView({
+	
+  mainSvgGraphView = new azkaban.SvgGraphView({
 		el: $('#svgDiv'), 
 		model: graphModel, 
 		rightClick:	{ 
@@ -738,16 +740,19 @@ $(function() {
 			"graph": exGraphClickCallback 
 		}
 	});
-	jobsListView = new azkaban.JobListView({
+	
+  jobsListView = new azkaban.JobListView({
 		el: $('#jobList'), 
 		model: graphModel, 
 		contextMenuCallback: exJobClickCallback
 	});
-	flowLogView = new azkaban.FlowLogView({
+	
+  flowLogView = new azkaban.FlowLogView({
 		el: $('#flowLogView'), 
 		model: logModel
 	});
-	statusView = new azkaban.StatusView({
+	
+  statusView = new azkaban.StatusView({
 		el: $('#flow-status'), 
 		model: graphModel
 	});