From 160fd34187a65b046a32ac22df68c9ad11ba109b Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Thu, 26 Apr 2007 19:49:06 +0000
Subject: [PATCH 1/1] more footer improvements

---
 debian/changelog    | 10 ++++++----
 doc/style.css       |  9 +++++++++
 templates/page.tmpl |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51a7b1188..0779c7a68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,14 +9,16 @@ 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.
-  * 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.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 26 Apr 2007 15:24:22 -0400
+  [ Joey Hess ]
+  * 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.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 26 Apr 2007 15:48:03 -0400
 
 ikiwiki (1.50) unstable; urgency=low
 
diff --git a/doc/style.css b/doc/style.css
index 390893d38..6fdb76ac0 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -45,6 +45,14 @@
 	border-top: 1px solid #000;
 }
 
+div.tags {
+	margin-top: 1em;
+}
+
+#backlinks {
+	margin-top: 1em;
+}
+
 #searchform {
 	display: inline;
 	float: right;
@@ -105,6 +113,7 @@ td.changelog {
 	clear: both;
 	font-style: italic;
 	display: block;
+	margin-top: 1em;
 }
 
 /* Used for invalid form fields. */
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 3cb8e75bb..5b3c90b5b 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -90,9 +90,9 @@ Links:
 <div class="pageinfo">
 <!-- from <TMPL_VAR NAME=WIKINAME> -->
 Last edited <TMPL_VAR NAME=MTIME>
-<TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
 </div>
 
+<TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
 </div>
 
 </body>
-- 
2.44.0