X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Ffragment%2Frepository%2Fshortlog.tt2;h=e6d5598672fbb294cbd84486f0603369c8fd6576;hb=225bd36dbf284adf49ae0bffe0fc482f228c0011;hp=4875181590ee8441be056a1c2ac89946ec000989;hpb=aebe9a0e6beff3cb67fcfd138899ce91e91d61b9;p=catagits%2FGitalist.git

diff --git a/root/fragment/repository/shortlog.tt2 b/root/fragment/repository/shortlog.tt2
old mode 100644
new mode 100755
index 4875181..e6d5598
--- a/root/fragment/repository/shortlog.tt2
+++ b/root/fragment/repository/shortlog.tt2
@@ -1,38 +1,49 @@
 [% BLOCK shortlog_table_headfoot %]
 [% SET cell = type == 'head' ? 'th' : 'td' %]
 <tr>
- <[% cell %]>sha1</[% cell %]>
- <[% cell %]>time</[% cell %]>
- <[% cell %]>author</[% cell %]>
- <[% cell %]>message</[% cell %]>
- <[% cell %]>actions</[% cell %]>
+	<[% cell %] colspan="2"><a href="" class="compare-link">Compare</a></[% cell %]>
+	<[% cell %]>ID (sha1)</[% cell %]>
+	<[% cell %]>Last change</[% cell %]>
+	<[% cell %]>Message</[% cell %]>
+	<[% cell %]>By</[% cell %]>
+	<[% cell %]>Actions</[% cell %]>
 </tr>
 [% END %]
-<div class='content'>
- [% INCLUDE 'inc/log_pager.tt2' %]
- <table class='shortlog listing'>
- <thead>[% PROCESS shortlog_table_headfoot type = 'head' %]</thead>
- <tfoot>[% PROCESS shortlog_table_headfoot type = 'foot' %]</tfoot>
 
- <tbody>
+<form id="compare-form">
+<table class='listing'>
+<thead>[% PROCESS shortlog_table_headfoot type = 'head' %]</thead>
+<tbody>
  [% FOREACH line IN log_lines %]
-  <tr>
-   <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'><img style="padding-right: 10px" src="[% uri_for_gravatar(line.author.email, 20) %]" />[% line.author.name | html %]</td>
-   <td>
-     [% short_cmt(line.comment) | html %]
-     [% INCLUDE '_refs.tt2' object = line %]
-   </td>
-   <td class='action-list'>
-     <a href="[% c.uri_for_action("/ref/commit", [Repository.name, line.sha1]) %]">commit</a>
-     <a href="[% c.uri_for_action("/ref/diff_fancy", [Repository.name, line.sha1]) %]">commitdiff</a>
-     <a href="[% c.uri_for_action("/ref/tree", [Repository.name, line.sha1]) %]">tree</a>
-   </td>
-  </tr>
- [% END %]
- </tbody>
-</table>[%
-  INCLUDE 'inc/log_pager.tt2';
-%]
-</div>
+ <tr [% "class='invert'" IF loop.count % 2 %]>
+ 	<td><input type="radio" name="sha1_a" value="[% line.sha1 %]" [% "checked" IF loop.count == 1 %] /></td>
+	<td><input type="radio" name="sha1_b" value="[% line.sha1 %]" [% "checked" IF loop.count == 2 %]/></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><p class='commit-message'>[%-
+        IF longlogformat;
+          line.comment | html;
+	ELSE;
+          short_cmt(line.comment) | html;
+          
+        END;
+	-%]</p>[% INCLUDE '_refs.tt2' object = line %]</td>
+	<td class='author'>[% INCLUDE 'inc/gravatar.tt2' email = line.author.email %][% line.author.name | html %]</td>
+	<td class='action-list'>
+ 		<a href="[% c.uri_for_action("/ref/commit", [Repository.name, line.sha1]) %]" title="Commit details" class="button commit">commit</a>
+ 		<a href="[% c.uri_for_action("/ref/diff_fancy", [Repository.name, line.sha1]) %]" title="Commit difference" class="button diff">commitdiff</a>
+ 		<a href="[% c.uri_for_action("/ref/tree", [Repository.name, line.sha1]) %]" title="Tree" class="button tree">tree</a>
+	</td>
+</tr>
+[% END %]
+<tr>
+	<td colspan="2"><a href="" class="compare-link">Compare</a></td>
+	<td colspan="5"></td>
+</tr>
+</tbody>
+</table>
+</form>
+
+<span id="diff-uri" class="js-data">[% c.uri_for_action('/ref/diff_fancy', [Repository.name, 'HEAD']) %]</span> 
+
+[% INCLUDE 'inc/log_pager.tt2' %]