X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fblame.tt2;h=19d3e612c5318aab5d2912e0c50d1728b55dab8d;hb=28d48c6e7b0202a8e6a862a4ffeba61bf7055eb9;hp=8085162f143077b00c43f19afdd5ff0ff2a11755;hpb=76eeff61c03af34ac0054b44d40c3b14c44afbfa;p=catagits%2FGitalist.git

diff --git a/root/blame.tt2 b/root/blame.tt2
index 8085162..19d3e61 100644
--- a/root/blame.tt2
+++ b/root/blame.tt2
@@ -1,8 +1,10 @@
 [% PROCESS 'nav/actions.tt2' object = head %]
+[% INCLUDE inc/syntax_highlight_css.tt2 %]
+
+<div class='content'>
+
 [% IF object.type == 'commit' %]
-<div class='commit-message'>
-[% head.comment.substr(0, 85) %] ...
-</div>
+<div class='commit-message'>[% short_cmt(head.comment) %]</div>
 [% END %]
 
 [% INCLUDE 'nav/path.tt2' %]
@@ -11,9 +13,9 @@
 <table>
  <thead>
   <tr>
-   <th>sha1</th>
    <th>author</th>
    <th>date</th>
+   <th>sha1</th>
    <th></th>
    <th class='data'>data</th>
   </tr>
@@ -21,24 +23,37 @@
 
  <tfoot>
   <tr>
-   <td>sha1</td>
    <td>author</td>
    <td>date</td>
+   <td>sha1</td>
    <td></td>
    <td class='data'>data</td>
   </tr>
  </tfoot>
 
  <tbody>
+ [% blame_lines = blob.split("\n") %]
  [% FOR info IN blame %]
  <tr class=''>
-   <td class='commit-info'><a title="[% info.commit.author %] on [% info.commit.author_dt %]" href='[% c.uri_for('commit', {h=info.commit.sha1}) %]'>[% INCLUDE '_chroma_hash.tt2' sha1 = info.commit.sha1.substr(0,7) -%]</a></td>
-   <td class='author'>[% info.commit.author %]</td>
-   <td class='date'>[% info.commit.author_dt.ymd %]</td>
-   <td class='lineno'><tt>[% info.meta.lineno %]</tt></td>
-   <td class='data'><pre>[% info.line | html %]</pre></td>
+   [%-
+     linecolour = info.commit.sha1.substr(0,6);
+     IF info.commit.sha1 != lastsha1;
+       styleinfo = " style='border-top: solid 3px #" _ linecolour _ ";'"; -%]
+   <td nowrap class='author'[% styleinfo %]>[% info.commit.author %]</td>
+   <td nowrap class='date'[% styleinfo %]>[% info.commit.author_dt.ymd %]</td>
+   <td nowrap class='commit-info chroma-hash'[% styleinfo %]><a title="[% info.commit.author %] on [% info.commit.author_dt %]" href='[% c.uri_for('commit', {h=info.commit.sha1}) %]'>[% linecolour %]</td>
+     [%- ELSE -%]
+     <td nowrap class='author'></td>
+     <td nowrap class='date'></td>
+     <td nowrap class='commit-info'></td>
+     [%- END -%]
+   <td nowrap class='lineno' id='l[% info.meta.lineno %]' style='border-right: solid 3px #[% linecolour %]; border-left: solid 3px #[% linecolour %];'><tt><a href='[% c.uri_for('blame', {h=info.commit.sha1,f=filename}) %]#l[% info.meta.orig_lineno %]'>[% info.meta.lineno %]</a></tt></td>
+   <td nowrap class='data'><pre>[% blame_lines.${loop.index} %]</pre></td>
+   [% lastsha1 = info.commit.sha1 %]
  </tr>
  [% END %]
  </tbody>
 </table>
 </div>
+
+</div>