make logo configurable via HYDRA_LOGO env var

[?]

Apr 18, 2011, 8:21 AM

HRAFVVOEGQJQS4XQNZSMNYN2SUZGKEGPSJUDZUBMI2IN32WFNQ4QC

Dependencies

[2] GN3JXNQS
[3] MVB7RRLT * Move NARs from the NixChannel controller to the Root controller and
[4] K42RSSSI
[5] SMCOU72F hydra: add some admin for adding/enabling/etc build machines
[6] ZI535LI6 * hydra: 'new' UI for project/jobset/job/build
[7] BA46C5LN * Pretty-print the logs.
[8] GCHNNFZP
[9] ODNCGFQ5 * Improved the navigation bar: don't include all projects (since that
[10] T2232OBS * Add some DB indices to make the /releases page much faster.
[11] LP66DSH2 * hydra: updated jquery version, needed for tabs (to be added later)
[12] EFWN7JBV * Added a status page that shows all the currently executing build steps.
[13] YJAHR4FU * jQuery 1.8.4.
[14] 4JPNFWRB * Use jquery for the logfile manipulation.
[15] J5UVLXOK * Start of a basic Catalyst web interface.
[16] NDL67SQT * XHTML validity.
[17] HJLYC753 * Adding input value alternatives.
[18] FKK2ZSTL * Split the CSS.
[19] QL55ECJ6 - adapted ui for hydra, more in line with nixos.org website
[20] TQKGQ5R3
[21] UVMFS73T * Some jQuery / CSS hackery.
[22] F2YSY4BK update jquery versions in templates
[23] YTSIRIMK * Separate job status and all builds pages.
[24] QB3LWT7N * Ouch.
[25] 6KJXJB7N qualify ordery_by clauses when necessary, remove unnecessary order_by's, reported by Ludo, resulted in errors in sqlite

Change contents

replacement in src/lib/Hydra/Controller/Root.pm at line 20

[6.134]→[6.134:135](∅→∅)

[6.134]

[4.0]

$c->stash->{logo} = $ENV{"HYDRA_LOGO"} ? "/logo" : "/static/images/hydra.png" ;
replacement in src/lib/Hydra/Controller/Root.pm at line 22

[4.54]→[6.184:368](∅→∅),[6.184]→[6.184:368](∅→∅)

$c->stash->{nrRunningBuilds} = $c->model('DB::BuildSchedulingInfo')->search({ busy => 1 }, {})->count();
$c->stash->{nrQueuedBuilds} = $c->model('DB::BuildSchedulingInfo')->count();

[4.54]

[6.368]

$c->stash->{nrRunningBuilds} = $c->model('DB::BuildSchedulingInfo')->search({ busy => 1 }, {})->count();
$c->stash->{nrQueuedBuilds} = $c->model('DB::BuildSchedulingInfo')->count();
edit in src/lib/Hydra/Controller/Root.pm at line 227

[3.685]

[6.2638]

sub logo :Local {
my ($self, $c) = @_;
my $path = $ENV{"HYDRA_LOGO"} or die("Logo not set!");
$c->serve_static_file($path);
}
replacement in src/root/layout.tt at line 10

[6.11455]→[6.11455:11458](∅→∅)

[6.11455]

[6.11458]
replacement in src/root/layout.tt at line 18

[6.384]→[6.114:207](∅→∅),[6.207]→[5.11898:12001](∅→∅)

<script type="text/javascript" src="/static/js/jquery/js/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="/static/js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>

[6.384]

[6.1805]

<script type="text/javascript" src="/static/js/jquery/js/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="/static/js/jquery/js/jquery-ui-1.8.5.custom.min.js"></script>
replacement in src/root/layout.tt at line 21

[6.1901]→[6.0:5](∅→∅)

[6.1901]

[6.1901]
replacement in src/root/layout.tt at line 26

[2.38]→[2.38:49](∅→∅)

[2.38]

[6.6]
replacement in src/root/layout.tt at line 29

[2.51]→[2.51:62](∅→∅)

[2.51]

[2.62]
replacement in src/root/layout.tt at line 72

[6.2072]→[6.1458:1463](∅→∅)

[6.2072]

[6.11562]
replacement in src/root/layout.tt at line 74

[6.11572]→[6.11572:11575](∅→∅)

[6.11572]

[6.11575]
replacement in src/root/layout.tt at line 76

[6.11584]→[6.1910:2119](∅→∅)

<div id="page">

<div id="header">
<div id="logo"><a class="no-hover" href="/"><img src="/static/images/hydra.png" alt="Hydra Logo" /></a></div>
[% PROCESS topbar.tt %]

[6.11584]

[6.2119]

<div id="page">

<div id="header">
<div id="logo"><a class="no-hover" href="/"><img src="[% logo %]" alt="Hydra Logo" /></a></div>
[% PROCESS topbar.tt %]
replacement in src/root/layout.tt at line 83

[6.4743]→[6.2158:2221](∅→∅)

<div id="main">
[% PROCESS navbar.tt %]

[6.4743]

[6.4743]

<div id="main">
[% PROCESS navbar.tt %]