azkaban-memoizeit

Merge pull request #100 from davidzchen/ui-tweaks Fix job

1/8/2014 8:50:17 PM

Details

diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index eb6771a..d22ffd5 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -167,7 +167,7 @@
 				<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>
+							<button type="button" class="close" data-dismiss="modal" aria-hidden="true" id="close-btn">&times;</button>
 							<h4 class="modal-title">Edit Job</h4>
 						</div>
 						<div class="modal-body">
@@ -203,7 +203,7 @@
 							</table>
 						</div>
 						<div class="modal-footer">
-							<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+							<button type="button" class="btn btn-default" id="cancel-btn" data-dismiss="modal">Cancel</button>
 							<button type="button" class="btn btn-primary" id="set-btn">Set/Change Job Description</button>
 						</div>
 					</div>
diff --git a/src/less/project.less b/src/less/project.less
index 83946d0..b3ae43f 100644
--- a/src/less/project.less
+++ b/src/less/project.less
@@ -9,8 +9,16 @@
 
 .expanded-flow-job-list {
   .list-group-item {
+    .job-buttons {
+      visibility: hidden;
+    }
+
     &:hover {
       background-color: #f5f5f5;
+
+      .job-buttons {
+        visibility: visible;
+      }
     }
   }
 
diff --git a/src/web/js/azkaban.jobedit.view.js b/src/web/js/azkaban.jobedit.view.js
index 1cbb596..ba037b0 100644
--- a/src/web/js/azkaban.jobedit.view.js
+++ b/src/web/js/azkaban.jobedit.view.js
@@ -22,6 +22,7 @@ azkaban.JobEditView = Backbone.View.extend({
 		"click" : "closeEditingTarget",
 		"click #set-btn": "handleSet",	
 		"click #cancel-btn": "handleCancel",
+		"click #close-btn": "handleCancel",
 		"click #addRow": "handleAddRow",
 		"click table .editable": "handleEditColumn",
 		"click table .remove-btn": "handleRemoveColumn"
diff --git a/src/web/js/azkaban.project.view.js b/src/web/js/azkaban.project.view.js
index 073331e..ef01a0e 100644
--- a/src/web/js/azkaban.project.view.js
+++ b/src/web/js/azkaban.project.view.js
@@ -91,10 +91,11 @@ azkaban.FlowTableView = Backbone.View.extend({
 			li.jobName = name;
 
 			if (execAccess) {
-				var hoverMenuDiv = document.createElement("div");
-				$(hoverMenuDiv).addClass("pull-right");
+				var hoverMenuDiv = document.createElement('div');
+				$(hoverMenuDiv).addClass('pull-right');
+        $(hoverMenuDiv).addClass('job-buttons');
 				
-				var divRunJob = document.createElement("button");
+				var divRunJob = document.createElement('button');
         $(divRunJob).attr('type', 'button');
 				$(divRunJob).addClass("btn");
 				$(divRunJob).addClass("btn-success");