web commit by JoshTriplett: Use wiki link, and link URL.

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

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 6840f36817a8ce0956a97988405ea55e5963569d..0317c248ca1086bffc16d8199c53ed8cb12b2166 100644 (file)
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -1,17 +1,25 @@
 <div class="inlinepage">
-<span class="header"><a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a></span>
-
-<TMPL_VAR CONTENT>
-
-<span class="pageinfo">
-Posted <TMPL_VAR CTIME>
 <TMPL_IF NAME="AUTHOR">
-by <TMPL_VAR NAME=AUTHOR>
+<span class="author">
+<TMPL_IF NAME="AUTHORURL">
+<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR NAME=AUTHOR>
 </TMPL_IF>
+</span>
+</TMPL_IF>
+<span class="header">
 <TMPL_IF NAME="PERMALINK">
-(<a href="<TMPL_VAR NAME=PERMALINK>">permalink</a>)
+<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>
+</span>
 
 <span class="tags">
 <TMPL_IF NAME="TAGS">
@@ -21,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>