diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js
index 22472e493c..1f7d8aad3f 100644
--- a/awx/ui/static/js/controllers/JobDetail.js
+++ b/awx/ui/static/js/controllers/JobDetail.js
@@ -41,31 +41,31 @@ export function JobDetailController ($location, $rootScope, $filter, $scope, $co
for (var host in hosts) {
if (hosts[host].ok) {
hosts[host].okTip = hosts[host].ok;
- hosts[host].okTip += (hosts[host].ok === 1) ? " host was" : " hosts were";
- hosts[host].okTip += " successful during this run.";
+ hosts[host].okTip += (hosts[host].ok === 1) ? " host event was" : " host events were";
+ hosts[host].okTip += " ok.";
} else {
- hosts[host].okTip = "No hosts were successful during this run.";
+ hosts[host].okTip = "No host events were ok.";
}
if (hosts[host].changed) {
hosts[host].changedTip = hosts[host].changed;
- hosts[host].changedTip += (hosts[host].changed === 1) ? " host" : " hosts";
- hosts[host].changedTip += " changed during this run.";
+ hosts[host].changedTip += (hosts[host].changed === 1) ? " host event" : " host eventss";
+ hosts[host].changedTip += " changed.";
} else {
- hosts[host].changedTip = "No hosts changed during this run.";
+ hosts[host].changedTip = "No host events changed.";
}
if (hosts[host].failed) {
hosts[host].failedTip = hosts[host].failed;
- hosts[host].failedTip += (hosts[host].failed === 1) ? " host" : " hosts";
- hosts[host].failedTip += " failed during this run.";
+ hosts[host].failedTip += (hosts[host].failed === 1) ? " host event" : " host events";
+ hosts[host].failedTip += " failed.";
} else {
- hosts[host].failedTip = "No hosts failed during this run.";
+ hosts[host].failedTip = "No host events failed.";
}
if (hosts[host].unreachable) {
hosts[host].unreachableTip = hosts[host].unreachable;
- hosts[host].unreachableTip += (hosts[host].unreachable === 1) ? " host was" : " hosts were";
- hosts[host].unreachableTip += " unreachable during this run";
+ hosts[host].unreachableTip += (hosts[host].unreachable === 1) ? " host event was" : " hosts events were";
+ hosts[host].unreachableTip += " unreachable";
} else {
- hosts[host].unreachableTip = "No hosts were unreachable during this run.";
+ hosts[host].unreachableTip = "No host events were unreachable.";
}
}
});
@@ -79,45 +79,45 @@ export function JobDetailController ($location, $rootScope, $filter, $scope, $co
}
if (tasks[task].successfulCount) {
tasks[task].successfulCountTip = tasks[task].successfulCount;
- tasks[task].successfulCountTip += (tasks[task].successfulCount === 1) ? " host was" : " hosts were";
- tasks[task].successfulCountTip += " successful during this run.";
+ tasks[task].successfulCountTip += (tasks[task].successfulCount === 1) ? " host event was" : " host events were";
+ tasks[task].successfulCountTip += " ok.";
} else {
- tasks[task].successfulCountTip = "No hosts were successful during this run.";
+ tasks[task].successfulCountTip = "No host events were ok.";
}
if (tasks[task].changedCount) {
tasks[task].changedCountTip = tasks[task].changedCount;
- tasks[task].changedCountTip += (tasks[task].changedCount === 1) ? " host" : " hosts";
- tasks[task].changedCountTip += " changed during this run.";
+ tasks[task].changedCountTip += (tasks[task].changedCount === 1) ? " host event" : " host events";
+ tasks[task].changedCountTip += " changed.";
} else {
- tasks[task].changedCountTip = "No hosts changed during this run.";
+ tasks[task].changedCountTip = "No host events changed.";
}
if (tasks[task].skippedCount) {
tasks[task].skippedCountTip = tasks[task].skippedCount;
- tasks[task].skippedCountTip += (tasks[task].skippedCount === 1) ? " host was" : " hosts were";
- tasks[task].skippedCountTip += " skipped during this run.";
+ tasks[task].skippedCountTip += (tasks[task].skippedCount === 1) ? " host event was" : " hosts events were";
+ tasks[task].skippedCountTip += " skipped.";
} else {
- tasks[task].skippedCountTip = "No hosts were skipped during this run.";
+ tasks[task].skippedCountTip = "No host events were skipped.";
}
if (tasks[task].failedCount) {
tasks[task].failedCountTip = tasks[task].failedCount;
- tasks[task].failedCountTip += (tasks[task].failedCount === 1) ? " host" : " hosts";
- tasks[task].failedCountTip += " failed during this run.";
+ tasks[task].failedCountTip += (tasks[task].failedCount === 1) ? " host event" : " host events";
+ tasks[task].failedCountTip += " failed.";
} else {
- tasks[task].failedCountTip = "No hosts failed during this run.";
+ tasks[task].failedCountTip = "No host events failed.";
}
if (tasks[task].unreachableCount) {
tasks[task].unreachableCountTip = tasks[task].unreachableCount;
- tasks[task].unreachableCountTip += (tasks[task].unreachableCount === 1) ? " host was" : " hosts were";
- tasks[task].unreachableCountTip += " unreachable during this run.";
+ tasks[task].unreachableCountTip += (tasks[task].unreachableCount === 1) ? " host event was" : " hosts events were";
+ tasks[task].unreachableCountTip += " unreachable.";
} else {
- tasks[task].unreachableCountTip = "No hosts were unreachable during this run.";
+ tasks[task].unreachableCountTip = "No host events were unreachable.";
}
if (tasks[task].missingCount) {
tasks[task].missingCountTip = tasks[task].missingCount;
- tasks[task].missingCountTip += (tasks[task].missingCount === 1) ? " host was" : " hosts were";
- tasks[task].missingCountTip += " missing during this run.";
+ tasks[task].missingCountTip += (tasks[task].missingCount === 1) ? " host event was" : " host events were";
+ tasks[task].missingCountTip += " missing.";
} else {
- tasks[task].missingCountTip = "No hosts were missing during this run.";
+ tasks[task].missingCountTip = "No host events were missing.";
}
}
});
diff --git a/awx/ui/static/js/helpers/JobDetail.js b/awx/ui/static/js/helpers/JobDetail.js
index 039c90bc8c..ba99bc4d10 100644
--- a/awx/ui/static/js/helpers/JobDetail.js
+++ b/awx/ui/static/js/helpers/JobDetail.js
@@ -1144,28 +1144,28 @@ export default
if (scope.host_summary.ok) {
graph_data.push({
label: 'OK',
- value: (scope.host_summary.ok === scope.host_summary.total) ? 1 : scope.host_summary.ok,
+ value: scope.host_summary.ok,
color: '#60D66F'
});
}
if (scope.host_summary.changed) {
graph_data.push({
label: 'Changed',
- value: (scope.host_summary.changed === scope.host_summary.total) ? 1 : scope.host_summary.changed,
+ value: scope.host_summary.changed,
color: '#FF9900'
});
}
if (scope.host_summary.unreachable) {
graph_data.push({
label: 'Unreachable',
- value: (scope.host_summary.unreachable === scope.host_summary.total) ? 1 : scope.host_summary.unreachable,
+ value: scope.host_summary.unreachable,
color: '#FF0000'
});
}
if (scope.host_summary.failed) {
graph_data.push({
label: 'Failed',
- value: (scope.host_summary.failed === scope.host_summary.total) ? 1 : scope.host_summary.failed,
+ value: scope.host_summary.failed,
color: '#ff5850'
});
}
@@ -1247,13 +1247,7 @@ export default
.attr('class', 'donut-tooltip');
tooltip.append('div')
- .attr('class', 'donut-label');
-
- tooltip.append('div')
- .attr('class', 'donut-count');
-
- tooltip.append('div')
- .attr('class', 'donut-percent');
+ .attr('class', 'donut-tooltip-inner');
path = svg.selectAll('path')
.data(pie(dataset))
@@ -1268,11 +1262,17 @@ export default
var total = d3.sum(dataset.map(function(d) {
return d.value;
}));
+
+ var label;
+ if (d.data.value === 1) {
+ label = " host ";
+ } else {
+ label = " hosts ";
+ }
var percent = Math.round(1000 * d.data.value / total) / 10;
- tooltip.select('.donut-label').html(d.data.label);
+ tooltip.select('.donut-tooltip-inner').html(d.data.value + label + " (" +
+ percent + "%) " + d.data.label + ".");
//.attr('style', 'color:white;font-family:');
- tooltip.select('.donut-count').html(d.data.value);
- tooltip.select('.donut-percent').html(percent + '%');
tooltip.style('display', 'block');
});
diff --git a/awx/ui/static/partials/job_detail.html b/awx/ui/static/partials/job_detail.html
index e4cb9d3614..25164ff4bc 100644
--- a/awx/ui/static/partials/job_detail.html
+++ b/awx/ui/static/partials/job_detail.html
@@ -277,7 +277,7 @@
{{ task.missingCount }}
-