projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'remotes/smcv/ready/inline-pagenames' into staging
[ikiwiki.git]
/
templates
/
change.tmpl
diff --git
a/templates/change.tmpl
b/templates/change.tmpl
index 570d47559effa49d7520c85bf41345f409996062..0e61a80f4efc2d1fc173d031b827006bfce69cef 100644
(file)
--- a/
templates/change.tmpl
+++ b/
templates/change.tmpl
@@
-1,38
+1,46
@@
-[[meta author="""<TMPL_VAR AUTHOR>"""]]
+[[
!
meta author="""<TMPL_VAR AUTHOR>"""]]
<TMPL_IF AUTHORURL>
<TMPL_IF AUTHORURL>
-[[meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
+[[
!
meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
</TMPL_IF>
</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">
<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">
</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>" rel="nofollow"><TMPL_VAR
USER></a>
<TMPL_ELSE>
<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>
</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="changedate"><TMPL_VAR COMMITDATE>
</div>
<div class=changelog>
<TMPL_LOOP NAME="MESSAGE">
</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
"><br />
+</TMPL_IF>
</TMPL_LOOP>
</div>
</TMPL_LOOP>
</div>
-<!-- <TMPL_VAR NAME="REV"> -->
+<TMPL_IF NAME="DIFF">
+<div class=diff>
+<pre>
+<TMPL_VAR NAME="DIFF">
+</pre>
+</div>
+</TMPL_IF>
+<!-- <TMPL_VAR REV> -->