From 58ff7ab91ecd7233575788fb891a3846d3583153 Mon Sep 17 00:00:00 2001 From: Samuel Padgett Date: Mon, 30 Nov 2015 10:08:56 -0500 Subject: [PATCH] Fix sr-only text for pod status chart --- assets/app/scripts/directives/podStatusChart.js | 3 +++ assets/app/views/_pod-status-chart.html | 7 +++++-- pkg/assets/bindata.go | 15 +++++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/assets/app/scripts/directives/podStatusChart.js b/assets/app/scripts/directives/podStatusChart.js index 13e52cadf077..de4524ebbbcb 100644 --- a/assets/app/scripts/directives/podStatusChart.js +++ b/assets/app/scripts/directives/podStatusChart.js @@ -123,6 +123,9 @@ angular.module('openshiftConsole') } else { chart.load(data); } + + // Add to scope for sr-only text. + $scope.podStatusData = data.columns; } function countPodPhases() { diff --git a/assets/app/views/_pod-status-chart.html b/assets/app/views/_pod-status-chart.html index 12ab155c612a..3e0868538378 100644 --- a/assets/app/views/_pod-status-chart.html +++ b/assets/app/views/_pod-status-chart.html @@ -1,6 +1,9 @@
- Pod status: - {{column[1]}} {{column[0]}} +
No pods.
+
+ Pod status: + {{column[1]}} {{column[0]}} +
diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go index 000c1675d1a0..fe1895230d3b 100644 --- a/pkg/assets/bindata.go +++ b/pkg/assets/bindata.go @@ -5333,13 +5333,13 @@ function h() { var c, d = d3.select(g[0]).select("text.c3-chart-arcs-title"), f = b(a.pods); return d ? (c = angular.isNumber(a.desired) && a.desired !== f ? "scaling to " + a.desired + "..." :1 === f ? "pod" :"pods", d.selectAll("*").remove(), d.insert("tspan").text(f).classed("pod-count donut-title-big-pf", !0).attr("dy", 0).attr("x", 0), void d.insert("tspan").text(c).classed("donut-title-small-pf", !0).attr("dy", 20).attr("x", 0)) :void e.warn("Can't select donut title element"); } -function i(a) { -var c = { +function i(c) { +var d = { columns:[] }; -angular.forEach(m, function(b) { -c.columns.push([ b, a[b] || 0 ]); -}), 0 === b(a) ? c.columns.push([ "Empty", 1 ]) :c.unload = "Empty", k ? k.load(c) :(l.data.columns = c.columns, k = c3.generate(l)); +angular.forEach(m, function(a) { +d.columns.push([ a, c[a] || 0 ]); +}), 0 === b(c) ? d.columns.push([ "Empty", 1 ]) :d.unload = "Empty", k ? k.load(d) :(l.data.columns = d.columns, k = c3.generate(l)), a.podStatusData = d.columns; } function j() { var b = {}, e = function(a) { @@ -6353,8 +6353,11 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', [] "
\n" + "\n" + "
\n" + + "
No pods.
\n" + + "
\n" + "Pod status:\n" + - "{{column[1]}} {{column[0]}}\n" + + "{{column[1]}} {{column[0]}}\n" + + "
\n" + "
" );