Ticket #510: changeset.cs.diff2

--- changeset_orig.cs   2004-06-11 11:54:28.000000000 -0400
+++ changeset3.cs       2004-06-11 15:55:43.000000000 -0400
@@ -54,6 +54,17 @@
   <hr class="hide" />
 </div>
 
+<table width="100%" border="0px" cellspacing="10px">
+<tr><td valign="middle">
+ <li><?cs if:changeset.inline == 'false' || changeset.inline == '' ?>
+       <a title="Inline Diff" href="?inline=on">Inline Diff</a>
+     <?cs /if ?>
+     <?cs if:changeset.inline == 'true'?>
+       <a title="Side-By-Side Diff" href="?sidebyside=on">Side-By-Side Diff</a>
+     <?cs /if ?>
+ </li>
+</td>
+<td>
 <div id="chg-legend">
   <h3>Legend:</h3>
   <ul>
@@ -63,6 +74,8 @@
     <li><span class="diff-legend-mod"> </span>Modified</li>
    </ul>
 </div>
+</td></tr>
+</table>
 
 <div id="chg-diff">
   <?cs each:file = changeset.diff.files ?>
@@ -70,9 +83,14 @@
       <h3 class="chg-diff-hdr"><?cs var:file.name.new ?></h3>
       <table class="diff-table" cellspacing="0">
         <?cs each:change = file.changes ?>
-          <tr><td class="diff-line">line <?cs var:change.line.old ?></td>
-          <td class="diff-line">line <?cs var:change.line.new ?></td></tr>
-          <?cs call:diff_display(change) ?>
+         <?cs if:changeset.inline == 'false' || changeset.inline == '' ?>
+            <tr><td class="diff-line">Base version line <?cs var:change.line.old ?></td>
+            <td class="diff-line">Changed version line <?cs var:change.line.new ?></td></tr>
+            <?cs call:diff_display(change) ?>
+         <?cs elif changeset.inline == 'true' ?>
+            <tr><td class="diff-line">Line <?cs var:change.line.old ?></td></tr>
+            <?cs call:inlinediff_display(change) ?>
+          <?cs /if ?>
         <?cs /each ?>
       </table>
     </div>