X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Ffragment%2Fref%2Fhistory.tt2;h=6f660f4d9ada3d5855a32104952daf6d4258f56b;hb=0493e65778d860a3c78cd429b0ae843e545ebfec;hp=a405234f7ce273f95b6355d04d43bd08a2a61c4c;hpb=2980657b3a81921f42d9ae577d42226746a720fa;p=catagits%2FGitalist.git

diff --git a/root/fragment/ref/history.tt2 b/root/fragment/ref/history.tt2
old mode 100644
new mode 100755
index a405234..6f660f4
--- a/root/fragment/ref/history.tt2
+++ b/root/fragment/ref/history.tt2
@@ -1,51 +1,53 @@
-[%
-  INCLUDE '_log_pager.tt2';
-%]  <table class='history listing'>
-   <thead>
-    <tr>
-     <th>sha1</th>
-     <th>time</th>
-     <th>author</th>
-     <th>message</th>
-     <th>actions</th>
-    </tr>
-   </thead>
-
-   <tfoot>
-    <tr>
-     <td>sha1</td>
-     <td>time</td>
-     <td>author</td>
-     <td>message</td>
-     <td>actions</td>
-    </tr>
-   </tfoot>
+[% BLOCK history_table_headfoot %]
+[% SET cell = type == 'head' ? 'th' : 'td' %]
+<tr>
+<[% cell %] colspan="2"><a href="" class='compare-link'>Compare</a></[% cell %]>
+ <[% cell %]>sha1</[% cell %]>
+ <[% cell %]>time</[% cell %]>
+ <[% cell %]>message</[% cell %]>
+ <[% cell %]>author</[% cell %]>
+ <[% cell %]>actions</[% cell %]>
+</tr>
+[% END %]
+<form id="compare-form">
+ <table class='listing'>
+   <thead>[% PROCESS history_table_headfoot type = 'head' %]</thead
 
    <tbody>
    [% FOREACH line IN log_lines %]
-    <tr>
-     <td class='sha1' title='[% line.sha1 %]'>[% INCLUDE '_chroma_hash.tt2' sha1 = line.sha1.substr(0, 7) %]</td>
+ <tr [% "class='invert'" IF loop.count % 2 %]>
+	<td><input type="radio" name="sha1_a" value="[% line.sha1 %]"[% " checked" IF loop.count == 2 %] /></td>
+	<td><input type="radio" name="sha1_b" value="[% line.sha1 %]"[% " checked" IF loop.count == 1 %]/></td>
+     <td class='sha1' title='[% line.sha1 %]'>[% INCLUDE 'inc/chroma_hash.tt2' sha1 = line.sha1.substr(0, 7) %]</td>
      <td class='time-since' title='[% line.authored_time %]'>[% time_since(line.authored_time) %]</td>
-     <td class='author'>[% line.author.name | html %]</td>
+
      <td>
        [% short_cmt(line.comment) | html %]
        [% INCLUDE '_refs.tt2' object = line.0 %]
      </td>
+	  <td class='author'>[% line.author.name | html %]</td>
      <td class='action-list'>
      [% IF filetype == 'tree' %]
-       <a href="[% c.uri_for("tree", {h=line.sha1, hb=line.sha1}) %]">tree</a>
+       <a href="[% c.uri_for_action("/ref/tree", [Repository.name, line.sha1], filename) %]" title="Blob" class="button blob">blob</a>
       [% ELSIF filetype == 'blob' %]
-       <a href="[% c.uri_for("blob", {hb=line.sha1, f=filename}) %]">blob</a>
+       <a href="[% c.uri_for_action("/ref/blob", [Repository.name, line.sha1], filename) %]" title="Blob" class="button blob">blob</a>
       [% END %]
-       <a href="[% c.uri_for("commitdiff", {h=line.sha1}) %]">commitdiff</a>
+       <a href="[% c.uri_for_action("/ref/diff_fancy", [Repository.name, line.sha1]) %]" title="Commit diff" class="button diff">commitdiff</a>
       [% IF filetype == 'blob' %]
-       <a href="[% c.uri_for("blobdiff", {hb="HEAD", hpb=line.sha1, f=filename}) %]">diff to current</a>
+       <a href="[% c.uri_for_action("/ref/diff_fancy", [Repository.name, line.sha1], 'HEAD', filename) %]" title="Diff to current" class="button diffcurrent">diff to current</a>
        [% END %]
      </td>
     </tr>
    [% END %]
+  <tr>
+	<td colspan="2"><a href="" class='compare-link'>Compare</a></td>
+	<td colspan="5"></td>
+</tr>
    </tbody>
   </table>
-[%
-  INCLUDE '_log_pager.tt2';
-%]
+</form>
+
+<span id='compare-path' class='js-data'>[% filename %]</span>
+<span id="diff-uri" class='js-data'>[% c.uri_for_action('/ref/diff_fancy', [Repository.name, 'HEAD']) %]</span>
+
+[% INCLUDE 'inc/history_pager.tt2' %]