summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Mancy <rmancy@redhat.com>2012-07-19 01:15:28 +1000
committerRaymond Mancy <rmancy@redhat.com>2012-07-19 02:05:20 +1000
commit1d07e6e446b06ba5fe460c934e963d83538bf05b (patch)
tree1cc74510088d6953017d7bb69c7b377392481f3a
parentb9bb40196de521a9a33144e3e620b0c1343b6f25 (diff)
Ensure job actions are not on newlines regardless of whiteboard length. See 732025
-rw-r--r--Server/bkr/server/static/css/layout-uncompressed.css5
-rw-r--r--Server/bkr/server/templates/job_action.kid2
2 files changed, 6 insertions, 1 deletions
diff --git a/Server/bkr/server/static/css/layout-uncompressed.css b/Server/bkr/server/static/css/layout-uncompressed.css
index 537a6e4..1d05ef1 100644
--- a/Server/bkr/server/static/css/layout-uncompressed.css
+++ b/Server/bkr/server/static/css/layout-uncompressed.css
@@ -712,6 +712,11 @@ body { font-family:Arial, Helvetica, Sans-Serif; font-size:12px; margin:0px 20px
display: block;
}
+td.list .job-action-container {
+ white-space: nowrap;
+ margin-right: 1em;
+}
+
td.list .job-action {
display: inline;
margin-left: 0.5em;
diff --git a/Server/bkr/server/templates/job_action.kid b/Server/bkr/server/templates/job_action.kid
index ccd73e4..91c03a9 100644
--- a/Server/bkr/server/templates/job_action.kid
+++ b/Server/bkr/server/templates/job_action.kid
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#">
-<div>
+<div class='job-action-container'>
<a class='list' href="${value.clone_link()}">Clone</a>
<span py:if="('admin' in tg.identity.groups or value.is_owner(tg.identity.user)) and not value.is_finished()" py:strip='1'>
<a class='list job-action' href="${value.cancel_link()}">Cancel</a>