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

Fix indentation

Browse source 
Also move flashing into layout.tt.
This commit is contained in:
Eelco Dolstra 2013-02-20 16:14:30 +01:00
parent ea9862fdc1
commit c63812afa5
5 changed files with 62 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/root/build.tt
View file

@ -63,10 +63,6 @@
[% END %] [% END %]
[% IF flashMsg %]
<p class="btn-info btn-large">[% flashMsg %]</p>
[% END %]
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#tabs-summary" data-toggle="tab">Summary</a></li> <li class="active"><a href="#tabs-summary" data-toggle="tab">Summary</a></li>
<li><a href="#tabs-information" data-toggle="tab">Details</a></li> <li><a href="#tabs-information" data-toggle="tab">Details</a></li>

10
src/root/layout.tt
View file

@ -104,6 +104,16 @@
<div class="container"> <div class="container">
[% IF flashMsg %]
<br />
<p class="btn-info btn-large">[% flashMsg %]</p>
[% END %]
[% IF errorMsg %]
<br />
<p class="btn-warning btn-large">Error: [% errorMsg %]</p>
[% END %]
[% IF !hideHeader %] [% IF !hideHeader %]
<div class="page-header"> <div class="page-header">
<h1><small>[% HTML.escape(title) %]</small></h1> <h1><small>[% HTML.escape(title) %]</small></h1>

4
src/root/login.tt
View file

@ -1,10 +1,6 @@
[% WRAPPER layout.tt title="Sign in" %] [% WRAPPER layout.tt title="Sign in" %]
[% PROCESS common.tt %] [% PROCESS common.tt %]
[% IF errorMsg %]
<p class="btn-warning btn-large">Error: [% errorMsg %]</p>
[% END %]
[% IF c.user_exists %] [% IF c.user_exists %]
<p class="btn-info btn-large"> <p class="btn-info btn-large">
You are already logged in as <tt>[% c.user.username %]</tt>. You are already logged in as <tt>[% c.user.username %]</tt>.

4
src/root/queue.tt
View file

@ -3,10 +3,6 @@
<p><a class="btn" href="[% c.uri_for('/status') %]">Running build steps</a></p> <p><a class="btn" href="[% c.uri_for('/status') %]">Running build steps</a></p>
[% IF flashMsg %]
<p class="btn-info btn-large">[% flashMsg %]</p>
[% END %]
[% IF queue.size == 0 %] [% IF queue.size == 0 %]
<p>The queue is empty.</p> <p>The queue is empty.</p>

127
src/root/topbar.tt
View file

