X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c5919df5f3697e0f8968e2b8f49cd15c1e0aa412..e1ce482e4146d1036e1ae512c73e54f69ff52f0d:/templates/inlinepage.tmpl?ds=sidebyside

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 6840f3681..a736dacb5 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -1,24 +1,58 @@
 <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 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>">Edit</a></li>
+</TMPL_IF>
+<TMPL_IF NAME="DISCUSSIONLINK">
+<li><TMPL_VAR DISCUSSIONLINK></li>
+</TMPL_IF>
+</ul>
+</div>
+</TMPL_IF>
+
 </div>