<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="pagedate">
+Posted <TMPL_VAR CTIME>
+</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 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>