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 zcmZ?wbhEHbY+&GL_{hNU|Nnmm28M0hwlOd;DE{a6a}5c0b_{Se(lcOY1PT3+}#lXOz!@$7605Xt)Y4H^O1r6KpT5%xP(Mizb-!tm`_sM3{4{?b5(I zS9To^+J0-@x?fM*_U?WfcxF%E^~?h4SfkVR#mTXr=Wo})GXMFf{5tyyw}@r!+n3Kc zVWIItto?-s=TDCGnW-x}BTu}%?m2U(q?8BOE{n`5w<0os{j}=Rk~&@W(rdTXjN4k- zx1)bm2QXlB_l7z43l!dNx{+OYDOGXX)b}?V?+Z^_+$^(nbDY<;to7#ITPrs&*S`68 zveA(?>zn@5A0O;GvZU}OkJ^lo^v^4nB+id|VWzgX>iFGF{WWHfw>^Ayy*KXo#C+{L zm$tor{io85S7Ujbkc!z4bqSB>$Cq|^%t(51V@AZz3Xe+5nb+GjGk;3V(&P%OF#oxd z)9Tc$TL(_QxK*`FD_Y8P^(yaKr*|Lcczx6Qw|2~)%&HjcoYOWjSUs_Cj{Sm$?Fx%T z@=s;GJQY=#(>S>zS5ngS*kZM`AAN-{=N7k=O^7|b_s`@l5v%5WT=rX`-|^0;n<6~o zmo%`~?v)P3>ZQ|QFWtE$w52Ou`&{{_ zxsB6SR4&YPowUeKH%co;z23m}kvZ=fOZ)1LN_vmpwcBWAt3S)Q`ItkoH%au>;ahVy zW?cUL7mTkTN<`?g}IqRLPYHHZ?K4;lk&oOULF#U1;=`;5B9XrHZ+(IM7 zXL_8xajm0r<;+hSFA_S^IW?+gSZZCJndL5(6}9VU6_@wJOotyUU)-`aT81_Up5~KDGb;24nT#MX3L}f;zj8 zo~|g~TeIM6<(!!dCBAM5zH%tha(-!5`Ol@Fesc)y6mj-YF8lMfVbRiHPSwJ$5Xp;D zOFRpsW3PWt&Dy-Jz_ij;TJU_q>@%&^PZM@kblGl>f0cIS-?Qi6)TgAc2vgzkuvqru z#*c;14{VUWPZPM zXY;ous>>NVOxZe}+fChTnWj7_G_JXtHZl7B#BROG`@ifc<;|Dw%6V{yFGEb#!Zo6` z?fJ6sjVGpmPuF0xtQ6asGIPiEr9YRw2=}y2Kn&fJVhue?*uQLBFE&+f`@8D8zZud~l~+`XCeCr56D z$vYptb*+AL_vKe?in~h{_h~D?lwPY~ zD%n)lBHDTK!P%LQb4!9X1wKe;CHu5*x@j7)e*easR`>L-CTtVGb$Hf=l8UQ(1>O7K z7aZ-s5+0`hJw&2)`mv?ok4x;B?qMO}S$X2&33kpIH&2*mR&MayP2yaWpCML z@od_2vS;t#?|*0UXwUn*;w_K9#9Lo}KieRz5qks4yXiHHst?x2YD}8{GWFUrQ;FTX zbU&Tyve2_w@i?RI@JaMzNx#A8b?-;UMN4w(P7y{Qg}g*jl5lzG}YOPwuq}#!2U198k^lUUKl-9aeA6gwPvBVOuUN zzjT_Vcz^WEskb&S+jw-L_3ymHo1d9V1sq@f?9)HPf5*$GxW6d=#&~0j#XV&2*WB52N~evddQZCbpYFHTD!NfRE7wMG>%O}abuw2+T5itXy1l-&a`M=t z^%Qcn9*N$r-m-|HFEKMMY{xAUKK1q5$+yMcSEM#t%{o{A^?3DPd$UL1-A=S^Z@;lz zmHogE;|z}S6*D@*B;Ca|g4kb*MZS={^>T*g^h4>MD`%a$Wfpad<9Ej^FYB9C(bYd) zyq0CAX>0P_`uQq5>T9;R&zV0zb#`f3*Y2|BiG3q;Yj#h~(z&^Jb>7_#<|~QA8j<@^ zy=VSU_mBsdzh_$5_BLInL-YPvZH|>TjKeCDI8E#^sl+qt#EkEs~{(AKTKoVc~Z)+{q3P2?+2@X@fM@*chK`y$hS zt?4`b{Fa$!*7d^IY5#8Pvqv1c_FOE(qg`XiiW?Q*C%12Tz9L*Rb7!mP5BJKKGk;2Q zTJ5T|sO-{Q74@TH)2U9WQ?smA2h5VN{*~p$y}RJ_jNRS0Pygn;vod=18|~X~gt3>O Ri!r=02-}a=p!O~p0{}4(QkVb$ literal 0 HcmV?d00001