From f0706a75a2301095fccd61154b29a2999a35d1aa Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 24 Feb 2010 15:06:20 +0000 Subject: [PATCH] * hydra: layout changes --- src/root/build.tt | 2 +- src/root/common.tt | 4 +- src/root/jobset.tt | 4 +- src/root/product-list.tt | 41 ++++-- src/root/queue.tt | 4 - src/root/static/css/hydra.css | 208 +++++++++++++++-------------- src/root/static/css/nix-common.css | 85 ------------ src/root/static/css/nixos-site.css | 10 +- src/root/static/images/running.gif | Bin 0 -> 2892 bytes 9 files changed, 145 insertions(+), 213 deletions(-) create mode 100644 src/root/static/images/running.gif diff --git a/src/root/build.tt b/src/root/build.tt index 3e2aef95..8730fb47 100644 --- a/src/root/build.tt +++ b/src/root/build.tt @@ -93,7 +93,7 @@
- +
[% 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 %] + [% END %] @@ -104,6 +105,7 @@ [% END %] [% IF showSchedulingInfo %] + [% END %]
# PJob[% build.id %][% IF build.get_column('busy') %]Running[% ELSIF build.get_column('disabled') == 1 || build.get_column('enabled') == 0 %]Disabled[% END %] [% build.get_column('priority') %] 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

