summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--templates/page.tmpl4
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index d66bcab20..01307db55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,8 @@ ikiwiki (3.20100610) 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.
+ * page.tmpl: Add a div around the page content, and comments, to aide in
+ sidebar styling.
* style.css: Improvements to make floating sidebar fit much better on
pages with inlines.
* calendar: Shorten day names, and improve styling of month calendar.
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 24db9a594..da8c2940f 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -106,14 +106,14 @@
<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>
<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
</TMPL_IF>
+<div id="pagebody">
+
<TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
<TMPL_VAR CONTENT>
<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>