* Move the footer div to enclose tags and links too.

* More style sheet updates, remove the hack that used the tags div to create
  the footer border.

diff --git a/debian/changelog b/debian/changelog
index 57a5bd4a27100bca600a80085bff0033e7ff82df..51a7b1188c34ea2e92971d08c00b09e3629ee3c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,11 +9,14 @@ ikiwiki (1.51) UNRELEASED; urgency=low
   * Fix aggregator to not warn when a feed contains no body content at all.
   * Work around bug #420636 by, if XML::Parser crashes, running the feed
     content though Encode::decode_utf8.
   * Fix aggregator to not warn when a feed contains no body content at all.
   * Work around bug #420636 by, if XML::Parser crashes, running the feed
     content though Encode::decode_utf8.

+  * Move the footer div to enclose tags and links too.
+  * More style sheet updates, remove the hack that used the tags div to create
+    the footer border.

 
   [ Josh Triplett ]
   * Change basewiki CSS to not put a border around images used as links.
 
 
   [ Josh Triplett ]
   * Change basewiki CSS to not put a border around images used as links.
 

- -- Josh Triplett <josh@freedesktop.org>  Tue, 24 Apr 2007 13:50:51 -0700
+ -- Joey Hess <joeyh@debian.org>  Thu, 26 Apr 2007 15:24:22 -0400

 
 ikiwiki (1.50) unstable; urgency=low
 
 
 ikiwiki (1.50) unstable; urgency=low
 

diff --git a/doc/style.css b/doc/style.css
index 0143b8facf4fe4c5ff8ab58e33ced6da6ea7ca82..9299349270a4ba5b2ce71471d98ae9800bd96596 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -35,19 +35,17 @@
        padding: .2em .4em;
 }
 
        padding: .2em .4em;
 }
 

-#backlinks {
-       margin: 1em 0;
-}
-

 .tags {
        clear: both;
 }
 
 .tags {
        clear: both;
 }
 

-div.tags {
+#footer {
+       clear: both;
+       margin: 1em 0;

        border-top: 1px solid #000;
 }
 
        border-top: 1px solid #000;
 }
 

-#footer {
+#backlinks {

        margin: 1em 0;
 }
 
        margin: 1em 0;
 }
 

diff --git a/templates/page.tmpl b/templates/page.tmpl
index e9cc62b6dbf58762a3642192c68e1abf27f2687e..3cb8e75bb1299f859caacfcb48cbad9273656c10 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -58,6 +58,8 @@
 <TMPL_VAR CONTENT>
 </div>
 
 <TMPL_VAR CONTENT>
 </div>
 

+<div id="footer">
+

 <TMPL_IF NAME="TAGS">
 <div class="tags">
 Tags:
 <TMPL_IF NAME="TAGS">
 <div class="tags">
 Tags:


@@ -85,12 +87,12 @@ Links:
 </div>
 </TMPL_IF>
 
 </div>
 </TMPL_IF>
 

-<div id="footer">

 <div class="pageinfo">
 <!-- from <TMPL_VAR NAME=WIKINAME> -->
 Last edited <TMPL_VAR NAME=MTIME>
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
 </div>
 <div class="pageinfo">
 <!-- from <TMPL_VAR NAME=WIKINAME> -->
 Last edited <TMPL_VAR NAME=MTIME>
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
 </div>

+

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