From e17fec61b23f312ffdfe0e08a5a9300795a3e42f Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 2 Feb 2011 12:16:57 +0000
Subject: [PATCH] added help, removed nix closure from 'failed build with
 output' productlist

---
 src/root/product-list.tt | 91 +++++++++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 39 deletions(-)

diff --git a/src/root/product-list.tt b/src/root/product-list.tt
index 3630b31e..1934d350 100644
--- a/src/root/product-list.tt
+++ b/src/root/product-list.tt
@@ -20,12 +20,25 @@
 
       [% CASE "nix-build" %]
         [% IF build.resultInfo.buildstatus == 6 %]
+          [% filename = "${build.nixname}.closure.gz" %]
+          [% uri = c.uri_for('/build' build.id 'nix' 'closure' filename ) %]
           <tr class="product">
             <td>
             <a href="[% contents %]">
               <img src="/static/images/error_32.png" alt="Source" />
               Failed build produced output. Click here to inspect the output.
             </a>
+            [<a class="productDetailsToggle" href="javascript:">help</a>]
+            <div class="help productDetails">
+                  <p>If you have Nix installed on your machine, this failed build output and
+                  all its dependencies can be unpacked into your local Nix store by doing:</p>
+        
+                  <pre>$ curl [% uri %] | gunzip | nix-store --import</pre>
+        
+                  <p>The build output can then be found in the path <tt>[% product.path %]</tt>.</p>
+              
+              </p>
+            </div>
             </td>
           </tr>
         
@@ -58,46 +71,46 @@
     
             </td>
           </tr>
+          <tr class="product">
+            <td>
+    
+            [% filename = "${build.nixname}.closure.gz" %]
+            [% uri = c.uri_for('/build' build.id 'nix' 'closure' filename ) %]
+            
+            <a href="[% uri %]">
+              <img src="/static/images/nix-build.png" alt="Source" />
+              Nix closure of path <tt>[% product.path %]</tt>
+            </a>
+            
+            [<a class="productDetailsToggle" href="javascript:">help</a>]
+            <div class="help productDetails">
+              <p>If you have Nix installed on your machine, this build and
+              all its dependencies can be unpacked into your local Nix
+              store by doing:</p>
+    
+              <pre>$ gunzip &lt; [% filename %] | nix-store --import</pre>
+    
+              <p>or to download and unpack in one command:</p>
+    
+              <pre>$ curl [% uri %] | gunzip | nix-store --import</pre>
+    
+              <p>The package can then be found in the path <tt>[%
+              product.path %]</tt>.  You’ll probably also want to do</p>
+    
+              <pre>$ nix-env -i [% product.path %]</pre>
+    
+              <p>to actually install the package in your Nix user environment.</p>
+    
+              <p>If you get the error message “imported
+              archive lacks a signature”, you should make sure that you have
+              sufficient access rights to the Nix store, e.g., run the
+              command as <tt>root</tt>.</p>
+            </div>
+    
+            </td>
+          </tr>
+
       [% END %]
-      <tr class="product">
-        <td>
-
-        [% filename = "${build.nixname}.closure.gz" %]
-        [% uri = c.uri_for('/build' build.id 'nix' 'closure' filename ) %]
-        
-        <a href="[% uri %]">
-          <img src="/static/images/nix-build.png" alt="Source" />
-          Nix closure of path <tt>[% product.path %]</tt>
-        </a>
-        
-        [<a class="productDetailsToggle" href="javascript:">help</a>]
-        <div class="help productDetails">
-          <p>If you have Nix installed on your machine, this build and
-          all its dependencies can be unpacked into your local Nix
-          store by doing:</p>
-
-          <pre>$ gunzip &lt; [% filename %] | nix-store --import</pre>
-
-          <p>or to download and unpack in one command:</p>
-
-          <pre>$ curl [% uri %] | gunzip | nix-store --import</pre>
-
-          <p>The package can then be found in the path <tt>[%
-          product.path %]</tt>.  You’ll probably also want to do</p>
-
-          <pre>$ nix-env -i [% product.path %]</pre>
-
-          <p>to actually install the package in your Nix user environment.</p>
-
-          <p>If you get the error message “imported
-          archive lacks a signature”, you should make sure that you have
-          sufficient access rights to the Nix store, e.g., run the
-          command as <tt>root</tt>.</p>
-        </div>
-
-        </td>
-      </tr>
-
 
       [% CASE "file" %]