delete button is implimented

ICRAR · Aug 24, 2021 · 83b6320 · 83b6320
1 parent df28e36
commit 83b6320
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/daliuge-engine/dlg/manager/web/dim.html b/daliuge-engine/dlg/manager/web/dim.html
@@ -52,6 +52,7 @@ <h4>Sessions</h4>
 						<th># Drops</th>
 						<th>Details</th>
 						<th></th>
+						<th></th>
 					</tr>
 				</thead>
 				<tbody>

diff --git a/daliuge-engine/dlg/manager/web/static/css/dm.css b/daliuge-engine/dlg/manager/web/static/css/dm.css
@@ -94,12 +94,23 @@ color:rgba(0,35,73,1);
 }
 
 tr td.actions button{
-  padding: 2px 4px;
+  padding: 1px 4px;
   font-size:16px;  
 }
 
 tr td.actions{
-  padding:9px 12px;
+  padding:6px 12px;
+  width: 0px;
+}
+
+tr td.d_actions{
+  padding:6px 12px;
+  width: 0px;
+}
+
+tr td.d_actions d_button{
+  padding: 1px 4px; 
+  font-size: 16px;
 }
 
 .status svg {

diff --git a/daliuge-engine/dlg/manager/web/static/js/dm.js b/daliuge-engine/dlg/manager/web/static/js/dm.js
@@ -240,6 +240,7 @@ function loadSessions(serverUrl, tbodyEl, refreshBtn, selectedNode, delay) {
 			}else if(currentStatus==="Deploying"){
 				$(this).css("color","blue");
 				$(this).parent().removeClass("progressRunning")
+				$(this).parent().find(".d_actions").find("d_button").show();
 			}
 			else if (currentStatus==="Running") {
 				$(this).text("");
@@ -256,6 +257,11 @@ function loadSessions(serverUrl, tbodyEl, refreshBtn, selectedNode, delay) {
 				$(this).parent().find(".actions").find("button").hide();
 				$(this).parent().find(".d_actions").find("d_button").show();
 				$(this).parent().removeClass("progressRunning")
+			}else if (currentStatus==="Pristine"){
+				$(this).css("color","#b93a46");
+				$(this).parent().find(".actions").find("button").hide();
+				$(this).parent().find(".d_actions").find("d_button").show();
+				$(this).parent().removeClass("progressRunning")
 			}else{
 				$(this).css("color","purple");
 				$(this).parent().find(".actions").find("button").hide();

diff --git a/daliuge-translator/dlg/dropmake/web/VERSION b/daliuge-translator/dlg/dropmake/web/VERSION
@@ -1,2 +1,2 @@
 1.0.0:liu-150
-06e108c3133934f425ace557734e8e9e8eaf6f8a
+df28e36db30e12662802d1c1a81e88f1f67240a7