Merge branch 'master' into autotag

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

diff --git a/templates/change.tmpl b/templates/change.tmpl
index 845677cce76c24cc07ee8738aadf310c98b292b8..c9f6ce42b17c66c7b737c37998821a88a95d7f79 100644 (file)
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -1,16 +1,16 @@
-[[meta author="""<TMPL_VAR AUTHOR>"""]]
+[[!meta author="""<TMPL_VAR AUTHOR>"""]]
 <TMPL_IF AUTHORURL>
-[[meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
+[[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
 </TMPL_IF>
-[[meta title="""update of <TMPL_VAR WIKINAME>'s<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP>"""]]
-<div class="metadata">
+[[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
+<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>
@@ -19,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>
@@ -32,8 +32,15 @@
 <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> -->