- +
[% FOREACH s IN systems %][% END %] [% odd = 0 %] @@ -116,7 +116,7 @@ [% FOREACH s IN systems %] [% system = s.system %] [% systemStatus = j.get_column(system) %] - + [% CASE "report" %] -
  • +
    • + + [% CASE ["doc", "doc-pdf"] %] -
  • +
    • + + [% CASE DEFAULT %] -
  • +
    • + + [% END %] [% END -%] - +
    Job[% s.system %]
    + [% IF systemStatus != undef %] [% IF systemStatus == 0 %] diff --git a/src/root/product-list.tt b/src/root/product-list.tt index bc061db3..ba7aec5e 100644 --- a/src/root/product-list.tt +++ b/src/root/product-list.tt @@ -6,7 +6,7 @@ nrProducts = 0; FOREACH product IN build.buildproducts; nrProducts = nrProducts + 1; END %] -
      + [% FOREACH product IN build.buildproducts -%] @@ -20,7 +20,8 @@ [% CASE "nix-build" %] -
    • +
      • + + -
    • +
      • + + [% CASE "file" %] -
    • +
      • +
      [% uri = c.uri_for('/build' build.id 'nix' 'pkg' "${build.nixname}-${build.system}.nixpkg") %] Source @@ -45,9 +46,11 @@

      - +
      [% filename = "${build.nixname}.closure.gz" %] [% uri = c.uri_for('/build' build.id 'nix' 'closure' filename ) %] @@ -82,12 +85,14 @@ command as root.

      - +
      [% SWITCH product.subtype %] [% CASE "source-dist" %] @@ -134,11 +139,14 @@
      Full path:[% product.path %]
      - + +
    Report [% SWITCH product.subtype %] @@ -148,11 +156,13 @@ Report of type [% product.subtype %] [% END %] - +
    [% IF product.type == "doc-pdf" %] PDF document @@ -170,19 +180,22 @@ Documentation of type [% product.subtype %] [% END %] - +
    Something of type [% product.type %] - +
    [% 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 0000000000000000000000000000000000000000..d8530e78ba6af8bd2b9936a9b441b9e5544cbfd4 GIT binary patch literal 2892 zcmd7U{Z|s^0tawwy9sJ9TcwDuS!p1stxQG8R;R0iS~)F2&~8?OAg-KFd9$~rB4}G> z6A)MV3Sw?*3W)ZimIAKL4CT$W@~YrlH#ZYR?YfMrcJPjp zei2nB-Nc&$ceFFQhZ?_R1rE2o7#}P;-hK59-1xL*Vq$?FxE5NI_r7PK1p-2kbyu;` zyptv^4=1Og>B0QLd~dQ9B=B~KqXk*TK%`2bf1ot!8Lcn^7$d2T6sQ&5fC(MS22W@s zGZIi#_1=UP5%-o67o;BLo6e{xW)(i2dht3f&DAyFam5azZ6049FwW>UIl1&hGsZesH}9$McbMJbe=KZQ-Mf-UgL~W#?SrePk+0fYNV9~) z{BzxdUY1-E8bN#w$p)EZb6S^R1iu3S;CqWP%6K-fN&90QUq;s#%*Vqx`^U)wn8Lw^ z>>IbkN+jS&gBwE$P@yK6)YL*n%tESg(!Hqg?&LMBLr6}$+p!f%>fcGmr|;k8kl;_U zXUZ;qEu!Bhhh8h+=Zl9WK+b;@`Z8#3Z}7*=hHZW?r}Ov1QX!)$x?#Z9qLZ7)JN3eb zlz!Xa$Ga|xb?C#@&Ce(2*VYTaJ;-3O>_7d5vJWK;%0Cfc85|k4&zH$uE{7e%x$x0S z?EsrD=FdP)C)gw)l)(#zY50_IFa_UgWjI8>An&(`O?srH+c1`bRm6x5aHe}{o7%Mw zsif4oxBDz|^@WQG)G0^gqAx3T;`^egoTbIs6@7jG@^NAcxR2DdjCR(oS-Oya8#Mb} z?6Z!f;G3T_vaMA!Hoyk?ri1A1Sqrll%By05Ug?~pu6^K2OgbTPa4wnB)N(d}9_seq z4`)kzbD1M2T4|h+roW97pDm4!y@3>yL~)(~G@{z1wcH+iAT5cLBX|XJD~<>uU&!PG z%sSU>WC>#xz9EndRL657BoqRcO+#>+8Q4^gBa16#8Vy12vR)`v=o#>O0OC_cEFl~gZTmBIjf6*PWNYNh*t@(u5$gZ-~Uzi z`PwsX9O}=;bt%qXh)`T^-dHuZp{Hby1YHwMcb1>#%Lc2g)g~+^7=%a6S7hn)=K(61 zK4P9CK$ey$aWL1?36&yg!X&O`Gci6jrD1M$y*eC;Ze#*-AjSm+o$J09-ae7~J$pz; zU7&6e?U|19tIs`Lb}wz^{i^?uG`mEb(Do$fR!z}1S{8qE($uewMW_QmbJ%2bYGuC^>ZrsN2Y_Bg>9ltT}N=bTL*>6aM!J}`^X1+mJ8BW@)Yt~ngPgoh@r(%sV zi_Il$G(1d7BJpbCAp3hf2VKmMZ{WyTh$`(1#2Zi#5Jwa9$pzAPV5VRwFg%!28?G8~ z2&PYP9Gw+x`C}e9!M1#4nN*)`b& zJ>5S36Y#_N2{qyfenspbcJcDt#w=Lxa0GCr(p1LRG_0MYG;kj@v*3{0n>(zIcRc)0 zJ~2J;B1cv}95DVR()+|Q?Pqa!f2?_`emCPj!F)sCRNe6CHp=#CXVYi^IJ#RhIp`-t!09et;bcx9T8+ZJK_ zx%NXjTRvPlR@EP4?IK7am&@(0B$0`6(sNrnV@+T>!URPy= zT&w$1^!C~mcJhG?HMNf^Tytn(gG>?g-j&lunfyUUIo#RcedNVJ$q=SSJ3sm|*ydGdE6OQx(p_I#$f_z!8}gYRid~m^e8nK||2Hpa$+rXT za0Ii=%ky2`@y!CVDba1$x?98M*aHa%@mC>HjaOO;{#dj10@SOI(zUHb5Ah%OFSul! z(FjA&{6Ia$!;goJpmq)gW0}u~Yxg~G`Pw;U4r?E%aUrp@OYw&AaRN`v`w-~5#U}U zh8n`!JA_|3vc~^4(R;QRSAP{>25zh{Jy>IDZ3t0sezv-X|59@~=;S)7BMkf4)87L3 zW%egE(?SBtIO3*Rr`ShvpJf;N&E1P9&DUM&9McDSQwGx~h)af@_PDNrG3OL?K2#>s z(&nz`-yIWSy~*-ij3u0I=38BX$W}Un&hf6rTWF1{0