CSS and templates for sidebar changed to use a class, not an id.

Multiple sidebars should be possible; also, I want to add a sidebar
template.

diff --git a/debian/changelog b/debian/changelog
index c2b0c3c23987e76de100f700032750a8a1464779..03361e6a086293f6d942f9c3ef83f345d4d51f7b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100410) UNRELEASED; urgency=low
+ikiwiki (3.20100415) UNRELEASED; urgency=low
 
   [ Joey Hess ]
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
@@ -36,6 +36,7 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
   * pagestats: Use style=list to get a list of tags, scaled by use like
     in a tag cloud. This is useful to put in a sidebar.
   * Rework example blog front page.
+  * CSS and templates for sidebar changed to use a class, not an id.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 

diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index b9b57b9443a1d4571411e058cc9d0f8ab110aa4d..33637e57d608b289c24ea9c0277bd8f83130013b 100644 (file)
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -14,7 +14,7 @@ Some additional configuration you might want to do:
        \[[!tag tags/life]]
 
 * Enable the [[sidebar|plugins/sidebar]] plugin to get a sidebar listing all
-  the categories you've tagged posts with.
+  the categories you've tagged posts with, and other navigation links.
 
 * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud
   to display on the [[index]].

diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index b273ba1a9b3d4740b4531f157f8b2f0ffe10b6f5..da95e7660f2c0c1f0a19cd9b110c57cc2bfbc661 100644 (file)
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -4,7 +4,6 @@
 * [[Recent_Comments|comments]]
 * [[Archives]]
 
-[[!if test="enabled(calendar)" then="""
 [[!calendar pages="./posts/* and !*/Discussion"]]
 
 """]]

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
deleted file mode 100644 (file)
index a9fac38..0000000
--- a/doc/examples/blog/sidebar.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-Example sidebar
-
-* [[Blog|index]]
-* [[Archive|posts]]
-
-Categories:
-[[!map pages="./tags/* and !*/Discussion"]]

diff --git a/doc/style.css b/doc/style.css
index 317d4c7aacbb3efb76b52a8c664d11a4cdfdb163..af0fc230cf53956aff3a136785c5d3bb8cdc95db 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -228,7 +228,7 @@ div.recentchanges {
 .bigPC { font-size: 115%; }
 .biggestPC { font-size: 130%; }
 
-#sidebar {
+.sidebar {
        line-height: 3ex;
        width: 20ex;
        float: right;

diff --git a/templates/page.tmpl b/templates/page.tmpl
index c24f88823e29a8bd008752141017e3cc73eee238..7e850a56bacd93549d07f4920e4bc35b9507f414 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -92,7 +92,7 @@
 </div> <!-- .pageheader -->
 
 <TMPL_IF SIDEBAR>
-<div id="sidebar">
+<div class="sidebar">
 <TMPL_VAR SIDEBAR>
 </div>
 </TMPL_IF>