[% INCLUDE renderBuildStatusIcon size=128, build=build %]
diff --git a/src/root/common.tt b/src/root/common.tt
index 00833890..0cd750ef 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -61,7 +61,7 @@
[% BLOCK renderBuildList %]
-
+
[% IF !hideResultInfo %]
@@ -69,6 +69,7 @@
[% END %]
# |
[% IF showSchedulingInfo %]
+ |
P |
[% END %]
Job |
@@ -104,6 +105,7 @@
[% END %]
[% build.id %] |
[% IF showSchedulingInfo %]
+ [% IF build.get_column('busy') %][% ELSIF build.get_column('disabled') == 1 || build.get_column('enabled') == 0 %]Disabled[% END %] |
[% build.get_column('priority') %] |
[% END %]
diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index 5ed874f9..4e68c71d 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -106,7 +106,7 @@
[% IF !edit && activeJobsStatus -%]
Status
-
+
[% END %]
diff --git a/src/root/queue.tt b/src/root/queue.tt
index 4b954532..94743fd4 100644
--- a/src/root/queue.tt
+++ b/src/root/queue.tt
@@ -13,10 +13,6 @@
[% ELSE %]
- Note: Builds in red are
- currently executing. Builds in grey are currently disabled.
-
[% INCLUDE renderBuildList builds=queue showSchedulingInfo=1 hideResultInfo=1 %]
[% END %]
diff --git a/src/root/static/css/hydra.css b/src/root/static/css/hydra.css
index c1922111..48800544 100644
--- a/src/root/static/css/hydra.css
+++ b/src/root/static/css/hydra.css
@@ -1,63 +1,137 @@
-#generic-tabs li {
- height : 30px;
- font-size : 90%;
-}
-#generic-tabs {
- min-height: 30em;
-}
-#generic-tabs div {
- font-size : 90%;
+body {
+ font-family: sans-serif;
+ background: white;
+ margin: 2em 1em 2em 1em;
}
#logo img {
- width: 8em;
+ width: 8em;
}
-.statusTable td, .statusTable th {
+img {
border-style: none;
}
-tr.clickable:hover {
- background-color: #a0a0f0;
- cursor: pointer;
-}
-
-.layoutTable td, .layoutTable th {
- border-style: none;
- text-align: left;
-}
-
-.layoutTable th {
- vertical-align: top;
-}
-
-.activeJobsStatus td, .activeJobsStatus th {
- border-style: 1px dotted #CCCCCC;
-}
-
-.activeJobsStatus tbody tr td {
- align: center;
-}
-
+a { text-decoration: none;}
+a:link { color: #0048b3; }
+a:visited { color: #002a6a; }
+a.no-hover:hover { background: none; }
+a:hover, a:visited:hover { text-decoration: underline;}
a.smallLink {
font-size: 60%;
vertical-align: top;
}
+a#error-link {
+ color: red;
+}
+
+
+table {
+ empty-cells: show;
+ border-spacing: 1px;
+ text-align: left;
+}
+
+th, td {
+ border: 1px solid #dddddd;
+}
+
+th {
+ background-color:#E6EEEE;
+}
+
+table.tablesorter tr:nth-child(even) {
+ background-color: #efefef;
+}
+
+tr.clickable:hover {
+ background-color: #E6EEFF;
+ cursor: pointer;
+}
+td.centered {
+ text-align: center;
+}
+
+
+.layoutTable td, .layoutTable th {
+ border-style: none;
+}
+
+table.tablesorter thead tr .header {
+ background-image: url(/static/js/tablesorter/themes/blue/bg.gif);
+ background-repeat: no-repeat;
+ background-position: center right;
+ cursor: pointer;
+}
+
+table.tablesorter thead tr .headerSortUp {
+ background-image: url(/static/js/tablesorter/themes/blue/asc.gif);
+}
+
+table.tablesorter thead tr .headerSortDown {
+ background-image: url(/static/js/tablesorter/themes/blue/desc.gif);
+}
+
+table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
+ background-color: #D6DDDD;
+}
+
+table.tablesorter thead tr th {
+ padding-right: 1.5em;
+}
+
+#generic-tabs li {
+ height : 30px;
+ font-size : 90%;
+}
+#generic-tabs div {
+ font-size : 90%;
+}
+
+h1, h2, h3 {
+ font-weight: bold;
+ color: #002a70;
+}
+
+ul.productList {
+ list-style: none;
+ padding-left: 1em;
+}
+
+ul.productList li {
+ margin-top: 1em;
+}
+
+.productDetails {
+ display: none;
+ margin-top: 1em;
+ margin-bottom: 1em;
+ margin-left: 3em;
+}
+
+.runningBuild {
+ color: #ff9900;
+}
+
+.disabledBuild {
+ color: #b0b0b0;
+}
.error-msg {
color: red;
white-space: pre-wrap;
}
-a#error-link {
- color: red;
-}
-
.error {
color: red;
font-weight: bold;
}
+pre {
+ margin-left: 1.5em;
+ margin-right: 1.5em;
+}
+
pre.buildlog {
border: 1px solid black;
padding: 0.3em;
@@ -75,31 +149,6 @@ div.buildlog {
white-space: pre-wrap;
}
-ul.productList {
- list-style: none;
- padding-left: 1em;
-}
-
-ul.productList li {
- margin-top: 1em;
-}
-
-.runningBuild {
- background-color: #ff3030;
- color: white;
-}
-
-.disabledBuild {
- background-color: #b0b0b0;
-}
-
-.productDetails {
- display: none;
- margin-top: 1em;
- margin-bottom: 1em;
- margin-left: 3em;
-}
-
.template {
display: none;
}
@@ -115,46 +164,11 @@ div.help pre {
color: #400000;
}
-
-/* Sortable tables */
-
-table.tablesorter {
- text-align: left;
-}
-
-table.tablesorter thead tr .header {
- background-image: url(/static/js/tablesorter/themes/blue/bg.gif);
- background-repeat: no-repeat;
- background-position: center right;
- cursor: pointer;
-}
-
-table.tablesorter thead tr .headerSortUp {
- background-image: url(/static/js/tablesorter/themes/blue/asc.gif);
-}
-
-table.tablesorter thead tr .headerSortDown {
- background-image: url(/static/js/tablesorter/themes/blue/desc.gif);
-}
-
-table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
- background-color: #ffe000;
-}
-
-table.tablesorter thead tr th {
- padding-right: 1.5em;
-}
-
-
-/* Overriding tablesorter... */
-
th.releaseSetJobName {
font-size: 60%;
padding: 0 0 0 0;
}
-/* Editing */
-
input.string {
font-family: sans-serif;
font-size: 100%;
diff --git a/src/root/static/css/nix-common.css b/src/root/static/css/nix-common.css
index 48f862bb..e69de29b 100644
--- a/src/root/static/css/nix-common.css
+++ b/src/root/static/css/nix-common.css
@@ -1,85 +0,0 @@
-body {
- font-family: sans-serif;
- background: white;
- margin: 2em 1em 2em 1em;
-}
-
-h1, h2, h3 {
- font-weight: bold;
- color: #005aa0;
-}
-
-h1 {
- font-size: 180%;
-}
-
-h2 {
- font-size: 130%;
- margin-top: 1em;
-}
-
-h3 {
- font-size: 100%;
-}
-
-table {
- empty-cells: show;
- border-collapse: collapse;
- border-spacing: 0px;
-}
-
-tr.odd {
- background: #f4f4ff;
-}
-
-th {
- text-align: center;
- font-weight: bold;
- background: #ffffc0;
-}
-
-td, th {
- padding: 2px 5px;
- border: solid black 1px;
-}
-
-td {
- vertical-align: top;
-}
-
-td.centered {
- text-align: center;
-}
-
-a {
- text-decoration: none;
-}
-
-a:hover, a:visited:hover {
- text-decoration: underline;
-}
-
-a:link { color: #0048b3; }
-a:visited { color: #002a6a; }
-a.no-hover:hover { background: none; }
-
-img {
- border-style: none;
-}
-
-li {
- margin-top: 0.5em;
- margin-bottom: 0.5em;
-}
-
-pre {
- margin-left: 1.5em;
- margin-right: 1.5em;
-}
-
-pre.code {
- border: 1px solid #6185a0;
- padding: 6px 6px;
- color: #600000;
- background: #f4f4f8;
-}
diff --git a/src/root/static/css/nixos-site.css b/src/root/static/css/nixos-site.css
index 6b8ac851..f2411d9c 100644
--- a/src/root/static/css/nixos-site.css
+++ b/src/root/static/css/nixos-site.css
@@ -7,18 +7,12 @@ body {
div#page {
max-width: 120em;
min-width: 50em;
- min-height: 30em;
margin: 1em auto;
background-color: white;
/* Put a rounded border around the page. */
border: 1px solid black;
padding: 1em;
- border-radius: 1em;
- -moz-border-radius: 1em;
- -webkit-border-radius: 1em;
- -moz-box-shadow: #404040 0px 5px 50px;
- -webkit-box-shadow: #404040 0px 5px 50px;
}
/* The header. */
@@ -93,18 +87,16 @@ ul.short-menu li a:hover {
/* The left menu. */
div#main {
position: relative;
- min-height: 20em;
}
div#content {
- min-height: 20em;
+ min-height: 35em;
}
div#left-bar {
position: absolute;
left: 0em;
width: 8em;
- min-height: 20em;
}
div#left-title {
diff --git a/src/root/static/images/running.gif b/src/root/static/images/running.gif
new file mode 100644
index 00000000..d8530e78
Binary files /dev/null and b/src/root/static/images/running.gif differ
| |