* XHTML validity.

This commit is contained in:
Eelco Dolstra 2009-03-04 15:25:35 +00:00
parent 56beebc9c6
commit 7a8903ea54
8 changed files with 61 additions and 38 deletions

View file

@ -32,16 +32,16 @@
<td> <td>
[% IF build.finished %] [% IF build.finished %]
[% IF build.resultInfo.buildstatus == 0 %] [% IF build.resultInfo.buildstatus == 0 %]
<img src="/static/images/success.gif" /> <img src="/static/images/success.gif" alt="Succeeded" />
<strong>Success</strong> <strong>Success</strong>
[% ELSIF build.resultInfo.buildstatus == 1 %] [% ELSIF build.resultInfo.buildstatus == 1 %]
<img src="/static/images/failure.gif" /> <img src="/static/images/failure.gif" alt="Failed" />
<span class="error">Build returned a non-zero exit code</span> <span class="error">Build returned a non-zero exit code</span>
[% ELSIF build.resultInfo.buildstatus == 2 %] [% ELSIF build.resultInfo.buildstatus == 2 %]
<img src="/static/images/failure.gif" /> <img src="/static/images/failure.gif" alt="Failed" />
<span class="error">A dependency of the build failed</span> <span class="error">A dependency of the build failed</span>
[% ELSE %] [% ELSE %]
<img src="/static/images/failure.gif" /> <img src="/static/images/failure.gif" alt="Failed" />
<span class="error">Build failed</span> <span class="error">Build failed</span>
(see <a href="#nix-error">below</a>) (see <a href="#nix-error">below</a>)
<form action="[% c.uri_for('/build' build.id 'restart') %]" method="post" class="inline"> <form action="[% c.uri_for('/build' build.id 'restart') %]" method="post" class="inline">

View file

@ -4,11 +4,30 @@
<h1>Channel <tt>[% channelName %]</tt></h1> <h1>Channel <tt>[% channelName %]</tt></h1>
<p>You can subscribe to this channel by doing <p>This page provides a <em>channel</em> for the <a
href="http://nixos.org/">Nix package manager</a>. If you have Nix
installed, you can subscribe to this channel by once executing</p>
<pre>$ nix-channel --add [% curUri %]</pre> <pre>
$ nix-channel --add [% curUri %]
$ nix-channel --update</pre>
</p> <p>You can then query and install packages in the normal way, e.g.,</p>
<pre>
$ nix-env -qa '*'
$ nix-env -i foo</pre>
<p>You can update to the latest versions of the packages in this channel by executing</p>
<pre>
$ nix-channel --update
$ nix-env -u '*'</pre>
<p>Alternatively, if youhave associated the
<tt>application/nix-package</tt> MIME type with the
<tt>nix-install-package</tt> program in your web browser, you can
install the package simply by clicking on the packages below.</p>
<h2>Packages</h2> <h2>Packages</h2>

View file

@ -46,9 +46,9 @@
[% IF !hideResultInfo %] [% IF !hideResultInfo %]
<td> <td>
[% IF build.resultInfo.buildstatus == 0 %] [% IF build.resultInfo.buildstatus == 0 %]
<img src="/static/images/success.gif" /> <img src="/static/images/success.gif" alt="Succeeded" />
[% ELSE %] [% ELSE %]
<img src="/static/images/failure.gif" /> <img src="/static/images/failure.gif" alt="Failed" />
[% END %] [% END %]
</td> </td>
[% END %] [% END %]
@ -77,11 +77,11 @@
<td>[% finishedBuilds %]</td> <td>[% finishedBuilds %]</td>
</tr> </tr>
<tr> <tr>
<th><img src="/static/images/success.gif" /> Succeeded builds:</th> <th><img src="/static/images/success.gif" alt="Succeeded" /> Succeeded builds:</th>
<td>[% succeededBuilds %]</td> <td>[% succeededBuilds %]</td>
</tr> </tr>
<tr> <tr>
<th><img src="/static/images/failure.gif" /> Failed builds:</th> <th><img src="/static/images/failure.gif" alt="Failed" /> Failed builds:</th>
<td>[% finishedBuilds - succeededBuilds %]</td> <td>[% finishedBuilds - succeededBuilds %]</td>
</tr> </tr>
<tr> <tr>

View file

@ -66,7 +66,7 @@
</table> </table>
<script> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
var id = [% n %]; var id = [% n %];
@ -90,7 +90,7 @@
<p><button id="delete-project" type="submit"><img src="/static/images/failure.gif" />Delete this release set</button></p> <p><button id="delete-project" type="submit"><img src="/static/images/failure.gif" />Delete this release set</button></p>
</form> </form>
<script> <script type="text/javascript">
$("#delete-project").click(function() { $("#delete-project").click(function() {
return confirm("Are you sure you want to delete this release set?"); return confirm("Are you sure you want to delete this release set?");
}); });

View file

