Merge branch 'action-snapshot' of git://github.com/zts/Gitalist into zts-action-snapshot

[catagits/Gitalist.git] / root / commit.tt2

diff --git a/root/commit.tt2 b/root/commit.tt2
index b298762..2922e9e 100644 (file)
--- a/root/commit.tt2
+++ b/root/commit.tt2
@@ -1,12 +1,12 @@
 [% INCLUDE 'nav/actions.tt2' object = commit %]
 
 <div class='commit-message'>
-[% commit.comment.substr(0, 85) %] ...
-[% FOREACH ref IN branches_on %]
- <span class='refs'><a href='[% c.uri_for("shortlog", {h=commit.sha1, hb=ref}) %]'>[% ref %]</a></span>
-[% END %]
+[%
+  short_cmt(commit.comment) | html;
+  INCLUDE '_refs.tt2' object = commit;
+%]
 </div>
-
+<!-- [% USE dumper; dumper.dump(commit.parents) %] -->
 <dl class='commit-info'>
  <dt>author</dt>
   <dd>[% commit.author.name | html %] &lt;[% commit.author.email %]&gt;<br/>
@@ -22,20 +22,20 @@
   </dd>
  [% FOREACH parent IN commit.parents %]
  <dt>parent</dt>
-  <dd>[% parent %]
+  <dd>[% parent.sha1  %]
     <span class='action-list'>
-        <a href="[% c.uri_for("commit", {h=parent}) %]">commit</a>
-        <a href="[% c.uri_for("commitdiff", {hp=parent, h=commit.sha1}) %]">diff</a>
-       </span>
+     <a href="[% c.uri_for("commit", {h=parent.sha1}) %]">commit</a>
+     <a href="[% c.uri_for("commitdiff", {hp=parent.sha1, h=commit.sha1}) %]">diff</a>
+    </span>
    </dd>
  [% END %]
 </dl>
 
-<pre class='commit-message'>[% commit.comment %]</pre>
+<pre class='commit-message'>[% commit.comment | html%]</pre>
 
 [%
-# In the case of merge commits there will be no diff tree.
-IF diff_tree.size > 0;
-       INCLUDE '_diff_tree.tt2';
-END;
+  # In the case of merge commits there will be no diff tree.
+  IF diff_tree.size > 0;
+    INCLUDE '_diff_tree.tt2';
+  END;
 %]