External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 09:57:33 -02:30
Code Issues Packages Projects Releases Wiki Activity

Style nodes with deleted unified job templates

Browse Source
This commit is contained in:
mabashian
2017-08-15 10:14:49 -04:00
parent 5ad29c9081
commit a0e67da7e0
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less
View File

@@ -97,7 +97,7 @@
.WorkflowChart-incompleteIcon { .WorkflowChart-incompleteIcon {
color: @default-warning; color: @default-warning;
} }
.WorkflowChart-incompleteText { .WorkflowChart-deletedText {
width: 90px; width: 90px;
color: @default-interface-txt; color: @default-interface-txt;
} }
@@ -139,3 +139,6 @@
border-top: 10px solid #707070; border-top: 10px solid #707070;
margin: auto; margin: auto;
} }
.WorkflowChart-dashedNode {
stroke-dasharray: 5,5;
}

20
awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
View File

@@ -283,7 +283,9 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
}) })
.attr('stroke-width', "2px") .attr('stroke-width', "2px")
.attr("class", function(d) { .attr("class", function(d) {
return d.placeholder ? "rect placeholder" : "rect"; let classString = d.placeholder ? "rect placeholder" : "rect";
classString += !d.unifiedJobTemplate ? " WorkflowChart-dashedNode" : "";
return classString;
}); });
thisNode.append("path") thisNode.append("path")
@@ -312,13 +314,13 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
.style("display", function(d) { return (d.edgeConflict && !d.placeholder) ? null : "none"; }); .style("display", function(d) { return (d.edgeConflict && !d.placeholder) ? null : "none"; });
thisNode.append("foreignObject") thisNode.append("foreignObject")
.attr("x", 17) .attr("x", 62)
.attr("y", 22) .attr("y", 22)
.attr("dy", ".35em") .attr("dy", ".35em")
.attr("text-anchor", "middle") .attr("text-anchor", "middle")
.attr("class", "WorkflowChart-defaultText WorkflowChart-incompleteText") .attr("class", "WorkflowChart-defaultText WorkflowChart-deletedText")
.html(function () { .html(function () {
return "<span class=\"WorkflowChart-incompleteIcon\">\uf06a</span><span> INCOMPLETE</span>"; return "<span>DELETED</span>";
}) })
.style("display", function(d) { return d.unifiedJobTemplate || d.placeholder ? "none" : null; }); .style("display", function(d) { return d.unifiedJobTemplate || d.placeholder ? "none" : null; });
@@ -709,9 +711,11 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
return "#D7D7D7"; return "#D7D7D7";
} }
}) })
.attr("class", function(d) { .attr("class", function(d) {
return d.placeholder ? "rect placeholder" : "rect"; let classString = d.placeholder ? "rect placeholder" : "rect";
}); classString += !d.unifiedJobTemplate ? " WorkflowChart-dashedNode" : "";
return classString;
});
t.selectAll(".node") t.selectAll(".node")
.attr("parent", function(d){return d.parent ? d.parent.id : null;}) .attr("parent", function(d){return d.parent ? d.parent.id : null;})
@@ -788,7 +792,7 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
t.selectAll(".WorkflowChart-detailsLink") t.selectAll(".WorkflowChart-detailsLink")
.style("display", function(d){ return d.job && d.job.status && d.job.id ? null : "none"; }); .style("display", function(d){ return d.job && d.job.status && d.job.id ? null : "none"; });
t.selectAll(".WorkflowChart-incompleteText") t.selectAll(".WorkflowChart-deletedText")
.style("display", function(d){ return d.unifiedJobTemplate || d.placeholder ? "none" : null; }); .style("display", function(d){ return d.unifiedJobTemplate || d.placeholder ? "none" : null; });
t.selectAll(".WorkflowChart-conflictText") t.selectAll(".WorkflowChart-conflictText")