page.tmpl: Add a div around the sidebar, page content, and comments, to aide in styling.

http://bzed.de/posts/2010/05/new_css_for_bzed.de/

smcv: [10:59:01] is the logical thing you want a <div> whose meaning is "the bits the sidebar is allowed to accompany"?
bzed: [10:59:14] yeah
bzed: [10:59:58] then you could just ensure that this part is as high as the sidebar
smcv: [11:02:44] wrapping a <div> around the sidebar, content and comments seems like the way forward, then

diff --git a/debian/changelog b/debian/changelog
index 96188c093b2dd144d53a366716bc770f24ba6ad6..abf7a2d87d8bce8314042d73eca93534d69427c9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ikiwiki (3.20100609) unstable; urgency=low
   * Fix display of sidebar when previewing page edit. (Thanks, privat)
   * relativedate: Fix problem with localised dates not working.
   * editpage: Avoid storing accidental state changes when previewing pages.
+  * page.tmpl: Add a div around the sidebar, page content, and comments,
+    to aide in styling.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 235b693fe29315fd29ec5b5232bc4709f72a0c82..24db9a594b164d6d4bf22ab7dc2bfa0bf2ace4e9 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -106,6 +106,8 @@
 
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
+<div id="pagebody">
+
 <TMPL_IF SIDEBAR>
 <TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
 <TMPL_VAR SIDEBAR>
@@ -129,6 +131,8 @@
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
+</div>
+
 <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>