ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Remove default logo, replaced by text for now. Hide template in jobset edit.

Browse source
This commit is contained in:
Rob Vermaas 2012-04-13 11:47:05 +02:00
parent f63e9a63b4
commit bb4f470348
5 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/Hydra/Controller/Jobset.pm
View file

@ -59,7 +59,7 @@ sub jobsetIndex {
, "(select count(*) from JobsetEvalMembers where eval = me.id and exists(select 1 from Builds b where b.id = build and b.finished = 1 and b.buildStatus = 0))" , "(select count(*) from JobsetEvalMembers where eval = me.id and exists(select 1 from Builds b where b.id = build and b.finished = 1 and b.buildStatus = 0))"
] ]
, '+as' => [ "nrBuilds", "nrScheduled", "nrFinished", "nrSucceeded" ] , '+as' => [ "nrBuilds", "nrScheduled", "nrFinished", "nrSucceeded" ]
, rows => 5 , rows => 6
} }
) ]; ) ];

2
src/lib/Hydra/Controller/Root.pm
View file

@ -18,7 +18,7 @@ sub begin :Private {
$c->stash->{version} = $ENV{"HYDRA_RELEASE"} || "<devel>"; $c->stash->{version} = $ENV{"HYDRA_RELEASE"} || "<devel>";
$c->stash->{nixVersion} = $ENV{"NIX_RELEASE"} || "<devel>"; $c->stash->{nixVersion} = $ENV{"NIX_RELEASE"} || "<devel>";
$c->stash->{curTime} = time; $c->stash->{curTime} = time;
$c->stash->{logo} = $ENV{"HYDRA_LOGO"} ? "/logo" : "/static/images/nixos-logo-only-hires.png" ; $c->stash->{logo} = $ENV{"HYDRA_LOGO"} ? "/logo" : "";
$c->stash->{tracker} = $ENV{"HYDRA_TRACKER"} ; $c->stash->{tracker} = $ENV{"HYDRA_TRACKER"} ;
if (scalar(@args) == 0 || $args[0] ne "static") { if (scalar(@args) == 0 || $args[0] ne "static") {

15
src/root/jobset.tt
View file

@ -90,14 +90,15 @@
}); });
</script> </script>
[% END %] [% END %]
<h2>Most recent evaluations</h2> [% IF !edit-%]
[% INCLUDE renderEvals nrShown=5 %] <h2>Most recent evaluations</h2>
[% INCLUDE renderEvals nrShown=5 %]
<a href="c.uri_for(c.controller('Jobset').action_for('evals'), [project.name, jobset.name])" class="btn">All evaluations</a> <a href="[% c.uri_for(c.controller('Jobset').action_for('evals'), [project.name, jobset.name]) %]" class="btn">All evaluations</a>
<br /> <br />
<br /> <br />
[% END %]
[% IF !edit && activeJobsStatus -%] [% IF !edit && activeJobsStatus -%]
<h2>Status</h2> <h2>Status</h2>
<table class="table table-striped table-condensed"> <table class="table table-striped table-condensed">

8
src/root/layout.tt
View file

@ -90,7 +90,13 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="[% c.uri_for(c.controller('Root').action_for('index')) %]"><img src="[% logo %]" alt="Hydra Logo" class="logo" /></a> <a class="brand" href="[% c.uri_for(c.controller('Root').action_for('index')) %]">
[% IF logo == "" %]
Hydra
[% ELSE %]
<img src="[% logo %]" alt="Hydra Logo" class="logo" />
[% END %]
</a>
<div class="nav-collapse"> <div class="nav-collapse">
[% PROCESS topbar.tt %] [% PROCESS topbar.tt %]
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->

4
src/root/static/css/hydra.css
View file

@ -12,3 +12,7 @@ th {
text-align: left; text-align: left;
vertical-align: top; vertical-align: top;
} }
.template {
display: none;
}