From ac25e42d426981b8cab5f660de074e6c4fc41453 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 29 Jul 2013 11:17:22 -0400 Subject: [PATCH] float the progress bars and statuses to the right this floats the progress bars and statuses to the right, which provides a nicer visual block for all the status elements. The progress bars need a margin hack to get them to visually align with the rest of the line. This also moves the progress bar width into the css instead of inline, and to 5em which is approx what SUCCESS width is in chrome. (Should be about the same in other browsers, but font rendering is different between webkit / firefox). Errant white space deleted, my editor does that on all changes, sorry if that noises things up. Change-Id: Ibf4288049e3b24949d17a6b39f2cf1b7bd7a52dc --- .../openstack_project/files/zuul/status.html | 21 +++++++++++++------ .../openstack_project/files/zuul/status.js | 4 ++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/modules/openstack_project/files/zuul/status.html b/modules/openstack_project/files/zuul/status.html index d1c13ceec6..8f5c4597af 100644 --- a/modules/openstack_project/files/zuul/status.html +++ b/modules/openstack_project/files/zuul/status.html @@ -41,6 +41,9 @@ font-size: 16pt; line-height: 1.0; } +.result { + float: right; +} .result_success { color: #007f00; } @@ -64,6 +67,12 @@ a:link { font-size: 12pt; margin: 0pt; } +.change_progress { + width: 5em; + float: right; + /* because other wise this floats up off the line */ + margin-top: 0.25em; +} @@ -79,24 +88,24 @@ a:link { src="http://status.openstack.org/common.js"> - + - + - + - + - + - + diff --git a/modules/openstack_project/files/zuul/status.js b/modules/openstack_project/files/zuul/status.js index 3d69ee9c1b..20d4680915 100644 --- a/modules/openstack_project/files/zuul/status.js +++ b/modules/openstack_project/files/zuul/status.js @@ -46,7 +46,7 @@ function format_progress(elapsed, remaining) { } else { total = null; } - r = 'in progress'; @@ -137,7 +137,7 @@ function format_change(change) { if (job['result'] == null && job['url'] != null) { html += format_progress(job['elapsed_time'], job['remaining_time']); } else { - html += ''+result+''; + html += ''+result+''; } if (job['voting'] == false) {