Started the switch from hand-written URLs to uri_for.

[catagits/Gitalist.git] / templates / commitdiff.tt2

diff --git a/templates/commitdiff.tt2 b/templates/commitdiff.tt2
index acb61c4..24723bc 100644 (file)
--- a/templates/commitdiff.tt2
+++ b/templates/commitdiff.tt2
@@ -1,4 +1,4 @@
-[% PROCESS 'commit-nav.tt2' object = commit %]
+[% PROCESS 'nav/actions.tt2' object = commit %]
 
 <div class='commit-message'>
 [% commit.comment.substr(0, 85) %] ...
@@ -8,6 +8,23 @@
   [% commit.author.name | html %] [[% commit.authored_time %]]
 </div>
 
-[% INCLUDE '_diff_tree.tt2' %]
 
-[% INCLUDE '_diff.tt2' %]
+[%
+# In the case of merge commits there will be no diff tree.
+IF diff_tree.size > 0;
+  INCLUDE '_diff_tree.tt2';
+END;
+IF diff.size > 0;
+  INCLUDE '_diff.tt2';
+ELSE
+%]
+<div class='no-difference'>
+[%
+  IF commit.parents > 1;
+    'Trivial merge';
+  ELSE;
+    'No differences found';
+  END;
+%]
+</div>
+[% END %]