Merge branch 'foxtons_design' into the-new-shiny

Conflicts:
	lib/Gitalist/URIStructure/Ref.pm
	root/fragment/ref/history.tt2
	root/fragment/ref/tree.tt2
	root/fragment/repository/heads.tt2
	root/fragment/repository/shortlog.tt2
	root/inc/log_pager.tt2
	root/ref/blame.tt2
	root/ref/tree.tt2
	root/repository/summary.tt2
	root/static/css/site.css
	root/wrapper.tt2

diff --cc root/fragment/repository/shortlog.tt2
index 4875181,7b2b5b6..68167b8
mode 100644,100755..100755
--- 1/root/fragment/repository/shortlog.tt2
--- 2/root/fragment/repository/shortlog.tt2
+++ b/root/fragment/repository/shortlog.tt2
@@@ -1,38 -1,40 +1,38 @@@
  [% 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 %]>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>
 -
 -
+ <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 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>
+               [% IF longlogformat %]
+                       [% message = line.comment | html; message.replace("\n", "<br/>") %]
+               [% ELSE %]
+                       [% short_cmt(line.comment) | html %]
+                       [% INCLUDE '_refs.tt2' object = line %]
+               [% END %]
+       </td>
+       <td class='author'><img src="[% uri_for_gravatar(line.author.email, 21) %]" />[% 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 %]
+ </tbody>
+ </table>
+ 
 -[% INCLUDE 'inc/log_pager.tt2' %]
++[% INCLUDE 'inc/log_pager.tt2' %]