X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=templates%2Finlinepage.tmpl;h=3c0b933159b168fe94119a51258b0d0f49baec06;hb=527d178c12141d2467dfa86492e249d021b88997;hp=8210874ef11716126dc0ca3e87f7e1cd1b9bb1ba;hpb=1aeb64e14858dc7dbce6ac553fc6dc43efb29fae;p=ikiwiki.git

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 8210874ef..3c0b93315 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -1,45 +1,74 @@
 <div class="inlinepage">
+
+<div class="inlineheader">
+
 <TMPL_IF NAME="AUTHOR">
 <span class="author">
 <TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
-<TMPL_VAR NAME=AUTHOR>
+<TMPL_VAR AUTHOR>
 </TMPL_IF>
 </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>
+
+</div><!--.inlineheader-->
+
+<div class="inlinecontent">
 <TMPL_VAR CONTENT>
+</div><!--.inlinecontent-->
 
-<span class="pageinfo">
+<div class="inlinefooter">
+
+<span class="pagedate">
 Posted <TMPL_VAR CTIME>
-<TMPL_IF NAME="PERMALINK">
-(<a rel="bookmark" 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_VAR 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">
-<span class="actions">
+<div class="actions">
 <ul>
 <TMPL_IF NAME="EDITURL">
-<li><a href="<TMPL_VAR EDITURL>">Edit</a></li>
+<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
+<TMPL_IF NAME="COMMENTSLINK">
+<li><TMPL_VAR COMMENTSLINK></li>
+<TMPL_ELSE>
 <TMPL_IF NAME="DISCUSSIONLINK">
 <li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
+</TMPL_IF>
 </ul>
-</span>
+</div><!--.actions-->
 </TMPL_IF>
 
-</div>
+</div><!--.inlinefooter-->
+
+</div><!--.inlinepage-->