Merge branch 'master' into dependency-types

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

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 6840f36817a8ce0956a97988405ea55e5963569d..3c0b933159b168fe94119a51258b0d0f49baec06 100644 (file)
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -1,24 +1,74 @@
 <div class="inlinepage">
 <div class="inlinepage">

-<span class="header"><a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a></span>

 
 

-<TMPL_VAR CONTENT>
+<div class="inlineheader">

 
 

-<span class="pageinfo">
-Posted <TMPL_VAR CTIME>

 <TMPL_IF NAME="AUTHOR">
 <TMPL_IF NAME="AUTHOR">

-by <TMPL_VAR NAME=AUTHOR>
+<span class="author">
+<TMPL_IF NAME="AUTHORURL">
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>
+</span>

 </TMPL_IF>
 </TMPL_IF>

+<span class="header">

 <TMPL_IF NAME="PERMALINK">
 <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_IF>
 </span>
 

-<span class="tags">
+</div><!--.inlineheader-->
+
+<div class="inlinecontent">
+<TMPL_VAR CONTENT>
+</div><!--.inlinecontent-->
+
+<div class="inlinefooter">
+
+<span class="pagedate">
+Posted <TMPL_VAR CTIME>
+</span>
+

 <TMPL_IF NAME="TAGS">
 <TMPL_IF NAME="TAGS">

+<span class="tags">

 Tags:
 <TMPL_LOOP NAME="TAGS">
 Tags:
 <TMPL_LOOP NAME="TAGS">

-<TMPL_VAR NAME=LINK>
+<TMPL_VAR LINK>

 </TMPL_LOOP>
 </TMPL_LOOP>

-</TMPL_IF>

 </span>
 </span>

+</TMPL_IF>
+
+<TMPL_IF COPYRIGHT>
+<div class="pagecopyright">
+<TMPL_VAR COPYRIGHT>

 </div>
 </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>" 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>
+</div><!--.actions-->
+</TMPL_IF>
+
+</div><!--.inlinefooter-->
+
+</div><!--.inlinepage-->