@ -4,10 +4,6 @@
</li> </li>
[% END %] [% END %]
[% BLOCK makeLink %]
[% INCLUDE makeLinkWrapped content="" %]
[% END %]
[% BLOCK makeSubMenu %] [% BLOCK makeSubMenu %]
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" href="#" data-toggle="dropdown">[% title %]<b class="caret"></b></a> <a class="dropdown-toggle" href="#" data-toggle="dropdown">[% title %]<b class="caret"></b></a>
@ -17,7 +13,6 @@
</li> </li>
[% END %] [% END %]
[% BLOCK makeLinkWrapped %] [% BLOCK makeLinkWrapped %]
<li [% IF curUri == uri %]class="active"[% END %]> <li [% IF curUri == uri %]class="active"[% END %]>
<a href="[% uri %]">[% title %]</a> <a href="[% uri %]">[% title %]</a>
@ -29,16 +24,13 @@
[% INCLUDE makeLinkWrapped content="" %] [% INCLUDE makeLinkWrapped content="" %]
[% END %] [% END %]
<ul class="nav" id="top-menu">
<ul class="nav" id="top-menu"> [% INCLUDE makeLink
[% INCLUDE makeLink uri = c.uri_for(c.controller('Root').action_for('queue'))
uri = c.uri_for(c.controller('Root').action_for('queue')) title = "Queue ("_ nrRunningBuilds _"/"_ nrQueuedBuilds _")" %]
title = "Queue ("_ nrRunningBuilds _"/"_ nrQueuedBuilds _")" %] [% INCLUDE makeLink
[% INCLUDE makeLink uri = c.uri_for(c.controller('Root').action_for('all'))
uri = c.uri_for(c.controller('Root').action_for('all')) title = "All builds" %]
title = "All builds" %]
[% IF project || admin %]
[% IF project %] [% IF project %]
[% WRAPPER makeSubMenu title=("Project: " _ project.name) collapsed=(jobset || job) %] [% WRAPPER makeSubMenu title=("Project: " _ project.name) collapsed=(jobset || job) %]
@ -50,19 +42,18 @@
[% 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('releases'), [project.name]) title = "Releases" %]
[% INCLUDE menuItem uri = c.uri_for('/project' project.name 'channel' 'latest') title = "Channel (latest)" %] [% INCLUDE menuItem uri = c.uri_for('/project' project.name 'channel' 'latest') title = "Channel (latest)" %]
[% IF c.user_exists %] [% IF c.user_exists %]
<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" %]
[% INCLUDE menuItem uri = c.uri_for('/project' project.name 'edit') title="Edit project" %] [% INCLUDE menuItem uri = c.uri_for('/project' project.name 'edit') title="Edit project" %]
[% IF project.hidden %] [% IF project.hidden %]
[% INCLUDE menuItem uri = c.uri_for('/project' project.name 'unhide') title = "Unhide" %] [% INCLUDE menuItem uri = c.uri_for('/project' project.name 'unhide') title = "Unhide" %]
[% ELSE %] [% ELSE %]
[% INCLUDE menuItem uri = c.uri_for('/project' project.name 'hide') title = "Hide" %] [% INCLUDE menuItem uri = c.uri_for('/project' project.name 'hide') title = "Hide" %]
[% END %] [% END %]
[% END %] [% END %]
[% END %] [% END %]
[% END %] [% END %]
[% IF jobset %] [% IF jobset %]
[% WRAPPER makeSubMenu title=("Jobset: " _ jobset.name) collapsed=job %] [% WRAPPER makeSubMenu title=("Jobset: " _ jobset.name) collapsed=job %]
[% INCLUDE makeLink [% INCLUDE makeLink
@ -83,22 +74,19 @@
<li class="divider"></li> <li class="divider"></li>
[% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'channel' 'latest') title = "Channel (latest)" %] [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'channel' 'latest') title = "Channel (latest)" %]
[% IF c.user_exists %] [% IF c.user_exists %]
<li class="divider"></li> <li class="divider"></li>
[% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'clone') title="Clone jobset" %] [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'clone') title="Clone jobset" %]
[% 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" %]
[% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('force_eval'), project.name, jobset.name) content = "Evaluate" confirmmsg = ("Are you sure you want to force evaluation of jobset " _ project.name _ ":" _ jobset.name _ "?") class = "" %] [% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('force_eval'), project.name, jobset.name) content = "Evaluate" confirmmsg = ("Are you sure you want to force evaluation of jobset " _ project.name _ ":" _ jobset.name _ "?") class = "" %]
[% IF jobset.hidden %] [% IF jobset.hidden %]
[% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'unhide') title = "Unhide" %] [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'unhide') title = "Unhide" %]
[% ELSE %] [% ELSE %]
[% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'hide') title = "Hide" %] [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'hide') title = "Hide" %]
[% END %] [% END %]
[% END %] [% END %]
[% END %] [% END %]
[% END %] [% END %]
[% IF job %] [% IF job %]
[% WRAPPER makeSubMenu title=("Job: " _ job.name) %] [% WRAPPER makeSubMenu title=("Job: " _ job.name) %]
[% INCLUDE makeLink [% INCLUDE makeLink
@ -113,48 +101,45 @@
[% INCLUDE makeLink [% INCLUDE makeLink
uri = c.uri_for(c.controller('Job').action_for('errors'), [project.name, jobset.name, job.name]) uri = c.uri_for(c.controller('Job').action_for('errors'), [project.name, jobset.name, job.name])
title = "Errors" %] title = "Errors" %]
<li>[% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('users')) content = "Manage users" class = "" %]</li>
<li>[% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('news')) content = "Manage news" class = "" %]</li>
[% END %] [% END %]
[% END %] [% END %]
[% END %] [% IF build %]
[% IF build %]
[% WRAPPER makeSubMenu title=("Build: " _ build.id) %] [% WRAPPER makeSubMenu title=("Build: " _ build.id) %]
[% INCLUDE makeLink [% INCLUDE makeLink
uri = c.uri_for('/build' build.id) uri = c.uri_for('/build' build.id)
title = "Overview" %] title = "Overview" %]
[% IF c.user_exists %] [% IF c.user_exists %]
<li class="divider"></li> <li class="divider"></li>
[% INCLUDE makeLink [% INCLUDE makeLink
uri = c.uri_for('/build' build.id 'clone') uri = c.uri_for('/build' build.id 'clone')
title = "Clone build" %] title = "Clone build" %]
[% IF !available %] [% IF available %]
[% ELSIF build.keep %] [% IF build.keep %]
[% INCLUDE makeLink [% INCLUDE makeLink
uri = c.uri_for('/build' build.id 'keep' 0) uri = c.uri_for('/build' build.id 'keep' 0)
title = "Unkeep build" %] title = "Unkeep build" %]
[% ELSE %] [% ELSE %]
[% INCLUDE makeLink [% INCLUDE makeLink
uri = c.uri_for('/build' build.id 'keep' 1) uri = c.uri_for('/build' build.id 'keep' 1)
title = "Keep build" %] title = "Keep build" %]
[% END %] [% END %]
[% END %]
[% IF build.finished %]
[% INCLUDE makeLink [% INCLUDE makeLink
uri = c.uri_for('/build' build.id 'restart') uri = c.uri_for('/build' build.id 'restart')
title = "Restart build" %] title = "Restart build" %]
[% END %]
[% IF !build.finished %]
[% INCLUDE makeLink [% INCLUDE makeLink
uri = c.uri_for('/build' build.id 'cancel') uri = c.uri_for('/build' build.id 'cancel')
title = "Cancel build" %] title = "Cancel build" %]
[% END %]
[% END %] [% END %]
[% END %] [% END %]
[% END %]
[% END %] [% IF c.user_exists && c.check_user_roles('admin') %]
[% IF c.user_exists %]
[% IF c.check_user_roles('admin') %]
[% WRAPPER makeSubMenu title="Admin" %] [% WRAPPER makeSubMenu title="Admin" %]
[% INCLUDE makeLink [% INCLUDE makeLink
uri = c.uri_for(c.controller('Admin').action_for('index')) uri = c.uri_for(c.controller('Admin').action_for('index'))
@ -179,26 +164,18 @@
uri = c.uri_for(c.controller('Admin').action_for('clear_queue_non_current')) uri = c.uri_for(c.controller('Admin').action_for('clear_queue_non_current'))
content = "Clear all non-running old builds from queue" content = "Clear all non-running old builds from queue"
confirmmsg = "Are you sure you want to clear the queue?" confirmmsg = "Are you sure you want to clear the queue?"
class = "" class = "" %]
%]
<li class="divider"></li> <li class="divider"></li>
[% IF c.check_user_roles('admin') %] [% IF c.check_user_roles('admin') %]
[% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('create')) title = "Create new project" %] [% INCLUDE menuItem uri = c.uri_for(c.controller('Project').action_for('create')) title = "Create new project" %]
[% END %] [% END %]
[% END %] [% END %]
[% END %]
[% END %] [% END %]
[% IF c.user_exists %] [% IF c.user_exists %]
[% INCLUDE makeLink [% INCLUDE makeLink uri = c.uri_for(c.controller('Root').action_for('logout')) title = "Sign out" %]
uri = c.uri_for(c.controller('Root').action_for('logout')) [% ELSE %]
title = "Sign out" %] [% INCLUDE makeLink uri = c.uri_for(c.controller('Root').action_for('login')) title = "Sign in" %]
[% ELSE %] [% END %]
[% INCLUDE makeLink
uri = c.uri_for(c.controller('Root').action_for('login'))
title = "Sign in" %]
[% END %]
</ul> </ul>