Merge branch 'master' into debian-jessie-backports

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

diff --git a/templates/change.tmpl b/templates/change.tmpl
index 3fa327481f23567ce2a3a4e98e82063bc65f35b7..cb022220e9510ab81ec2896d0ae5a396f71b9232 100644 (file)
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -9,6 +9,11 @@
 <div id="change-<TMPL_VAR REV>" class="metadata">
 <span class="desc"><br />Changed pages:</span>
 <span class="pagelinks">
+<TMPL_UNLESS HAS_DIFFURL>
+<TMPL_IF DIFF>
+<a href="#diff-<TMPL_VAR REV>" class="toggle" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a>
+</TMPL_IF>
+</TMPL_UNLESS>
 <TMPL_LOOP PAGES>
 <TMPL_IF DIFFURL><a href="<TMPL_VAR DIFFURL>" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>
 <TMPL_ELSE><TMPL_VAR LINK></TMPL_IF>
@@ -28,9 +33,6 @@
 <span class="changedate"><TMPL_VAR COMMITDATE></span>
 <span class="desc"><br /></span>
 <TMPL_IF REVERTURL><span class="revert">
-<TMPL_IF DIFF>
-<a href="#diff-<TMPL_VAR REV>" class="toggle" title="revert" rel="nofollow">[[diff|wikiicons/diff.png]]</a>
-</TMPL_IF>
 <a href="<TMPL_VAR REVERTURL>" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a>
 </span></TMPL_IF>
 </div>
@@ -42,7 +44,11 @@
 </TMPL_LOOP>
 </div>
 <TMPL_IF DIFF>
+<TMPL_IF HAS_DIFFURL>
+<div class="diff">
+<TMPL_ELSE>
 <div class="toggleable" id="diff-<TMPL_VAR REV>">
+</TMPL_IF>
 <pre>
 <TMPL_VAR DIFF>
 </pre>