Merge remote branch 'remotes/peteg/revert' into revert

[ikiwiki.git] / templates / change.tmpl

diff --git a/templates/change.tmpl b/templates/change.tmpl
index 6df36525040190da80493535be4b613bcd27f613..9cf40777b62c11cbca2fe23bcedea89f2e0fe822 100644 (file)
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -1,38 +1,48 @@
-[[meta author="""<TMPL_VAR USER>"""]]
+[[!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=changelog>
-<TMPL_LOOP NAME="MESSAGE">
-       <TMPL_IF NAME="LINE">
-               <TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
-       </TMPL_IF>
-</TMPL_LOOP>
-</div>
-<div class="metadata">
+[[!meta title="""change to<TMPL_LOOP 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 NAME="DIFFURL">">
-               <img alt="diff" src="wikiicons/diff.png" />
-               </a>
-       </TMPL_IF>
-       <TMPL_VAR LINK>
+<TMPL_LOOP PAGES>
+<TMPL_IF DIFFURL><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>
+<TMPL_ELSE>
+<TMPL_VAR LINK>
+</TMPL_IF>
 </TMPL_LOOP>
 </span>
 <span class="desc"><br />Changed by:</span>
 <span class="committer">
-<TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=USER></a>
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>" rel="nofollow"><TMPL_VAR USER></a>
 <TMPL_ELSE>
-<TMPL_VAR NAME=USER>
+<TMPL_VAR USER>
 </TMPL_IF>
 </span>
 <span class="desc"><br />Commit type:</span>
 <span class="committype"><TMPL_VAR COMMITTYPE></span>
 <span class="desc"><br />Date:</span>
 <span class="changedate"><TMPL_VAR COMMITDATE></span>
+<span class="desc"><br /></span>
+<span class="revert"><a href="<TMPL_VAR REVERTURL>" rel="nofollow">[[revert|wikiicons/revert.png]]</a></span>
 </div>
-<!-- <TMPL_VAR NAME="REV"> -->
+<div class="changelog">
+<TMPL_LOOP MESSAGE>
+<TMPL_IF LINE>
+<TMPL_VAR LINE><br />
+</TMPL_IF>
+</TMPL_LOOP>
+</div>
+<TMPL_IF DIFF>
+<div class="diff">
+<pre>
+<TMPL_VAR DIFF>
+</pre>
+</div>
+</TMPL_IF>
+<!-- <TMPL_VAR REV> -->