From 88dc8244792444d8e53ccd120a70b00273b56a60 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 14 Jan 2011 08:11:21 +0000
Subject: [PATCH] make changes section more compact/readable

---
 src/root/build.tt  | 36 ++++++++++++++++++------------------
 src/root/common.tt | 28 +++++++++++++++++++++++++---
 2 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/root/build.tt b/src/root/build.tt
index b61c3eec..c445c72b 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -184,25 +184,25 @@
 				[% INCLUDE renderBuildSteps type="Failed" %]
 			[% END %]
 
-            [% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %]
-                <h2>Changes</h2>
-                <p>
-                   Build [% INCLUDE renderFullBuildLink build=firstBrokenBuild %] is the first build failure after the previous successful build of this job. The changes that might have caused the failure are:
-                </p>
-                [% INCLUDE renderInputDiff build1=prevSuccessfulBuild , build2=firstBrokenBuild %]
-                <br />
-                <p/>
-            [% END %]
-
             [% IF build.resultInfo.buildstatus != 0 && prevSuccessfulBuild %]
-                <h2>Changes</h2>
-                <p>
-                    The previous successful build of this job was [% INCLUDE renderFullBuildLink build=prevSuccessfulBuild %]. The 
-                    following changes were made since:
-                </p>
-                [% INCLUDE renderInputDiff build2=build , build1=prevSuccessfulBuild %]
-                <br />
-                <p/>
+            <h2>Changes</h2>
+            <table>
+                <thead>
+                    <th>Last successful build</th>
+                    [% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %]<th>First broken build</th>[% END %]
+                    <th>Current build</th>
+                </thead>
+                <tr>
+                    <td valign="center">[% INCLUDE renderBuildStatusIcon build=prevSuccessfulBuild size=32 %] [% INCLUDE renderFullBuildLink build=prevSuccessfulBuild %]</td>
+                    [% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %]<td valign="center">[% INCLUDE renderBuildStatusIcon build=firstBrokenBuild size=32 %] [% INCLUDE renderFullBuildLink build=firstBrokenBuild %]</td>[% END %]
+                    <td>[% INCLUDE renderBuildStatusIcon build=build size=32 %] [% INCLUDE renderFullBuildLink build=build %]</td>
+                </tr>               
+                <tr>
+                    <td></td>
+                    [% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %]<td>[% INCLUDE renderInputDiff build1=prevSuccessfulBuild , build2=firstBrokenBuild %]</td>[% END %]
+                    <td>[% INCLUDE renderInputDiff build1=prevSuccessfulBuild , build2=build %]</td>
+                </tr>
+            </table>
             [% END %]
 
 			[% IF build.resultInfo.errormsg && build.resultInfo.buildstatus != 5 %]
diff --git a/src/root/common.tt b/src/root/common.tt
index b6580e9a..e2eba001 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -284,6 +284,16 @@
     [% END %]
 [% END %]
 
+[% BLOCK renderShortInputValue %]
+    [% IF input.type == "build" || input.type == "sysbuild" %]
+        <a href="[% c.uri_for('/build' build.id) %]">[% build.id %]</a>
+    [% ELSIF input.type == "string" || input.type == "boolean" %]
+        <tt>"[% input.value %]"</tt>
+    [% ELSE %]
+        <tt>[% input.uri %][% IF input.revision %] (r. [% input.revision %])[% END %]</tt>
+    [% END %]
+[% END %]
+
 [% BLOCK renderDiffUri; %]
     [% nouri = 1 %]
     [% FOREACH m IN mappers %]
@@ -311,14 +321,20 @@
             [% IF bi1.name == bi2.name %]
                 [% IF bi1.type == bi2.type %]
                     [% IF bi1.value != bi2.value || bi1.uri != bi2.uri %]
-                        <tr><td><b>[% bi1.name %]</b></td><td>[% INCLUDE renderInputValue input=bi1 %] to [% INCLUDE renderInputValue input=bi2 %]</td></tr>
+                        <tr><td><b>[% bi1.name %]</b></td><td><tt>[% INCLUDE renderShortInputValue input=bi1 %] to [% INCLUDE renderShortInputValue input=bi2 %]</tt></td></tr>
                     [% ELSIF bi1.uri == bi2.uri && bi1.revision != bi2.revision %]
+                        [% IF bi1.type == "git" %]
                         <tr><td>
-                            <b>[% bi1.name %]</b></td><td><tt>[% INCLUDE renderDiffUri contents=('Revision changed from ' _ bi1.revision _ ' to ' _ bi2.revision) %]</tt>
+                            <b>[% bi1.name %]</b></td><td><tt>[% INCLUDE renderDiffUri contents=(bi1.revision.substr(0, 6) _ ' to ' _ bi2.revision.substr(0, 6)) %]</tt>
                         </td></tr>
+                        [% ELSE %]
+                        <tr><td>
+                            <b>[% bi1.name %]</b></td><td><tt>[% INCLUDE renderDiffUri contents=(bi1.revision _ ' to ' _ bi2.revision) %]</tt>
+                        </td></tr>
+                        [% END %]
                     [% ELSIF bi1.dependency.id != bi2.dependency.id || bi1.path != bi2.path %]
                         <tr><td>
-                            <b>[% bi1.name %]</b></td><td>[% INCLUDE renderInputValue input=bi1 %] to [% INCLUDE renderInputValue input=bi2 %]
+                            <b>[% bi1.name %]</b></td><td><tt>[% INCLUDE renderShortInputValue input=bi1 %] to [% INCLUDE renderShortInputValue input=bi2 %]</tt>
                             <br/>
                             <br/>
                             [% INCLUDE renderInputDiff build1=bi1.dependency, build2=bi2.dependency, nestedDiff=1 %]
@@ -358,4 +374,10 @@
     [% END %]
   </tbody>
 </table>
+[% END %]
+
+[% BLOCK buildsGraph %]
+
+
+
 [% END %]