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

Split viewing and editing a project

Browse source
This commit is contained in:
Eelco Dolstra 2013-02-21 01:12:57 +01:00
parent 03aee6726f
commit d9f6e662d8
5 changed files with 191 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/Hydra/Controller/Project.pm
View file

@ -34,7 +34,7 @@ sub edit : Chained('project') PathPart Args(0) {
requireProjectOwner($c, $c->stash->{project});
$c->stash->{template} = 'project.tt';
$c->stash->{template} = 'edit-project.tt';
$c->stash->{edit} = 1;
}
@ -99,7 +99,7 @@ sub create : Path('/create-project') {
requireMayCreateProjects($c);
$c->stash->{template} = 'project.tt';
$c->stash->{template} = 'edit-project.tt';
$c->stash->{create} = 1;
$c->stash->{edit} = 1;
}

9
src/root/common.tt
View file

@ -236,6 +236,15 @@ BLOCK maybeEditString;
END;
BLOCK editString;
IF edit %]
<input type="text" class="string" [% HTML.attributes(id => param, name => param, value => value) %] />
[% ELSE;
HTML.escape(value);
END;
END;
BLOCK renderFullBuildLink;
INCLUDE renderFullJobNameOfBuild build=build %] <a href="[% c.uri_for('/build' build.id) %]">build [% build.id %]</a>[%
END;

57
src/root/edit-project.tt Normal file
View file

@ -0,0 +1,57 @@
[% WRAPPER layout.tt title=(create ? "New Project" : "Editing project $project.name") %]
[% PROCESS common.tt %]
<form action="[% IF create %][% c.uri_for('/create-project/submit') %][% ELSE %][% c.uri_for('/project' project.name 'submit') %][% END %]" method="post">
<table class="layoutTable">
<tr>
<th>Identifier:</th>
<td><tt>[% INCLUDE editString param="name" value=project.name %]</tt></td>
</tr>
<tr>
<th>Display name:</th>
<td>[% INCLUDE editString param="displayname" value=project.displayname %]</td>
</tr>
<tr>
<th>Description:</th>
<td>[% INCLUDE editString param="description" value=project.description %]</td>
</tr>
<tr>
<th>Homepage:</th>
<td>
[% INCLUDE editString param="homepage" value=project.homepage %]
</td>
</tr>
<tr>
<th>Owner:</th>
<td><tt>[% INCLUDE editString param="owner" value=(project.owner.username || c.user.username) %]</tt></td>
</tr>
<tr>
<th>Enabled:</th>
<td>
[% INCLUDE renderSelection param="enabled" curValue=project.enabled radiobuttons=1 options={"1" = "Yes", "0" = "No"} %]
</td>
</tr>
</table>
<div class="form-actions">
<button type="submit" class="btn btn-primary">
<i class="icon-ok icon-white"></i>
[%IF create %]Create[% ELSE %]Apply changes[% END %]
</button>
[% IF !create %]
<button id="delete-project" type="submit" class="btn btn-danger" name="submit" value="delete">
<i class="icon-trash icon-white"></i>
Delete this project
</button>
<script type="text/javascript">
$("#delete-project").click(function() {
return confirm("Are you sure you want to delete this project?");
});
</script>
[% END %]
</div>
</form>
[% END %]

6
src/root/jobset.tt
View file

@ -22,7 +22,7 @@
<tr class="input [% extraClass %]" [% IF id %]id="[% id %]"[% END %]>
<td>
[% IF edit %]<button type="button" class="btn btn-warning" onclick='$(this).parents(".input").remove()'><i class="icon-trash icon-white"></i></button>[% END %]
<tt>[% INCLUDE maybeEditString param="$baseName-name" value=input.name extraClass="shortString" %]</tt>
<tt>[% INCLUDE maybeEditString param="$baseName-name" value=input.name %]</tt>
</td>
<td>
[% INCLUDE renderSelection curValue=input.type param="$baseName-type" options=inputTypes %]
@ -143,8 +143,8 @@
<tr>
<th>Nix expression:</th>
<td>
<tt>[% INCLUDE maybeEditString param="nixexprpath" value=jobset.nixexprpath extraClass="shortString" %]</tt> in input
<tt>[% INCLUDE maybeEditString param="nixexprinput" value=jobset.nixexprinput extraClass="shortString" %]</tt>
<tt>[% INCLUDE maybeEditString param="nixexprpath" value=jobset.nixexprpath %]</tt> in input
<tt>[% INCLUDE maybeEditString param="nixexprinput" value=jobset.nixexprinput %]</tt>
</td>
</tr>
<tr>

86
src/root/project.tt
View file

@ -1,21 +1,16 @@
[% WRAPPER layout.tt title=(edit ? (create ? "New Project" : "Editing project $project.name") : "Project $project.name") %]
[% WRAPPER layout.tt title="Project $project.name" %]
[% PROCESS common.tt %]
<ul class="nav nav-tabs">
[% IF !edit %]
<li class="active"><a href="#tabs-project" data-toggle="tab">Overview</a></li>
[% END %]
<li><a href="#tabs-settings" data-toggle="tab">Settings</a></li>
[% IF !edit %]
<ul class="nav nav-tabs">
<li class="active"><a href="#tabs-project" data-toggle="tab">Jobsets</a></li>
<li><a href="#tabs-settings" data-toggle="tab">Configuration</a></li>
<li><a href="#tabs-views" data-toggle="tab">Views</a></li>
[% END %]
</ul>
</ul>
<div class="tab-content">
<div class="tab-content">
[% IF !edit %]
<div id="tabs-project" class="tab-pane active">
[% IF project.jobsets.size > 0 %]
<p>This project has the following jobsets:</p>
<table class="tablesorter table table-striped table-condensed">
@ -59,9 +54,7 @@
[% class = 'label label-success' %]
[% END %]
[% END %]
<td>
<span class="[% class %]">[% successrate FILTER format('%d') %]%</span>
</td>
<td><span class="[% class %]">[% successrate FILTER format('%d') %]%</span></td>
<td>
[% IF j.get_column('nrsucceeded') > 0 %]
<span class="label label-success">[% j.get_column('nrsucceeded') %]</span>
@ -79,87 +72,42 @@
</table>
[% ELSE %]
<p>No jobsets have been defined yet.</p>
[% END %]
</div>
[% END %]
<div id="tabs-settings" class="tab-pane [% IF edit %]active[% END %]">
[% IF edit %]
<form action="[% IF create %][% c.uri_for('/create-project/submit') %][% ELSE %][% c.uri_for('/project' project.name 'submit') %][% END %]" method="post">
[% END %]
<div id="tabs-settings" class="tab-pane">
<table class="layoutTable">
[% IF edit %]
<tr>
<th>Identifier:</th>
<td><tt>[% INCLUDE maybeEditString param="name" value=project.name %]</tt></td>
</tr>
[% END %]
<tr>
<th>Display name:</th>
<td>[% INCLUDE maybeEditString param="displayname" value=project.displayname %]</td>
<td>[% HTML.escape(project.displayname) %]</td>
</tr>
<tr>
<th>Description:</th>
<td>[% INCLUDE maybeEditString param="description" value=project.description %]</td>
<td>[% HTML.escape(project.description) %]</td>
</tr>
<tr>
<th>Homepage:</th>
<td>
[% IF edit %]
[% INCLUDE maybeEditString param="homepage" value=project.homepage %]
[% ELSE %]
[% IF project.homepage %]
<a [% HTML.attributes(href => project.homepage) %]>[% HTML.escape(project.homepage) %]</a>
[% ELSE %]
<em>(not specified)</em>
[% END %]
[% END %]
</td>
</tr>
<tr>
<th>Owner:</th>
<td><tt>[% INCLUDE maybeEditString param="owner" value=(project.owner.username || c.user.username) edit=(edit && c.check_user_roles('admin')) %]</tt></td>
<td><tt>[% HTML.escape(project.owner.username) %]</tt></td>
</tr>
<tr>
<th>Enabled:</th>
<td>
[% INCLUDE renderSelection param="enabled" curValue=project.enabled radiobuttons=1 options={"1" = "Yes", "0" = "No"} %]
</td>
<td>[% project.enabled ? "Yes" : "No" %]</td>
</tr>
</table>
[% IF edit %]
<div class="form-actions">
<button type="submit" class="btn btn-primary">
<i class="icon-ok icon-white"></i>
[%IF create %]Create[% ELSE %]Apply changes[% END %]
</button>
[% IF !create %]
<button id="delete-project" type="submit" class="btn btn-danger" name="submit" value="delete">
<i class="icon-trash icon-white"></i>
Delete this project
</button>
<script type="text/javascript">
$("#delete-project").click(function() {
return confirm("Are you sure you want to delete this project?");
});
</script>
[% END %]
</div>
</form>
[% END %]
</div>
[% IF !edit %]
<div id="tabs-views" class="tab-pane">
[% IF views.size > 0 %]
@ -181,12 +129,12 @@
[% END %]
<p><a class="btn" href="[% c.uri_for('/project' project.name 'create-view') %]">
<i class="icon-plus"></i> Create a new view
</a></p>
<p>
<a class="btn" href="[% c.uri_for('/project' project.name 'create-view') %]"><i class="icon-plus"></i> Create a new view</a>
</p>
</div>
[% END %]
</div>
[% END %]