Merge commit 'upstream/master' into pub/master

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

diff --git a/templates/change.tmpl b/templates/change.tmpl
index af257a7ce07cae1e9b327e5b628383e050736e9e..0aebae61ef356a2df6ffb1219d9ee9b36d1410ea 100644 (file)
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -1,15 +1,46 @@
-[[meta title="""
-<TMPL_LOOP NAME="MESSAGE"><TMPL_IF NAME="LINE"><TMPL_VAR NAME="LINE" ESCAPE="HTML"><br /></TMPL_IF></TMPL_LOOP>
-"""]]
-[[meta author="<TMPL_VAR NAME="USER">"]]
+[[!meta author="""<TMPL_VAR AUTHOR>"""]]
+<TMPL_IF AUTHORURL>
+[[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
+</TMPL_IF>
+[[!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_LOOP NAME="PAGES">

-       <TMPL_IF NAME="DIFFURL">
-       <TMPL_IF NAME="BASEURL">
-       <a href="<TMPL_VAR NAME="DIFFURL">">
-       <img alt="diff" src="<TMPL_VAR BASEURL>wikiicons/diff.png" />
-       </a>
-       </TMPL_IF>
-       </TMPL_IF>
-       <TMPL_VAR NAME="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>

 </TMPL_LOOP>
 </TMPL_LOOP>

-<TMPL_VAR NAME="COMMITTYPE">
+</span>
+<span class="desc"><br />Changed by:</span>
+<span class="committer">
+<TMPL_IF NAME="AUTHORURL">
+<a href="<TMPL_VAR AUTHORURL>" rel="nofollow"><TMPL_VAR USER></a>
+<TMPL_ELSE>
+<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>
+</div>
+<div class=changelog>
+<TMPL_LOOP NAME="MESSAGE">
+<TMPL_IF NAME="LINE">
+<TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
+</TMPL_IF>
+</TMPL_LOOP>
+</div>
+<TMPL_IF NAME="DIFF">
+<div class=diff>
+<pre>
+<TMPL_VAR NAME="DIFF" ESCAPE="HTML">
+</pre>
+</div>
+</TMPL_IF>
+<!-- <TMPL_VAR REV> -->