Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[ikiwiki.git] / templates / inlinepage.tmpl

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index f8f5b2e20af862d04c5cc8a52cf855af9380668b..71d57b00830fcdf821d87535f195e8add7d4e173 100644 (file)
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -9,23 +9,50 @@
 </span>
 </TMPL_IF>
 <span class="header">
+<TMPL_IF NAME="PERMALINK">
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
+<TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
+</TMPL_IF>
 </span>
 <TMPL_VAR CONTENT>
 
-<span class="pageinfo">
+<span class="pagedate">
 Posted <TMPL_VAR CTIME>
-<TMPL_IF NAME="PERMALINK">
-(<a href="<TMPL_VAR NAME=PERMALINK>">permalink</a>)
-</TMPL_IF>
 </span>
 
-<span class="tags">
 <TMPL_IF NAME="TAGS">
+<span class="tags">
 Tags:
 <TMPL_LOOP NAME="TAGS">
 <TMPL_VAR NAME=LINK>
 </TMPL_LOOP>
-</TMPL_IF>
 </span>
+</TMPL_IF>
+
+<TMPL_IF COPYRIGHT>
+<div class="pagecopyright">
+<TMPL_VAR COPYRIGHT>
+</div>
+</TMPL_IF>
+
+<TMPL_IF LICENSE>
+<div class="pagelicense">
+License: <TMPL_VAR LICENSE>
+</div>
+</TMPL_IF>
+
+<TMPL_IF NAME="HAVE_ACTIONS">
+<div class="actions">
+<ul>
+<TMPL_IF NAME="EDITURL">
+<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
+</TMPL_IF>
+<TMPL_IF NAME="DISCUSSIONLINK">
+<li><TMPL_VAR DISCUSSIONLINK></li>
+</TMPL_IF>
+</ul>
+</div>
+</TMPL_IF>
+
 </div>