Changes from StefanoZacchiroli:

- Use div for inlinepage actions, not a span
- Add an enclosing "trailer" div

Also, change pageinfo span into a div, since it now can include <p>

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 3657a17e606f549acd403f3a4702658d514248b0..aaadaad10983b32c8cc644ffdc9a9156f53db862 100644 (file)
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -17,6 +17,8 @@
 </span>
 <TMPL_VAR CONTENT>
 
 </span>
 <TMPL_VAR CONTENT>
 

+<div class="trailer">
+

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


@@ -31,7 +33,7 @@ Tags:
 </span>
 
 <TMPL_IF NAME="HAVE_ACTIONS">
 </span>
 
 <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>


@@ -40,7 +42,9 @@ 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>

+
+</div>

diff --git a/templates/page.tmpl b/templates/page.tmpl
index fdf7502443c5f01f8f5d1113b2dbfa8347e33056..471ed1a7d4236922f1f6e8815157571d2fe5df14 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -77,11 +77,11 @@ Links:
 </div>
 
 <div id="footer">
 </div>
 
 <div id="footer">

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

 <!-- from <TMPL_VAR NAME=WIKINAME> -->
 Last edited <TMPL_VAR NAME=MTIME>
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
 <!-- from <TMPL_VAR NAME=WIKINAME> -->
 Last edited <TMPL_VAR NAME=MTIME>
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>

-</span>
+</div>

 </div>
 
 </body>
 </div>
 
 </body>