* Use div layout for the signin and preferences forms, so that they can be

[ikiwiki.git] / templates / inlinepage.tmpl

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index f8f5b2e20af862d04c5cc8a52cf855af9380668b..0317c248ca1086bffc16d8199c53ed8cb12b2166 100644 (file)
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -9,15 +9,16 @@
 </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">
 Posted <TMPL_VAR CTIME>
-<TMPL_IF NAME="PERMALINK">
-(<a href="<TMPL_VAR NAME=PERMALINK>">permalink</a>)
-</TMPL_IF>
 </span>
 
 <span class="tags">
@@ -28,4 +29,18 @@ Tags:
 </TMPL_LOOP>
 </TMPL_IF>
 </span>
+
+<TMPL_IF NAME="HAVE_ACTIONS">
+<div class="actions">
+<ul>
+<TMPL_IF NAME="EDITURL">
+<li><a href="<TMPL_VAR EDITURL>">Edit</a></li>
+</TMPL_IF>
+<TMPL_IF NAME="DISCUSSIONLINK">
+<li><TMPL_VAR DISCUSSIONLINK></li>
+</TMPL_IF>
+</ul>
+</div>
+</TMPL_IF>
+
 </div>