@ -4,12 +4,17 @@
[% PROCESS common.tt %] [% PROCESS common.tt %]
[% BLOCK makeLink %] [% BLOCK makeLinkWrapped %]
<li [% IF curUri == uri %]class="active"[% END %]> <li [% IF curUri == uri %]class="active"[% END %]>
<div class="title"><a href="[% uri %]">[% title %]</a></div> <div class="title"><a href="[% uri %]">[% title %]</a></div>
[% content %]
</li> </li>
[% END %] [% END %]
[% BLOCK makeLink -%]
[% INCLUDE makeLinkWrapped content="" -%]
[% END %]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@ -101,20 +106,21 @@
<ul class="subsubmenu"> <ul class="subsubmenu">
[% INCLUDE makeLink uri = c.uri_for('/project' project.name 'jobstatus') title = "Job status" %] [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'jobstatus') title = "Job status" %]
[% INCLUDE makeLink uri = c.uri_for('/project' project.name 'all') title = "All builds" %] [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'all') title = "All builds" %]
[% INCLUDE makeLink uri = c.uri_for('/releasesets' project.name) title = "Releases" %] [% WRAPPER makeLinkWrapped uri = c.uri_for('/releasesets' project.name) title = "Releases" %]
[% IF project.releasesets && project.releasesets.size > 0 %]
[% IF project.releasesets && project.releasesets.size > 0 %] <ul class="subsubsubmenu">
<ul class="subsubsubmenu"> [% FOREACH releaseset IN project.releasesets %]
[% FOREACH releaseset IN project.releasesets %] [% myUri = c.uri_for('/releases' project.name releaseset.name) %]
[% myUri = c.uri_for('/releases' project.name releaseset.name) %] <li [% IF curUri == myUri %]class="active"[% END %]>
<li [% IF curUri == myUri %]class="active"[% END %]> <div class="title"><a href="[% myUri %]">
<div class="title"><a href="[% myUri %]"> [% HTML.escape(releaseset.description ? releaseset.description : releaseset.name) %]
[% HTML.escape(releaseset.description ? releaseset.description : releaseset.name) %] </a></div>
</a></div> </li>
</li> [% END %]
[% END %] </ul>
</ul> [% END %]
[% END %] [% END %]
[% INCLUDE makeLink uri = c.uri_for('/project' project.name 'edit') title = "Edit" %] [% INCLUDE makeLink uri = c.uri_for('/project' project.name 'edit') title = "Edit" %]
</ul> </ul>

View file

@ -26,12 +26,10 @@
the <tt>application/nix-package</tt> MIME type associated the <tt>application/nix-package</tt> MIME type associated
with the <tt>nix-install-package</tt> program in your web with the <tt>nix-install-package</tt> program in your web
browser. Alternatively, you can install it from the browser. Alternatively, you can install it from the
command-line: command-line:</p>
<pre>$ nix-install-package --non-interactive --url [% uri %]</pre> <pre>$ nix-install-package --non-interactive --url [% uri %]</pre>
</p>
<p>If you get an error message “Permission denied”, you <p>If you get an error message “Permission denied”, you
should make sure that you have sufficient access rights to should make sure that you have sufficient access rights to
the Nix store, e.g., run the command as <tt>root</tt>. the Nix store, e.g., run the command as <tt>root</tt>.
@ -59,16 +57,16 @@
<pre>$ gunzip &lt; [% filename %] | nix-store --import</pre> <pre>$ gunzip &lt; [% filename %] | nix-store --import</pre>
or to download and unpack in one command: <p>or to download and unpack in one command:</p>
<pre>$ curl [% uri %] | gunzip | nix-store --import</pre> <pre>$ curl [% uri %] | gunzip | nix-store --import</pre>
<p>The package can then be found in the path <tt>[% <p>The package can then be found in the path <tt>[%
product.path %]</tt>. Youll probably also want to do product.path %]</tt>. Youll probably also want to do</p>
<pre>$ nix-env -i [% product.path %]</pre> <pre>$ nix-env -i [% product.path %]</pre>
to actually install the package in your Nix user environment.</p> <p>to actually install the package in your Nix user environment.</p>
<p>If you get the error message “imported <p>If you get the error message “imported
archive lacks a signature”, you should make sure that you have archive lacks a signature”, you should make sure that you have
@ -161,7 +159,7 @@
[% END %] [% END %]
<script> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$('.productDetailsToggle').toggle( $('.productDetailsToggle').toggle(
function () { $(".productDetails", $(this).parents(".product")).fadeIn(); }, function () { $(".productDetails", $(this).parents(".product")).fadeIn(); },

View file

@ -38,7 +38,7 @@
[% BLOCK renderInput %] [% BLOCK renderInput %]
<tr class="input [% extraClass %]" id="[% id %]"> <tr class="input [% extraClass %]" [% IF id %]id="[% id %]"[% END %]>
<td> <td>
[% IF edit %]<button type="button" onclick='$(this).parents(".input").remove()'><img src="/static/images/failure.gif" alt="Delete input" /></button>[% END -%] [% IF edit %]<button type="button" onclick='$(this).parents(".input").remove()'><img src="/static/images/failure.gif" alt="Delete input" /></button>[% END -%]
<tt>[% INCLUDE maybeEditString param="$baseName-name" value=input.name extraClass="shortString" %]</tt> <tt>[% INCLUDE maybeEditString param="$baseName-name" value=input.name extraClass="shortString" %]</tt>
@ -222,7 +222,7 @@
[% INCLUDE renderInputAlt alt=alt %] [% INCLUDE renderInputAlt alt=alt %]
</tt> </tt>
<script> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
var id = 0; var id = 0;
@ -281,7 +281,7 @@
<p><button id="delete-project" type="submit"><img src="/static/images/failure.gif" />Delete this project</button></p> <p><button id="delete-project" type="submit"><img src="/static/images/failure.gif" />Delete this project</button></p>
</form> </form>
<script> <script type="text/javascript">
$("#delete-project").click(function() { $("#delete-project").click(function() {
return confirm("Are you sure you want to delete this project?"); return confirm("Are you sure you want to delete this project?");
}); });

View file

@ -386,7 +386,7 @@ h1 {
} }
#leftnavbar ul.subsubsubmenu > li { #leftnavbar ul.subsubsubmenu > li {
font-size: 80%; font-size: 90%;
list-style: none; list-style: none;
margin: 0 0 0 0; margin: 0 0 0 0;
padding: 0 0 0 0; padding: 0 0 0 0;