azkaban-memoizeit

Merge pull request #101 from davidzchen/ui-tweaks Fix executing

1/8/2014 11:29:35 PM

Details

diff --git a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
index 41ce8d6..91d1d0c 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
@@ -63,7 +63,7 @@
                 <th>Flow</th>
                 <th>Project</th>
                 <th class="user">User</th>
-                <th class="user">Proxy User</th>
+                <th class="user">Proxy</th>
                 <th class="date">Start Time</th>
                 <th class="date">End Time</th>
                 <th class="elapse">Elapsed</th>
@@ -110,7 +110,7 @@
                 <th>Flow</th>
                 <th>Project</th>
                 <th class="user">User</th>
-                <th class="user">Proxy User</th>
+                <th class="user">Proxy</th>
                 <th class="date">Start Time</th>
                 <th class="date">End Time</th>
                 <th class="elapse">Elapsed</th>
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm b/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
index 2863c89..cda497a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
@@ -165,7 +165,7 @@
 											<table class="table table-striped">
 												<thead>
 													<tr>
-														<th>Name</th>
+														<th class="property-key">Name</th>
 														<th>Value</th>
 													</tr>
 												</thead>
@@ -190,6 +190,7 @@
                 <button type="button" class="btn btn-success" id="schedule-btn">Schedule</button>
               </div>
 #end
+
 #*
 #if ($triggerPlugins.size() > 0)
 	#foreach ($triggerPlugin in $triggerPlugins)
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index d22ffd5..5dbec1f 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -189,7 +189,7 @@
 							<table id="generalProps" class="table table-striped table-bordered">
 								<thead>
 									<tr>
-										<th>Name</th>
+										<th class="property-key">Name</th>
 										<th>Value</th>
 									</tr>
 								</thead>

src/less/tables.less 24(+13 -11)

diff --git a/src/less/tables.less b/src/less/tables.less
index e057155..d67061b 100644
--- a/src/less/tables.less
+++ b/src/less/tables.less
@@ -4,24 +4,22 @@ table.table-properties {
 }
 
 // Flow summary.
-td.property-key {
+.property-key {
   width: 25%;
   font-weight: bold;
 }
 
-td.property-value-half {
+.property-value-half {
   width: 25%;
 }
 
-.editRow {
-  .editable {
-    .remove-btn {
-      visibility: hidden;
-    }
+.editable {
+  .remove-btn {
+    visibility: hidden;
+  }
 
-    &:hover .remove-btn {
-      visibility: visible;
-    }
+  &:hover .remove-btn {
+    visibility: visible;
   }
 }
 
@@ -57,7 +55,7 @@ td.property-value-half {
 .executions-table {
   th {
     &.date {
-      width: 140px;
+      width: 160px;
     }
 
     &.execid {
@@ -87,6 +85,10 @@ td.property-value-half {
     &.action {
       width: 20px;
     }
+
+    &.logs {
+      width: 30px;
+    }
   }
 
   td {
diff --git a/src/web/js/azkaban.flow.execute.view.js b/src/web/js/azkaban.flow.execute.view.js
index d2940e3..2fc3b4b 100644
--- a/src/web/js/azkaban.flow.execute.view.js
+++ b/src/web/js/azkaban.flow.execute.view.js
@@ -326,10 +326,17 @@ azkaban.EditTableView = Backbone.View.extend({
 	
 		var tr = document.createElement("tr");
 		var tdName = document.createElement("td");
+    $(tdName).addClass('property-key');
 		var tdValue = document.createElement("td");
 		
-		var icon = document.createElement("span");
-		$(icon).addClass("removeIcon");
+		var remove = document.createElement("div");
+    $(remove).addClass("pull-right").addClass('remove-btn');
+    var removeBtn = document.createElement("button");
+    $(removeBtn).attr('type', 'button');
+    $(removeBtn).addClass('btn').addClass('btn-xs').addClass('btn-danger');
+    $(removeBtn).text('Delete');
+    $(remove).append(removeBtn);
+
 		var nameData = document.createElement("span");
 		$(nameData).addClass("spanValue");
 		$(nameData).text(name);
@@ -337,13 +344,12 @@ azkaban.EditTableView = Backbone.View.extend({
 		$(valueData).addClass("spanValue");
 		$(valueData).text(value);
 						
-		$(tdName).append(icon);
 		$(tdName).append(nameData);
-		$(tdName).addClass("name");
 		$(tdName).addClass("editable");
 		
 		$(tdValue).append(valueData);
-		$(tdValue).addClass("editable");
+    $(tdValue).append(remove);
+		$(tdValue).addClass("editable").addClass('value');
 		
 		$(tr).addClass("editRow");
 		$(tr).append(tdName);
@@ -361,6 +367,7 @@ azkaban.EditTableView = Backbone.View.extend({
 					
 		var input = document.createElement("input");
 		$(input).attr("type", "text");
+    $(input).addClass('form-control').addClass('input-sm');
 		$(input).css("width", "100%");
 		$(input).val(text);
 		$(curTarget).addClass("editing");
@@ -396,10 +403,15 @@ azkaban.EditTableView = Backbone.View.extend({
 		$(valueData).addClass("spanValue");
 		$(valueData).text(text);
 
-		if ($(parent).hasClass("name")) {
-			var icon = document.createElement("span");
-			$(icon).addClass("removeIcon");
-			$(parent).append(icon);
+		if ($(parent).hasClass("value")) {
+      var remove = document.createElement("div");
+      $(remove).addClass("pull-right").addClass('remove-btn');
+      var removeBtn = document.createElement("button");
+      $(removeBtn).attr('type', 'button');
+      $(removeBtn).addClass('btn').addClass('btn-xs').addClass('btn-danger');
+      $(removeBtn).text('Delete');
+      $(remove).append(removeBtn);
+			$(parent).append(remove);
 		}
 		
 		$(parent).removeClass("editing");