* Fix some bugs in password handling:

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

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 8210874ef11716126dc0ca3e87f7e1cd1b9bb1ba..e1943baec13fe3e7ac72b0971d52d6284e98bdf7 100644 (file)
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -9,28 +9,29 @@
 </span>
 </TMPL_IF>
 <span class="header">
 </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>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>

+</TMPL_IF>

 </span>
 <TMPL_VAR CONTENT>
 
 </span>
 <TMPL_VAR CONTENT>
 

-<span class="pageinfo">
+<span class="pagedate">

 Posted <TMPL_VAR CTIME>
 Posted <TMPL_VAR CTIME>

-<TMPL_IF NAME="PERMALINK">
-(<a rel="bookmark" href="<TMPL_VAR NAME=PERMALINK>">permalink</a>)
-</TMPL_IF>

 </span>
 
 </span>
 

-<span class="tags">

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

+<span class="tags">

 Tags:
 <TMPL_LOOP NAME="TAGS">
 <TMPL_VAR NAME=LINK>
 </TMPL_LOOP>
 Tags:
 <TMPL_LOOP NAME="TAGS">
 <TMPL_VAR NAME=LINK>
 </TMPL_LOOP>

-</TMPL_IF>

 </span>
 </span>

+</TMPL_IF>

 
 <TMPL_IF NAME="HAVE_ACTIONS">
 
 <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>
 <ul>
 <TMPL_IF NAME="EDITURL">
 <li><a href="<TMPL_VAR EDITURL>">Edit</a></li>


@@ -39,7 +40,7 @@ Tags:
 <li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
 </ul>
 <li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
 </ul>

-</span>
+</div>

 </TMPL_IF>
 
 </div>
 </TMPL_IF>
 
 </div>