From cd06b6c97deb800e12191366e643f0a615f4ebc6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 Nov 2008 23:45:11 +0000 Subject: [PATCH] --- .../lib/HydraFrontend/Controller/Root.pm | 2 +- src/HydraFrontend/lib/HydraFrontend/Schema.pm | 4 +- .../lib/HydraFrontend/Schema/Buildinputs.pm | 4 +- .../lib/HydraFrontend/Schema/Buildlogs.pm | 4 +- .../lib/HydraFrontend/Schema/Buildproducts.pm | 4 +- .../HydraFrontend/Schema/Buildresultinfo.pm | 4 +- .../lib/HydraFrontend/Schema/Builds.pm | 4 +- .../Schema/Buildschedulinginfo.pm | 4 +- .../lib/HydraFrontend/Schema/Buildsteps.pm | 4 +- .../HydraFrontend/Schema/Jobsetinputalts.pm | 4 +- .../lib/HydraFrontend/Schema/Jobsetinputs.pm | 4 +- .../lib/HydraFrontend/Schema/Jobsets.pm | 4 +- .../lib/HydraFrontend/Schema/Projects.pm | 8 +- src/HydraFrontend/root/hydra.css | 87 ++++++++++++++++++ src/HydraFrontend/root/index.tt | 11 ++- src/HydraFrontend/root/layout.tt | 47 ++++++++-- .../root/static/images/arrow-right-active.gif | Bin 0 -> 103 bytes .../root/static/images/arrow-right.gif | Bin 0 -> 100 bytes src/hydra.sql | 4 +- src/test.sql | 6 +- 20 files changed, 172 insertions(+), 37 deletions(-) create mode 100644 src/HydraFrontend/root/static/images/arrow-right-active.gif create mode 100644 src/HydraFrontend/root/static/images/arrow-right.gif diff --git a/src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm b/src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm index 21177361..58161891 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm @@ -29,7 +29,7 @@ sub getBuild { sub index :Path :Args(0) { my ( $self, $c ) = @_; $c->stash->{template} = 'index.tt'; - $c->stash->{projects} = [$c->model('DB::Projects')->all]; + $c->stash->{projects} = [$c->model('DB::Projects')->search({}, {order_by => 'displayname'})]; $c->stash->{scheduled} = [$c->model('DB::Builds')->search( {finished => 0}, {join => 'schedulingInfo'})]; # !!! $c->stash->{allBuilds} = [$c->model('DB::Builds')->search( diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema.pm b/src/HydraFrontend/lib/HydraFrontend/Schema.pm index 3f61f553..4752c1fb 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Schema.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Schema.pm @@ -8,8 +8,8 @@ use base 'DBIx::Class::Schema'; __PACKAGE__->load_classes; -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:06:06 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZbJ6NueGI5oUOzciArgKog +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:41:19 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:UDG/z2SeOSq/K7iVpzF0mw # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildinputs.pm b/src/HydraFrontend/lib/HydraFrontend/Schema/Buildinputs.pm index e1d0998a..80afec46 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildinputs.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Schema/Buildinputs.pm @@ -40,8 +40,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:06:06 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:aad+idPUM0h/+J0Hl5SdIg +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:41:19 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fClAPzHpXV7YT8eHUeU4zw # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildlogs.pm b/src/HydraFrontend/lib/HydraFrontend/Schema/Buildlogs.pm index db330ae1..9e6700ee 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildlogs.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Schema/Buildlogs.pm @@ -21,8 +21,8 @@ __PACKAGE__->set_primary_key("build", "logphase"); __PACKAGE__->belongs_to("build", "HydraFrontend::Schema::Builds", { id => "build" }); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:06:06 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:o8osOyKf+9S5A87XexVOeA +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:41:19 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:lW6yq7QOyzpa+zM/J/7VFQ # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildproducts.pm b/src/HydraFrontend/lib/HydraFrontend/Schema/Buildproducts.pm index eebec1f5..d455bc94 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildproducts.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Schema/Buildproducts.pm @@ -33,8 +33,8 @@ __PACKAGE__->set_primary_key("build", "productnr"); __PACKAGE__->belongs_to("build", "HydraFrontend::Schema::Builds", { id => "build" }); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:06:06 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:52RNu4OcP3buytGZs+cGZQ +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:41:19 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2qyh04FF7LrOgo+/Ixap2A # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildresultinfo.pm b/src/HydraFrontend/lib/HydraFrontend/Schema/Buildresultinfo.pm index a25713d8..2662fe47 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildresultinfo.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Schema/Buildresultinfo.pm @@ -25,8 +25,8 @@ __PACKAGE__->set_primary_key("id"); __PACKAGE__->belongs_to("id", "HydraFrontend::Schema::Builds", { id => "id" }); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:06:06 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+kbG4YYzbVVPWMwWTcQ32Q +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:41:19 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ko+bQKdwDzow15p/aTdgYw # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Builds.pm b/src/HydraFrontend/lib/HydraFrontend/Schema/Builds.pm index efa77b07..fe9dabe2 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Schema/Builds.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Schema/Builds.pm @@ -79,8 +79,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:06:06 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:l4QUKDHPL1mEZSlO9GgGzw +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:41:19 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9VXVDomeYpjysKc8NxWogw __PACKAGE__->has_many(dependents => 'HydraFrontend::Schema::Buildinputs', 'dependency'); diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildschedulinginfo.pm b/src/HydraFrontend/lib/HydraFrontend/Schema/Buildschedulinginfo.pm index 6dcda02a..909e337c 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildschedulinginfo.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Schema/Buildschedulinginfo.pm @@ -23,8 +23,8 @@ __PACKAGE__->set_primary_key("id"); __PACKAGE__->belongs_to("id", "HydraFrontend::Schema::Builds", { id => "id" }); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:06:06 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EDzMzfQFnkl0bAmBlh5Omw +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:41:19 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:v2j9A4bXqe96Qy1zz/C+VQ # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildsteps.pm b/src/HydraFrontend/lib/HydraFrontend/Schema/Buildsteps.pm index 1d387cb9..2f787b6b 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Schema/Buildsteps.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Schema/Buildsteps.pm @@ -35,8 +35,8 @@ __PACKAGE__->set_primary_key("id", "stepnr"); __PACKAGE__->belongs_to("id", "HydraFrontend::Schema::Builds", { id => "id" }); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:06:06 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:T25Mdcg1A77BB4gFF3LPZA +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:41:19 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tCirOuLYfhBxoEkH5HAQlQ # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputalts.pm b/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputalts.pm index 3b8edf0a..80031258 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputalts.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputalts.pm @@ -33,8 +33,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:06:06 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Qc9/eVs3wY6m9fztR3Yizg +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:41:19 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GgHinSVpD7x20xFqfvau0Q # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputs.pm b/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputs.pm index b5b5399a..409675f1 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputs.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsetinputs.pm @@ -43,8 +43,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:06:06 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:V2RU7h0eTPBUES0G306AgA +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:41:19 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:F9AunJfDCrzuCOBHjNaurw # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsets.pm b/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsets.pm index ae2a2f8a..2ffc0533 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsets.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Schema/Jobsets.pm @@ -48,8 +48,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:06:06 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TMnJfLpgUhiMkJKB8I1qqQ +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:41:19 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oQnTi5ALlqDF0gP9P/hTeg # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/HydraFrontend/lib/HydraFrontend/Schema/Projects.pm b/src/HydraFrontend/lib/HydraFrontend/Schema/Projects.pm index d72398f3..36ac294e 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Schema/Projects.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Schema/Projects.pm @@ -10,6 +10,10 @@ __PACKAGE__->table("Projects"); __PACKAGE__->add_columns( "name", { data_type => "text", is_nullable => 0, size => undef }, + "displayname", + { data_type => "text", is_nullable => 0, size => undef }, + "description", + { data_type => "VARCHAR", is_nullable => 0, size => undef }, ); __PACKAGE__->set_primary_key("name"); __PACKAGE__->has_many( @@ -24,8 +28,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:06:06 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:UEZU36sQSaNML/YCAtpGkg +# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-13 00:41:19 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:z7XJulBG7643ilgAj1hDwg # You can replace this text with custom content, and it will be preserved on regeneration diff --git a/src/HydraFrontend/root/hydra.css b/src/HydraFrontend/root/hydra.css index b4d02afe..ac6f849e 100644 --- a/src/HydraFrontend/root/hydra.css +++ b/src/HydraFrontend/root/hydra.css @@ -202,3 +202,90 @@ table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSo table.tablesorter thead tr th { padding-right: 1.5em; } + + +/* Navbar */ + +#leftnavbar { + position: absolute; + left: 0px; + width: 13em; + border-right: 1px solid gray; +} + +#content { + position: absolute; + left: 13em; + margin-left: 1em; + margin-right: 1em; +} + +h1 { + margin-top: 0em; +} + +#leftnavbar ul { + display: block; + padding: 0 0 0 0; + margin: 0 0 0 0; + margin-left: 1em; + margin-right: 1em; +} + +#leftnavbar ul a { + color: #005aa0; +} + +#leftnavbar li.section { + list-style: none; + margin: 0 0 0 0; + padding: 0 0 0 0; + margin-bottom: 1.5em; +} + +#leftnavbar li.section > div.title { + text-align: center; + font-weight: bold; + border-width: 0px; + border-bottom-width: 1px; + border-style: solid; + border-color: #c0c0c0; + padding-bottom: 0.5em; +} + +#leftnavbar li.section ul { + padding: 0 0 0 0; + margin-left: 0em; + margin-right: 0em; +} + +#leftnavbar li.section ul li { + font-size: 90%; + list-style: none; + background-image: url(/static/images/arrow-right.gif); + background-repeat: no-repeat; + background-position: 0.3em center; + border-width: 0px; + border-bottom-width: 1px; + border-style: solid; + border-color: #c0c0c0; + margin: 0 0 0 0; + padding: 0 0 0 0; + padding-top: 0.5em; + padding-bottom: 0.5em; +} + +#leftnavbar li.section ul li.active { + background-image: url(/static/images/arrow-right-active.gif); + background-color: #eef2ff; + font-weight: bold; + color: #606060; +} + +#leftnavbar li.section ul li > div.title { + margin-left: 1.3em; +} + +#footer { + font-size: 80%; +} diff --git a/src/HydraFrontend/root/index.tt b/src/HydraFrontend/root/index.tt index fb8f3200..ede9b85e 100644 --- a/src/HydraFrontend/root/index.tt +++ b/src/HydraFrontend/root/index.tt @@ -2,7 +2,10 @@ [% USE date %] -

Queue

+

Hydra Overview

+ + +

Queue

[% IF scheduled.size == 0 %] @@ -32,7 +35,7 @@ [% END %] -

Job status

+

Job status

Below are the latest builds for each job.

@@ -48,7 +51,7 @@ -

All builds

+

All builds

Number of builds: [% allBuilds.size %]

@@ -64,7 +67,7 @@ -

Projects

+

Projects