Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / templates / change.tmpl

diff --git a/templates/change.tmpl b/templates/change.tmpl
index e476a7439b65c20e0ee37e6fb9ddccf3ee2f5b0c..5f277a0fb2cc2a0f3b56d8f946b930a7220a3981 100644 (file)
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -3,11 +3,14 @@
 [[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
 </TMPL_IF>
 [[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
-<div class="metadata">
+<TMPL_IF PERMALINK>
+[[!meta permalink="<TMPL_VAR PERMALINK>"]]
+</TMPL_IF>
+<div id="change-<TMPL_VAR REV>" class="metadata">
 <span class="desc"><br />Changed pages:</span>
 <span class="pagelinks">
 <TMPL_LOOP NAME="PAGES">
-<TMPL_IF NAME="DIFFURL"><a href="<TMPL_VAR DIFFURL>"><img alt="diff" src="<TMPL_VAR BASEURL>wikiicons/diff.png" /></a><TMPL_VAR LINK>
+<TMPL_IF NAME="DIFFURL"><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>
 <TMPL_ELSE>
 <TMPL_VAR LINK>
 </TMPL_IF>
@@ -16,7 +19,7 @@
 <span class="desc"><br />Changed by:</span>
 <span class="committer">
 <TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR USER></a>
+<a href="<TMPL_VAR AUTHORURL>" rel="nofollow"><TMPL_VAR USER></a>
 <TMPL_ELSE>
 <TMPL_VAR USER>
 </TMPL_IF>
@@ -26,11 +29,18 @@
 <span class="desc"><br />Date:</span>
 <span class="changedate"><TMPL_VAR COMMITDATE></span>
 </div>
-<div class=changelog>
+<div class="changelog">
 <TMPL_LOOP NAME="MESSAGE">
 <TMPL_IF NAME="LINE">
-<TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
+<TMPL_VAR NAME="LINE"><br />
 </TMPL_IF>
 </TMPL_LOOP>
 </div>
+<TMPL_IF NAME="DIFF">
+<div class="diff">
+<pre>
+<TMPL_VAR NAME="DIFF">
+</pre>
+</div>
+</TMPL_IF>
 <!-- <TMPL_VAR REV> -->