From 67f468e0a3155ec4b9b21977d7300b1b7a16c39f Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 7 Jan 2010 14:25:12 +0000 Subject: [PATCH] - adapted ui for hydra, more in line with nixos.org website --- src/lib/Hydra/Base/Controller/ListBuilds.pm | 2 +- src/root/all.tt | 11 +- src/root/common.tt | 9 +- src/root/contextbar.tt | 40 +++++ src/root/job.tt | 6 +- src/root/jobset.tt | 5 +- src/root/layout.tt | 35 ++-- src/root/navbar.tt | 92 +++-------- src/root/overview.tt | 8 + src/root/static/css/hydra.css | 3 +- src/root/static/css/nixos-site.css | 170 ++++++++++++++++++++ src/root/topbar.tt | 47 ++++++ 12 files changed, 331 insertions(+), 97 deletions(-) create mode 100644 src/root/contextbar.tt create mode 100644 src/root/static/css/nixos-site.css create mode 100644 src/root/topbar.tt diff --git a/src/lib/Hydra/Base/Controller/ListBuilds.pm b/src/lib/Hydra/Base/Controller/ListBuilds.pm index f554803e..2845ee23 100644 --- a/src/lib/Hydra/Base/Controller/ListBuilds.pm +++ b/src/lib/Hydra/Base/Controller/ListBuilds.pm @@ -53,7 +53,7 @@ sub all : Chained('get_builds') PathPart { my $page = int($c->req->param('page')) || 1; - my $resultsPerPage = 50; + my $resultsPerPage = 20; my $nrBuilds = scalar($c->stash->{allBuilds}->search({finished => 1})); diff --git a/src/root/all.tt b/src/root/all.tt index bf786c14..4503facc 100644 --- a/src/root/all.tt +++ b/src/root/all.tt @@ -9,8 +9,7 @@

Showing builds [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + builds.size %] out of [% totalBuilds %] in order of descending timestamp.

-[% INCLUDE renderBuildList %] - +[% BLOCK renderNav %]

[First] [% IF page > 1 %] @@ -21,5 +20,13 @@ out of [% totalBuilds %] in order of descending timestamp.

[% END %] [Last]

+[% END %] + + +[% INCLUDE renderNav %] +[% INCLUDE renderBuildList %] +[% INCLUDE renderNav %] + + [% END %] diff --git a/src/root/common.tt b/src/root/common.tt index bbe0d41e..ea967b5c 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -68,7 +68,7 @@ [% END %] # [% IF showSchedulingInfo %] - Priority + P [% END %] Job Release Name @@ -77,7 +77,9 @@ [% IF showStatusChange %] Last status change [% END %] - Description + [% IF showDescription %] + Description + [% END %] @@ -120,13 +122,16 @@ [% END %] [% END %] + [% IF showDescription %] [% build.description %] + [% END -%] [% END -%] [% END %] +[% BLOCK renderLink %][% title %][% END %] [% BLOCK showBuildStats %] diff --git a/src/root/contextbar.tt b/src/root/contextbar.tt new file mode 100644 index 00000000..f73f4cc8 --- /dev/null +++ b/src/root/contextbar.tt @@ -0,0 +1,40 @@ +[% BLOCK makeLinkWrapped %] +
  • + [% title %] + [% content %] +
    • +[% END %] + +[% BLOCK makeLink -%] +[% INCLUDE makeLinkWrapped content="" -%] +[% END %] + +[% BLOCK makeSubMenu %] + +[% END %] + + + +[% IF project %] +[% WRAPPER makeSubMenu %] + [% INCLUDE makeLink + uri = c.uri_for(c.controller('Project').action_for('view'), [project.name]) + title = project.name %] + + [% IF jobset %] + [% INCLUDE makeLink + uri = c.uri_for(c.controller('Jobset').action_for('index'), [project.name, jobset.name]) + title = jobset.name %] + [% END %] + + [% IF job %] + [% INCLUDE makeLink + uri = c.uri_for(c.controller('Job').action_for('index'), [project.name, jobset.name, job.name]) + title = job.name %] + + [% END %] +[% END %] +[% END %] + diff --git a/src/root/job.tt b/src/root/job.tt index 2a34d147..7530c921 100644 --- a/src/root/job.tt +++ b/src/root/job.tt @@ -2,7 +2,11 @@ [% PROCESS common.tt %] -

    Job [% project.name %]:[% jobset.name %]:[% job.name %]

    +

    Job [% INCLUDE renderLink + uri = c.uri_for(c.controller('Project').action_for('view'), [project.name]) + title = project.name %]:[% INCLUDE renderLink + uri = c.uri_for(c.controller('Jobset').action_for('index'), [project.name, jobset.name]) + title = jobset.name %]:[% job.name %]

    Channels

    diff --git a/src/root/jobset.tt b/src/root/jobset.tt index 69097b24..341c0a32 100644 --- a/src/root/jobset.tt +++ b/src/root/jobset.tt @@ -1,7 +1,6 @@ [% WRAPPER layout.tt title=(edit ? (create ? "New Jobset in Project ‘$project.name’" : "Editing Jobset ‘$project.name:$jobset.name’") : "Jobset ‘$project.name:$jobset.name’") %] [% PROCESS common.tt %] - [% IF edit %]
    [% END %] @@ -10,7 +9,9 @@ [% IF create %]

    New Jobset in Project [% project.name %]

    [% ELSE %] -

    Jobset [% project.name %]:[% jobset.name %]

    +

    Jobset [% INCLUDE renderLink + uri = c.uri_for(c.controller('Project').action_for('view'), [project.name]) + title = project.name %]:[% jobset.name %]

    [% END %] diff --git a/src/root/layout.tt b/src/root/layout.tt index 4a9beef8..da70b7c4 100644 --- a/src/root/layout.tt +++ b/src/root/layout.tt @@ -11,8 +11,8 @@ Hydra - [% title %] - + @@ -71,24 +71,29 @@ -
    - -
    - +
    + + +
    [% PROCESS navbar.tt %] -
    -
    - [% content %] - + diff --git a/src/root/navbar.tt b/src/root/navbar.tt index 18f140ed..cb91dd5e 100644 --- a/src/root/navbar.tt +++ b/src/root/navbar.tt @@ -5,61 +5,36 @@ [% END %] + +[% BLOCK menuItem %] +
  • + [% title %] +
    • +[% END %] + [% BLOCK makeLink -%] [% INCLUDE makeLinkWrapped content="" -%] [% END %] [% BLOCK makeSubMenu %] [% extra = collapsed ? "collapsed" : "" %] -
  • -
    -
      +
      [% title %]
      +
        [% content %] -
      - +
    [% END %] +[% IF project %] -
      - - - [% WRAPPER makeSubMenu title="Hydra" collapsed=0 %] - [% INCLUDE makeLink - uri = c.uri_for(c.controller('Root').action_for('index')) - title = "Overview" %] - [% INCLUDE makeLink - uri = c.uri_for(c.controller('Root').action_for('queue')) - title = "Queue" %] - [% INCLUDE makeLink - uri = c.uri_for(c.controller('Root').action_for('all')) - title = "All builds" %] - [% INCLUDE makeLink - uri = c.uri_for(c.controller('Root').action_for('jobstatus')) - title = "Job status" %] - [% INCLUDE makeLink - uri = c.uri_for(c.controller('Root').action_for('errors')) - title = "Errors" %] - [% END %] - +
      [% IF project %] [% WRAPPER makeSubMenu title="Project" collapsed=(jobset || job) %] - [% INCLUDE makeLink - uri = c.uri_for(c.controller('Project').action_for('view'), [project.name]) - title = "Overview" %] - [% INCLUDE makeLink - uri = c.uri_for(c.controller('Project').action_for('releases'), [project.name]) - title = "Releases" %] - [% INCLUDE makeLink - uri = c.uri_for(c.controller('Project').action_for('all'), [project.name]) - title = "All builds" %] - [% INCLUDE makeLink - uri = c.uri_for(c.controller('Project').action_for('jobstatus'), [project.name]) - title = "Job status" %] - [% INCLUDE makeLink - uri = c.uri_for(c.controller('Project').action_for('errors'), [project.name]) - title = "Errors" %] + [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('view'), [project.name]) title = "Overview" %] + [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('releases'), [project.name]) title = "Releases" %] + [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('all'), [project.name]) title = "All builds" %] + [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('jobstatus'), [project.name]) title = "Job status" %] + [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('errors'), [project.name]) title = "Errors" %] [% END %] [% END %] @@ -99,36 +74,7 @@ [% END %] [% END %] - - [% WRAPPER makeSubMenu title="Admin" collapsed=0 %] - [% IF c.user_exists %] - [% INCLUDE makeLink - uri = c.uri_for(c.controller('Root').action_for('logout')) - title = "Logout" %] - [% ELSE %] - [% INCLUDE makeLink - uri = c.uri_for(c.controller('Root').action_for('login')) - title = "Login" %] - [% END %] - [% INCLUDE makeLink - uri = c.uri_for(c.controller('Project').action_for('create')) - title = "Create project" %] - [% END %] +
      +[% END %] -
    - - - diff --git a/src/root/overview.tt b/src/root/overview.tt index c6feda2d..7a4b234b 100644 --- a/src/root/overview.tt +++ b/src/root/overview.tt @@ -34,6 +34,14 @@ href="http://nixos.org/hydra">[Read more...]

    +[% IF c.user_exists %] +

    + [ [% INCLUDE maybeLink + uri = c.uri_for(c.controller('Project').action_for('create')) + content = "Create project" %] ] +

    +[% END %] +

    Channels

    diff --git a/src/root/static/css/hydra.css b/src/root/static/css/hydra.css index 9d5c10db..af543c21 100644 --- a/src/root/static/css/hydra.css +++ b/src/root/static/css/hydra.css @@ -1,5 +1,5 @@ #logo img { - width: 11em; + width: 8em; } tr.clickable:hover { @@ -154,3 +154,4 @@ button { form.inline { display: inline; } + diff --git a/src/root/static/css/nixos-site.css b/src/root/static/css/nixos-site.css new file mode 100644 index 00000000..dcebca4f --- /dev/null +++ b/src/root/static/css/nixos-site.css @@ -0,0 +1,170 @@ +body { + background-color: gray; + margin: 0; +} + +/* The main container element. */ +div#page { + max-width: 80em; + min-width: 50em; + min-height: 20em; + 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. */ +div#header { + border-bottom: 1px solid black; + position: relative; + padding-bottom: 1em; +} + +div#logo { + display: inline; +} + +ul#top-menu { + top: 0em; +} + +ul#context-menu { + bottom: 1em; +} + + +/* The footer. */ +div#footer { + margin-top: 1em; + border-top: 1px solid black; + position: relative; +} + +div#last-modified { + font-size: 80%; + font-style: italic; +} + +ul#bottom-menu { + bottom: 0em; +} + +/* The top and bottom menus. */ +ul.short-menu { + display: block; + position: absolute; + right: 0em; + margin: 0; + padding: 0; +} + +ul.short-menu li { + display: inline; + + /* Put a ">" in front of the menu item. */ + margin-left: 0.5em; + padding-left: 1.3em; + padding-top: 0.5em; + padding-bottom: 0.5em; + background-image: url(../images/arrow-right.gif); + background-repeat: no-repeat; + background-position: 0.3em center; +} + +ul.short-menu li a { + color: black; + text-decoration: none; +} + +ul.short-menu li a:hover { + text-decoration: none; + border-bottom: 1px dotted black; + background: white; +} + +/* The left menu. */ +div#main { + position: relative; + min-height: 10em; +} + +div#left-bar { + position: absolute; + left: 0em; + width: 8em; + min-height: 10em; +} + +div#left-title { + font-weight: bold; + padding-bottom: 0.5em; + margin-bottom: 0.5em; + border-bottom: 1px dotted black; +} + +ul#left-menu { + padding: 0 0 0 0; + margin: 0 0 0 0; +} + +ul#left-menu li { + font-size: 90%; + list-style: none; + padding-left: 1.3em; + margin-bottom: 0.5em; +} + +ul#left-menu li { + background-image: url(../images/arrow-right.gif); + background-repeat: no-repeat; + background-position: 0 center; +} + +ul#left-menu li.active { + background-image: url(../images/arrow-right-active.gif); + background-color: #eef2ff; + font-weight: bold; + color: #606060; +} + +/* The content. */ +div#left-bar + div#content { + margin-left: 9em; +} + +/* Inline (floating) images. */ +img.inline, img.inlineNoBorder { + float: right; + margin-left: 1em; + margin-bottom: 1em; +} + +/* Release tables. */ +.reldate { + font-style: italic; +} + +table.releases td { + border: 0px; +} + +/* Screenshot table. */ +table.screenshots { + border-style: hidden; +} + +table.screenshots td { + vertical-align: middle; + padding-top: 0.5em; + padding-bottom: 0.5em; + border: 0px; + border-bottom: 1px dotted black; +} diff --git a/src/root/topbar.tt b/src/root/topbar.tt new file mode 100644 index 00000000..c1d4e0f3 --- /dev/null +++ b/src/root/topbar.tt @@ -0,0 +1,47 @@ +[% BLOCK makeLinkWrapped %] +
  • + [% title %] + [% content %] +
    • +[% END %] + +[% BLOCK makeLink -%] +[% INCLUDE makeLinkWrapped content="" -%] +[% END %] + +[% BLOCK makeSubMenu %] +
      + [% content %] +
    + +[% END %] + + + [% WRAPPER makeSubMenu title="Hydra" %] + [% INCLUDE makeLink + uri = c.uri_for(c.controller('Root').action_for('index')) + title = "Overview" %] + [% INCLUDE makeLink + uri = c.uri_for(c.controller('Root').action_for('queue')) + title = "Queue" %] + [% INCLUDE makeLink + uri = c.uri_for(c.controller('Root').action_for('all')) + title = "All builds" %] + [% INCLUDE makeLink + uri = c.uri_for(c.controller('Root').action_for('jobstatus')) + title = "Job status" %] + [% INCLUDE makeLink + uri = c.uri_for(c.controller('Root').action_for('errors')) + title = "Errors" %] + [% IF c.user_exists %] + [% INCLUDE makeLink + uri = c.uri_for(c.controller('Root').action_for('logout')) + title = "Sign out" %] + [% ELSE %] + [% INCLUDE makeLink + uri = c.uri_for(c.controller('Root').action_for('login')) + title = "Sign in" %] + [% END %] + [% END %] + +