Merge branch 'master'

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

diff --git a/templates/change.tmpl b/templates/change.tmpl
index 570d47559effa49d7520c85bf41345f409996062..4a99cf5ff47a457774e686d1cbd0c320c142d363 100644 (file)
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -1,26 +1,24 @@
-[[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>"""]]
+[[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
 <div 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_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>
 </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>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR USER></a>
 <TMPL_ELSE>
-<TMPL_VAR NAME=USER>
+<TMPL_VAR USER>
 </TMPL_IF>
 </span>
 <span class="desc"><br />Commit type:</span>
@@ -30,9 +28,16 @@
 </div>
 <div class=changelog>
 <TMPL_LOOP NAME="MESSAGE">
-       <TMPL_IF NAME="LINE">
-               <TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
-       </TMPL_IF>
+<TMPL_IF NAME="LINE">
+<TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
+</TMPL_IF>
 </TMPL_LOOP>
 </div>
-<!-- <TMPL_VAR NAME="REV"> -->
+<TMPL_IF NAME="DIFF">
+<div class=diff>
+<pre>
+<TMPL_VAR NAME="DIFF" ESCAPE="HTML">
+</pre>
+</div>
+</TMPL_IF>
+<!-- <TMPL_VAR REV> -->