diff --git a/awx/ui/client/src/helpers/JobDetail.js b/awx/ui/client/src/helpers/JobDetail.js index 1e7f5d89e7..f6c0ef60cc 100644 --- a/awx/ui/client/src/helpers/JobDetail.js +++ b/awx/ui/client/src/helpers/JobDetail.js @@ -942,7 +942,7 @@ export default graph_data.push({ label: 'OK', value: count.ok.length, - color: '#60D66F' + color: '#5CB85C' }); } if (count.changed.length > 0) { @@ -987,18 +987,19 @@ export default job_detail_chart = nv.models.pieChart() .margin({bottom: 15}) .x(function(d) { - return d.label +': '+ Math.round((d.value/total)*100) + "%"; + return d.label +': '+ Math.floor((d.value/total)*100) + "%"; }) .y(function(d) { return d.value; }) - .showLabels(true) - .showLegend(false) + .showLabels(false) + .showLegend(true) .growOnHover(false) .labelThreshold(0.01) .tooltipContent(function(x, y) { return '

'+x+'

'+ '

' + Math.floor(y.replace(',','')) + ' HOSTS ' + '

'; }) .color(colors); - + job_detail_chart.legend.rightAlign(false); + job_detail_chart.legend.margin({top: 5, right: 450, left:0, bottom: 0}); d3.select(element.find('svg')[0]) .datum(dataset) .transition().duration(350) @@ -1008,19 +1009,15 @@ export default "font-style": "normal", "font-weight":400, "src": "url(/static/assets/OpenSans-Regular.ttf)", - "width": 500, + "width": 600, "height": 300, + "color": '#848992' }); - - d3.select(element.find(".nv-label text")[0]) - .attr("class", "HostSummary-graph--successful") + d3.select(element.find(".nv-noData")[0]) .style({ - "font-family": 'Open Sans', - "font-size": "16px", - "text-transform" : "uppercase", - "fill" : colors[0], - "src": "url(/static/assets/OpenSans-Regular.ttf)" + "text-anchor": 'start' }); + /* d3.select(element.find(".nv-label text")[1]) .attr("class", "HostSummary-graph--changed") .style({ @@ -1048,6 +1045,7 @@ export default "fill" : colors[3], "src": "url(/static/assets/OpenSans-Regular.ttf)" }); + */ return job_detail_chart; }; }]) diff --git a/awx/ui/client/src/job-detail/host-summary/host-summary.partial.html b/awx/ui/client/src/job-detail/host-summary/host-summary.partial.html index bd86709075..7c95a8b42d 100644 --- a/awx/ui/client/src/job-detail/host-summary/host-summary.partial.html +++ b/awx/ui/client/src/job-detail/host-summary/host-summary.partial.html @@ -1,6 +1,6 @@
-
4 Please select a host below to view a summary of all associated tasks.
+
4 Please select a host below to view a summary of all associated tasks.
diff --git a/awx/ui/client/src/job-detail/job-detail.block.less b/awx/ui/client/src/job-detail/job-detail.block.less index 2e69b9438e..6e6f4810da 100644 --- a/awx/ui/client/src/job-detail/job-detail.block.less +++ b/awx/ui/client/src/job-detail/job-detail.block.less @@ -162,7 +162,20 @@ background-color: @default-link-hov; } } - +.JobDetail .nvd3.nv-noData{ + color: @default-interface-txt; + font-size: 12px; + text-transform: uppercase; + font-family: 'Open Sans', sans-serif; +} +.JobDetail .nv-series{ + padding-right: 30px; + display: block; +} +.JobDetail-instructions .badge{ + background-color: @default-list-header-bg; + color: @default-interface-txt; +} .JobDetail-tableToggle--left{ border-top-left-radius: 5px; border-bottom-left-radius: 5px; @@ -212,6 +225,8 @@ } .JobDetail-stdoutActionButton--active{ + display: none; + visibility: hidden; flex:none; width:0px; padding-right: 0px;