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

Move channel link to top menu of Project and Jobset.

Browse source
This commit is contained in:
Rob Vermaas 2012-04-13 10:56:02 +02:00
parent bf197f0d77
commit 11bf848b09
3 changed files with 2 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/root/jobset.tt
View file

@ -78,9 +78,6 @@
<li><a href="#tabs-jobs" data-toggle="tab">Jobs ([% activeJobs.size %])</a></li> <li><a href="#tabs-jobs" data-toggle="tab">Jobs ([% activeJobs.size %])</a></li>
[% END %] [% END %]
<li><a href="#tabs-setup" data-toggle="tab">Setup</a></li> <li><a href="#tabs-setup" data-toggle="tab">Setup</a></li>
[% IF !edit -%]
<li><a href="#tabs-channels" data-toggle="tab">Channels</a></li>
[% END %]
</ul> </ul>
<div id="generic-tabs" class="tab-content"> <div id="generic-tabs" class="tab-content">
<div id="tabs-information" class="tab-pane active"> <div id="tabs-information" class="tab-pane active">
@ -206,22 +203,6 @@
[% INCLUDE renderInputs %] [% INCLUDE renderInputs %]
</div> </div>
[% IF !edit -%] [% IF !edit -%]
<div id="tabs-channels" class="tab-pane">
<h2>Channels</h2>
<p>This jobset provides the following Nix channel:</p>
<ul>
<li>
<a href="[% c.uri_for('/jobset' project.name jobset.name 'channel'
'latest') %]"><tt>latest</tt></a> — contains the latest successful
build of every job in this jobset.
</li>
</ul>
</div>
<div id="tabs-jobs" class="tab-pane"> <div id="tabs-jobs" class="tab-pane">
<h2>Jobs</h2> <h2>Jobs</h2>

15
src/root/project.tt
View file

@ -7,7 +7,6 @@
<li><a href="#tabs-settings" data-toggle="tab">Settings</a></li> <li><a href="#tabs-settings" data-toggle="tab">Settings</a></li>
[% IF !edit %] [% IF !edit %]
<li><a href="#tabs-views" data-toggle="tab">Views</a></li> <li><a href="#tabs-views" data-toggle="tab">Views</a></li>
<li><a href="#tabs-channels" data-toggle="tab">Channels</a></li>
[% END %] [% END %]
</ul> </ul>
@ -200,20 +199,6 @@
<p><a href="[% c.uri_for('/project' project.name 'create-view') %]">[Create a new view]</a></p> <p><a href="[% c.uri_for('/project' project.name 'create-view') %]">[Create a new view]</a></p>
</div> </div>
<div id="tabs-channels" class="tab-pane">
<h2>Channels</h2>
<p>This project provides the following Nix channel:</p>
<ul>
<li>
<a href="[% c.uri_for('/project' project.name 'channel' 'latest') %]"><tt>latest</tt></a> —
contains the latest successful build of every job in this project.
</li>
</ul>
</div>
[% END %] [% END %]
</div> </div>

2
src/root/topbar.tt
View file

@ -48,6 +48,7 @@
[% 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('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('jobstatus'), [project.name]) title = "Job status" %]
[% INCLUDE menuItem 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('errors'), [project.name]) title = "Errors" %]
[% INCLUDE menuItem uri = c.uri_for('/project' project.name 'channel' 'latest') title = "Channel (latest)" %]
[% IF c.check_user_roles('admin') %] [% IF c.check_user_roles('admin') %]
<li class="divider"></li> <li class="divider"></li>
[% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('create_jobset'), [project.name]) title = "Create new jobset" %] [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('create_jobset'), [project.name]) title = "Create new jobset" %]
@ -74,6 +75,7 @@
[% INCLUDE makeLink [% INCLUDE makeLink
uri = c.uri_for(c.controller('Jobset').action_for('errors'), [project.name, jobset.name]) uri = c.uri_for(c.controller('Jobset').action_for('errors'), [project.name, jobset.name])
title = "Errors" %] title = "Errors" %]
[% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'channel' 'latest') title = "Channel (latest)" %]
[% IF c.check_user_roles('admin') %] [% IF c.check_user_roles('admin') %]
<li class="divider"></li> <li class="divider"></li>
[% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'edit') title="Edit jobset" %] [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'edit') title="Edit jobset" %]