From 99626615ff41a257090414bf500a83674e8fdc27 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 25 Aug 2009 13:39:33 -0400
Subject: Fix example blog's tags/life to not have a broken PageSpec. Closes:
 #543510

---
 doc/examples/blog/tags/life.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/tags/life.mdwn b/doc/examples/blog/tags/life.mdwn
index ddc2e646c..719f2b192 100644
--- a/doc/examples/blog/tags/life.mdwn
+++ b/doc/examples/blog/tags/life.mdwn
@@ -1,4 +1,4 @@
 This feed contains pages in the "life" category.
 
-[[!inline pages="link(tags/life) and ./posts/* and !*/Discussion"
+[[!inline pages="link(tags/life) and !*/Discussion"
 show="10" actions=yes]]
-- 
cgit v1.2.3


From 9d96253d2b10f5bf56b7bd64635754508d969cb6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 25 Sep 2009 15:41:13 -0400
Subject: add comments page to example blog, listing all comments

---
 doc/examples/blog/comments.mdwn | 3 +++
 doc/examples/blog/index.mdwn    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 doc/examples/blog/comments.mdwn

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
new file mode 100644
index 000000000..c46f95df7
--- /dev/null
+++ b/doc/examples/blog/comments.mdwn
@@ -0,0 +1,3 @@
+This page will show all comments made to posts in my [[blog|index]].
+
+[[!inline pages="*/Discussion or internal(./posts/*/comment_*)"]]
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index 84c732dd1..aef46eb68 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -3,7 +3,7 @@
 Welcome to my blog.
 
 Have a look at the most recent posts below, or browse the tag cloud on the
-right. An archive of all [[posts]] is also available.
+right. Archives of all [[posts]] and all [[comments]] are also available.
 
 [[!inline pages="./posts/* and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
-- 
cgit v1.2.3


From 0cb9e588e4253d317945399120a1ef5780b59d7a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 20:54:38 -0400
Subject: add among limit to pagestats

---
 doc/examples/blog/index.mdwn | 2 +-
 doc/examples/blog/tags.mdwn  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index aef46eb68..01b714fcd 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,4 +1,4 @@
-[[!pagestats pages="./tags/*"]]
+[[!pagestats pages="./tags/*" among="./posts/*"]]
 
 Welcome to my blog.
 
diff --git a/doc/examples/blog/tags.mdwn b/doc/examples/blog/tags.mdwn
index 53cc8d368..b5eca5b71 100644
--- a/doc/examples/blog/tags.mdwn
+++ b/doc/examples/blog/tags.mdwn
@@ -1,3 +1,3 @@
-[[!pagestats pages="./tags/*"]]
+[[!pagestats pages="./tags/*" among="./posts/*"]]
 
 On the right you can see the tag cloud for this blog.
-- 
cgit v1.2.3


From 0fb4474cf82ffe0ccd2b206843ba4f61160e4cf8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 13:55:02 -0400
Subject: limit to discussion pages of blog posts, not whole wiki

---
 doc/examples/blog/comments.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index c46f95df7..4735dea08 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,3 +1,3 @@
 This page will show all comments made to posts in my [[blog|index]].
 
-[[!inline pages="*/Discussion or internal(./posts/*/comment_*)"]]
+[[!inline pages="./posts/*/Discussion or internal(./posts/*/comment_*)"]]
-- 
cgit v1.2.3


From 6e7bfbe7bb8ba4b94d0e8c203b2117477b217384 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 19:23:34 -0400
Subject: auto-blog.setup: Set tagbase by default, since most bloggers will
 want it.

Also modified first_post page to use a tag format that will work whether
or not tagbase is set.
---
 auto-blog.setup                         | 1 +
 debian/changelog                        | 1 +
 doc/examples/blog/posts/first_post.mdwn | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc/examples/blog')

diff --git a/auto-blog.setup b/auto-blog.setup
index 7ff413187..95347167f 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -48,4 +48,5 @@ IkiWiki::Setup::Automator->import(
 	blogspam_pagespec => "postcomment(*)",
 	discussion => 0,
 	locked_pages => "*",
+	tagbase => "tags",
 )
diff --git a/debian/changelog b/debian/changelog
index 57406c6d3..2d82c4dba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
     that could lead to bad dependency handling in certian situations.
   * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
     if necessary for unusual install.
+  * auto-blog.setup: Set tagbase by default, since most bloggers will want it.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn
index d49432341..7f814fbb1 100644
--- a/doc/examples/blog/posts/first_post.mdwn
+++ b/doc/examples/blog/posts/first_post.mdwn
@@ -1,4 +1,4 @@
 This is the first post to this example blog. To add new posts, just add
 files to the posts/ subdirectory, or use the web form.
 
-[[!tag tags/tech]]
+[[!tag ./tags/tech]]
-- 
cgit v1.2.3


From b6666f5ac81ef4c8646a6290cf5c885adf0e385f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 19:28:48 -0400
Subject: fix tag

Actually, tags can't be made to work with and w/o tagbase, so just make it
assume tagbase is set. Better example anyway.

(It'll be a broken link on ikiwiki.info though.)
---
 doc/examples/blog/posts/first_post.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn
index 7f814fbb1..f2729fcef 100644
--- a/doc/examples/blog/posts/first_post.mdwn
+++ b/doc/examples/blog/posts/first_post.mdwn
@@ -1,4 +1,4 @@
 This is the first post to this example blog. To add new posts, just add
 files to the posts/ subdirectory, or use the web form.
 
-[[!tag ./tags/tech]]
+[[!tag tech]]
-- 
cgit v1.2.3


From fe733e2a424f50227e4a501c3efbf1ce43e07352 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 14:29:14 -0400
Subject: enhance pagestats and rework example blog front page

* pagestats: Class parameter can be used to override default class for
  custom styling.
* 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.
---
 IkiWiki/Plugin/pagestats.pm          | 21 ++++++++++++++++++---
 debian/changelog                     |  5 +++++
 doc/examples/blog/archives.mdwn      |  7 +++++++
 doc/examples/blog/comments.mdwn      |  2 +-
 doc/examples/blog/index.mdwn         | 12 ++++++++----
 doc/ikiwiki/directive/pagestats.mdwn | 11 ++++++++++-
 6 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 doc/examples/blog/archives.mdwn

(limited to 'doc/examples/blog')

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 1c0b46830..48715bd3e 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -75,7 +75,7 @@ sub preprocess (@) {
 	}
 
 	if ($style eq 'table') {
-		return "<table class='pageStats'>\n".
+		return "<table class='".(exists $params{class} ? $params{class} : "pageStats")."'>\n".
 			join("\n", map {
 				"<tr><td>".
 				htmllink($params{page}, $params{destpage}, $_, noimageinline => 1).
@@ -87,16 +87,31 @@ sub preprocess (@) {
 	else {
 		# In case of misspelling, default to a page cloud
 
-		my $res = "<div class='pagecloud'>\n";
+		my $res;
+		if ($style eq 'list') {
+			$res = "<ul class='".(exists $params{class} ? $params{class} : "list")."'>\n";
+		}
+		else {
+			$res = "<div class='".(exists $params{class} ? $params{class} : "pagecloud")."'>\n";
+		}
 		foreach my $page (sort keys %counts) {
 			next unless $counts{$page} > 0;
 
 			my $class = $classes[$counts{$page} * scalar(@classes) / ($max + 1)];
+			
+			$res.="<li>" if $style eq 'list';
 			$res .= "<span class=\"$class\">".
 			        htmllink($params{page}, $params{destpage}, $page).
 			        "</span>\n";
+			$res.="</li>" if $style eq 'list';
+
+		}
+		if ($style eq 'list') {
+			$res = "</ul>\n";
+		}
+		else {
+			$res .= "</div>\n";
 		}
-		$res .= "</div>\n";
 
 		return $res;
 	}
diff --git a/debian/changelog b/debian/changelog
index 7c607b2a5..c2b0c3c23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,11 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
     specify which pages to include on the calendar archive pages.
     (The pagespec can still also be specified on the ikiwiki-calendar command
     line.)
+  * pagestats: Class parameter can be used to override default class for
+    custom styling.
+  * 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.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/examples/blog/archives.mdwn b/doc/examples/blog/archives.mdwn
new file mode 100644
index 000000000..14686cdfe
--- /dev/null
+++ b/doc/examples/blog/archives.mdwn
@@ -0,0 +1,7 @@
+[[!if test="enabled(calendar)" then="""
+Browse through blog archives by year:
+[[!map pages="./archives/* and !./archives/*/* and !*/Discussion"]]
+"""
+else="""
+Calendar based archives are not enabled. See [[posts]] for a full list of posts.
+"""]]
diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 4735dea08..0b503ba01 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,3 +1,3 @@
-This page will show all comments made to posts in my [[blog|index]].
+This page will show recent comments made to posts in the [[blog|index]].
 
 [[!inline pages="./posts/*/Discussion or internal(./posts/*/comment_*)"]]
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index 01b714fcd..b273ba1a9 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,9 +1,13 @@
-[[!pagestats pages="./tags/*" among="./posts/*"]]
+[[!template id=note text="""
 
-Welcome to my blog.
+* [[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
+* [[Recent_Comments|comments]]
+* [[Archives]]
 
-Have a look at the most recent posts below, or browse the tag cloud on the
-right. Archives of all [[posts]] and all [[comments]] are also available.
+[[!if test="enabled(calendar)" then="""
+[[!calendar pages="./posts/* and !*/Discussion"]]
+
+"""]]
 
 [[!inline pages="./posts/* and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
diff --git a/doc/ikiwiki/directive/pagestats.mdwn b/doc/ikiwiki/directive/pagestats.mdwn
index 68f4d2734..d0e0e7be7 100644
--- a/doc/ikiwiki/directive/pagestats.mdwn
+++ b/doc/ikiwiki/directive/pagestats.mdwn
@@ -4,10 +4,16 @@ This directive can generate stats about how pages link to each other. It can
 produce either a tag cloud, or a table counting the number of links to each
 page.
 
-Here's how to use it to create a [[tag]] cloud:
+Here's how to use it to create a [[tag]] cloud, with tags sized based
+on frequency of use:
 
 	\[[!pagestats pages="tags/*"]]
 
+Here's how to create a list of tags, sized by use as they would be in a
+cloud.
+	
+	\[[!pagestats style="list" pages="tags/*"]]
+
 And here's how to create a table of all the pages on the wiki:
 
 	\[[!pagestats style="table"]]
@@ -28,4 +34,7 @@ links:
 
 	\[[!pagestats style="table" show="10"]]
 
+The optional `class` parameter can be used to control the class
+of the generated tag cloud `div` or page stats `table`.
+
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From baaa848f6c06b0b3a59677d3551e130c65e5fde7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 15:04:17 -0400
Subject: 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.
---
 debian/changelog               | 3 ++-
 doc/examples/blog.mdwn         | 2 +-
 doc/examples/blog/index.mdwn   | 1 -
 doc/examples/blog/sidebar.mdwn | 7 -------
 doc/style.css                  | 2 +-
 templates/page.tmpl            | 2 +-
 6 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 doc/examples/blog/sidebar.mdwn

(limited to 'doc/examples/blog')

diff --git a/debian/changelog b/debian/changelog
index c2b0c3c23..03361e6a0 100644
--- 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 b9b57b944..33637e57d 100644
--- 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 b273ba1a9..da95e7660 100644
--- 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
index a9fac388e..000000000
--- 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 317d4c7aa..af0fc230c 100644
--- 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 c24f88823..7e850a56b 100644
--- 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>
-- 
cgit v1.2.3


From 843ce484fc9a65a814be62ab9617fc461640fbeb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 16:21:06 -0400
Subject: update

---
 doc/examples/blog.mdwn       |  3 ---
 doc/examples/blog/index.mdwn | 18 ++++++++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index 33637e57d..8775c01ab 100644
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -13,9 +13,6 @@ Some additional configuration you might want to do:
   example of how to tag a post is:
 	\[[!tag tags/life]]
 
-* Enable the [[sidebar|plugins/sidebar]] plugin to get a sidebar listing all
-  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 da95e7660..062c71f2e 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,16 +1,14 @@
-[[!template id=note text="""
+[[!inline pages="./posts/* and !*/Discussion" show="10"
+actions=yes rootpage="posts"]]
 
-* [[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
-* [[Recent_Comments|comments]]
-* [[Archives]]
+[[!sidebar """
+[[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
 
-[[!calendar pages="./posts/* and !*/Discussion"]]
+[[Recent Comments|comments]]
 
-"""]]
+[[Archives]]
 
-[[!inline pages="./posts/* and !*/Discussion" show="10"
-actions=yes rootpage="posts"]]
-
-----
+[[!calendar pages="./posts/* and !*/Discussion"]]
+"""]]
 
 This blog is powered by [ikiwiki](http://ikiwiki.info).
-- 
cgit v1.2.3


From 37a0c2d40beaba9ae050a4eddc925b910d739736 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 16:55:20 -0400
Subject: add note if ikiwiki-calendar needs to be run

---
 doc/examples/blog/archives.mdwn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/archives.mdwn b/doc/examples/blog/archives.mdwn
index 14686cdfe..d07b73b74 100644
--- a/doc/examples/blog/archives.mdwn
+++ b/doc/examples/blog/archives.mdwn
@@ -1,7 +1,8 @@
-[[!if test="enabled(calendar)" then="""
+[[!if test="archives/*" then="""
 Browse through blog archives by year:
 [[!map pages="./archives/* and !./archives/*/* and !*/Discussion"]]
 """
 else="""
-Calendar based archives are not enabled. See [[posts]] for a full list of posts.
+You need to use the `ikiwiki-calendar` program to generate calendar-based
+archive pages.
 """]]
-- 
cgit v1.2.3


From d63e043f0abf642ff4048cc20c6caf03db3e55fb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:38:13 -0400
Subject: allow sidebar directive to enable use of sidebar page

This way, the example blog always has a sidebar on the index page,
but not the overhead of sidebars on all the other pages. And if a
user wants to, they can enable global_sidebars to switch to sidebars on
every page.
---
 IkiWiki/Plugin/sidebar.pm          | 33 ++++++++++++++++++---------------
 doc/examples/blog/index.mdwn       | 10 +---------
 doc/examples/blog/sidebar.mdwn     |  9 +++++++++
 doc/ikiwiki/directive/sidebar.mdwn |  8 +++++++-
 4 files changed, 35 insertions(+), 25 deletions(-)
 create mode 100644 doc/examples/blog/sidebar.mdwn

(limited to 'doc/examples/blog')

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 1b302dcf9..f706480ca 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -23,7 +23,7 @@ sub getsetup () {
 		global_sidebars => {
 			type => "boolean",
 			examples => 1,
-			description => "show sidebar page on all pages?"
+			description => "show sidebar page on all pages?",
 			safe => 1,
 			rebuild => 1,
 		},
@@ -36,20 +36,22 @@ sub preprocess (@) {
 	my $content=shift;
 	shift;
 
-	if (! defined $content) {
-		error(gettext("sidebar content not specified"));
-	}
-
 	my $page=$params{page};
 	return "" unless $page eq $params{destpage};
-	my $file = $pagesources{$page};
-	my $type = pagetype($file);
-
-	$pagesidebar{$page}=
-		IkiWiki::htmlize($page, $page, $type,
-		IkiWiki::linkify($page, $page,
-		IkiWiki::preprocess($page, $page,
-		IkiWiki::filter($page, $page, $content))));
+	
+	if (! defined $content) {
+		$pagesidebar{$page}=undef;
+	}
+	else {
+		my $file = $pagesources{$page};
+		my $type = pagetype($file);
+
+		$pagesidebar{$page}=
+			IkiWiki::htmlize($page, $page, $type,
+			IkiWiki::linkify($page, $page,
+			IkiWiki::preprocess($page, $page,
+			IkiWiki::filter($page, $page, $content))));
+	}
 
 	return "";
 }
@@ -60,9 +62,10 @@ my $oldcontent;
 sub sidebar_content ($) {
 	my $page=shift;
 	
-	return $pagesidebar{$page} if exists $pagesidebar{$page};
+	return $pagesidebar{$page} if defined $pagesidebar{$page};
 
-	return if defined $config{global_sidebars} && !$config{global_sidebars};
+	return if ! exists $pagesidebar{$page} && 
+		defined $config{global_sidebars} && ! $config{global_sidebars};
 
 	my $sidebar_page=bestlink($page, "sidebar") || return;
 	my $sidebar_file=$pagesources{$sidebar_page} || return;
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index 062c71f2e..a22c40c72 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,14 +1,6 @@
 [[!inline pages="./posts/* and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
 
-[[!sidebar """
-[[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
-
-[[Recent Comments|comments]]
-
-[[Archives]]
-
-[[!calendar pages="./posts/* and !*/Discussion"]]
-"""]]
+[[!sidebar]]
 
 This blog is powered by [ikiwiki](http://ikiwiki.info).
diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
new file mode 100644
index 000000000..f24a8e57a
--- /dev/null
+++ b/doc/examples/blog/sidebar.mdwn
@@ -0,0 +1,9 @@
+[[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
+
+[[Recent Comments|comments]]
+
+[[Archives]]
+
+[[!if "enabled(calendar)" then="""
+[[!calendar pages="./posts/* and !*/Discussion"]]
+"""]]
diff --git a/doc/ikiwiki/directive/sidebar.mdwn b/doc/ikiwiki/directive/sidebar.mdwn
index 34f078672..401d7c786 100644
--- a/doc/ikiwiki/directive/sidebar.mdwn
+++ b/doc/ikiwiki/directive/sidebar.mdwn
@@ -1,8 +1,12 @@
 The `sidebar` directive is supplied by the [[!iki plugins/sidebar desc=sidebar]] plugin.
 
-This directive specifies a custom sidebar to display on the page,
+This directive can specify a custom sidebar to display on the page,
 overriding any sidebar that is displayed globally.
 
+If no custom sidebar content is specified, it forces the sidebar page to
+be used as the sidebar, even if the `global_sidebars` setting has been
+used to disable use of the sidebar page by default.
+
 ## examples
 
 	\[[!sidebar """
@@ -11,4 +15,6 @@ overriding any sidebar that is displayed globally.
 	\[[!calendar pages="posts/*"]]
 	"""]]
 
+	\[[!sidebar]]
+
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From 4bbbd77a48f9c3188c97637d4d4b0d503fc1738e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:49:32 -0400
Subject: typo

---
 doc/examples/blog/sidebar.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index f24a8e57a..1d01f0a6c 100644
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -4,6 +4,6 @@
 
 [[Archives]]
 
-[[!if "enabled(calendar)" then="""
+[[!if test="enabled(calendar)" then="""
 [[!calendar pages="./posts/* and !*/Discussion"]]
 """]]
-- 
cgit v1.2.3


From f41ebb8862b7602afea6f8ecfd074f11407165fc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:56:36 -0400
Subject: reorg

---
 doc/examples/blog/sidebar.mdwn | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index 1d01f0a6c..de0feba9e 100644
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -1,9 +1,9 @@
-[[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
+[[!if test="enabled(calendar)" then="""
+[[!calendar pages="./posts/* and !*/Discussion"]]
+"""]]
 
 [[Recent Comments|comments]]
 
 [[Archives]]
 
-[[!if test="enabled(calendar)" then="""
-[[!calendar pages="./posts/* and !*/Discussion"]]
-"""]]
+[[Tags]]: [[!pagestats style="list" pages="* and !smileys/*"]]
-- 
cgit v1.2.3


From a0a472d57716466fba9d8f39e7586b3ca0d17578 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:57:35 -0400
Subject: fix tagspec

---
 doc/examples/blog/sidebar.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index de0feba9e..5c1f17723 100644
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -6,4 +6,5 @@
 
 [[Archives]]
 
-[[Tags]]: [[!pagestats style="list" pages="* and !smileys/*"]]
+[[Tags]]:
+[[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
-- 
cgit v1.2.3


From a034716009e29b1ef4bd44e0cddb7f7cf2fd93a2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 15:35:52 -0400
Subject: update example tag pages to match autotag.tmpl

---
 doc/examples/blog/tags/life.mdwn | 6 +++---
 doc/examples/blog/tags/tech.mdwn | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/tags/life.mdwn b/doc/examples/blog/tags/life.mdwn
index 719f2b192..e1614dbdc 100644
--- a/doc/examples/blog/tags/life.mdwn
+++ b/doc/examples/blog/tags/life.mdwn
@@ -1,4 +1,4 @@
-This feed contains pages in the "life" category.
+[[!meta title="tag life"]]
 
-[[!inline pages="link(tags/life) and !*/Discussion"
-show="10" actions=yes]]
+[[!inline pages="tagged(tags/life)" actions="no" archive="yes"
+feedshow=10]]
diff --git a/doc/examples/blog/tags/tech.mdwn b/doc/examples/blog/tags/tech.mdwn
index e811cac34..398146cdb 100644
--- a/doc/examples/blog/tags/tech.mdwn
+++ b/doc/examples/blog/tags/tech.mdwn
@@ -1,3 +1,4 @@
-This feed contains pages in the "tech" category.
+[[!meta title="tag tech"]]
 
-[[!inline pages="link(tags/tech) and !*/Discussion" show=10 actions=yes]]
+[[!inline pages="tagged(tags/tech)" actions="no" archive="yes"
+feedshow=10]]
-- 
cgit v1.2.3


From 70f121af025764bda665767d2566b9fa2f66ea91 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 14:12:14 -0400
Subject: switch to use comments(), and add a count (and a feed) of comments
 pending moderation

---
 doc/examples/blog/comments.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 0b503ba01..32ffa5537 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,3 +1,7 @@
 This page will show recent comments made to posts in the [[blog|index]].
 
-[[!inline pages="./posts/*/Discussion or internal(./posts/*/comment_*)"]]
+There are [[!pagecount pages="comment_pending(/posts/*)"]] comments
+in the moderation queue.
+[[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]]
+
+[[!inline pages="./posts/*/Discussion or comment(./posts/*)"]]
-- 
cgit v1.2.3


From d50de130e8f9c1183ae958a3dc902829ab72c3bc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 00:00:03 -0400
Subject: conditionalize use of sidebar

---
 doc/examples/blog/index.mdwn | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index a22c40c72..220c1b3e3 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,6 +1,11 @@
+[[!if test="enabled(sidebar)" then="""
+[[!sidebar]]
+""" else="""
+[[!inline pages=sidebar raw=yes]]
+"""]]
+
 [[!inline pages="./posts/* and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
 
-[[!sidebar]]
 
 This blog is powered by [ikiwiki](http://ikiwiki.info).
-- 
cgit v1.2.3


From 0287fe29ac7b2e38f8887ad0a5b0f6e98986809f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 22:23:44 -0400
Subject: reword comment count to avoid pluralisation issues

---
 doc/examples/blog/comments.mdwn | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 32ffa5537..f8569a549 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,7 +1,6 @@
-This page will show recent comments made to posts in the [[blog|index]].
-
-There are [[!pagecount pages="comment_pending(/posts/*)"]] comments
-in the moderation queue.
 [[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]]
+Comments in the moderation queue:
+[[!pagecount pages="comment_pending(/posts/*)"]]
 
+Recent comments on posts in the [[blog|index]]:
 [[!inline pages="./posts/*/Discussion or comment(./posts/*)"]]
-- 
cgit v1.2.3


From 758cd909e9cc7bf9b46679131808132a397c8770 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:01:40 -0400
Subject: move moderation info to sidebar

---
 doc/examples/blog/comments.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index f8569a549..1873fb9ac 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,6 +1,8 @@
+[[!sidebar content="""
 [[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]]
 Comments in the moderation queue:
 [[!pagecount pages="comment_pending(/posts/*)"]]
+"""]]
 
 Recent comments on posts in the [[blog|index]]:
 [[!inline pages="./posts/*/Discussion or comment(./posts/*)"]]
-- 
cgit v1.2.3


From 0ab4496237e42a0044116477d0358b2faaa95675 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:06:19 -0400
Subject: fix comment feed filename

---
 doc/examples/blog/comments.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 1873fb9ac..f600ae183 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,5 +1,6 @@
 [[!sidebar content="""
-[[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]]
+[[!inline pages="comment_pending(/posts/*)" feedfile=pendingmoderation
+description="comments pending moderation" show=-1]]
 Comments in the moderation queue:
 [[!pagecount pages="comment_pending(/posts/*)"]]
 """]]
-- 
cgit v1.2.3


From 595a783e56cc9bbade002baeff95c0e60d6b3572 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:47:55 -0400
Subject: fixup pagespecs to work relative too

---
 doc/examples/blog/comments.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index f600ae183..f59b44390 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,8 +1,8 @@
 [[!sidebar content="""
-[[!inline pages="comment_pending(/posts/*)" feedfile=pendingmoderation
+[[!inline pages="comment_pending(./posts/*)" feedfile=pendingmoderation
 description="comments pending moderation" show=-1]]
 Comments in the moderation queue:
-[[!pagecount pages="comment_pending(/posts/*)"]]
+[[!pagecount pages="comment_pending(./posts/*)"]]
 """]]
 
 Recent comments on posts in the [[blog|index]]:
-- 
cgit v1.2.3


From c9a6b91c5528882be6574e46b2f9eee937fe0616 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmC_nMjWfriv8nVMOwnvYhgmzwvVP4OVjU"
 <https://www.google.com/accounts/o8/id?id=AItOawmC_nMjWfriv8nVMOwnvYhgmzwvVP4OVjU@web>
Date: Fri, 28 May 2010 09:01:29 +0000
Subject: delete me

---
 ...267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn" | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 "doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"

(limited to 'doc/examples/blog')

diff --git "a/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn" "b/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"
new file mode 100644
index 000000000..05f17c8f3
--- /dev/null
+++ "b/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"
@@ -0,0 +1 @@
+主要看看url如何显示。
-- 
cgit v1.2.3


From 052887296570bd8e4750862293fd36424f153fbd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 28 May 2010 06:17:57 -0400
Subject: Revert "delete me"

---
 ...267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn" | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 "doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"

(limited to 'doc/examples/blog')

diff --git "a/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn" "b/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"
deleted file mode 100644
index 05f17c8f3..000000000
--- "a/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"
+++ /dev/null
@@ -1 +0,0 @@
-主要看看url如何显示。
-- 
cgit v1.2.3


From ba9b808c898a556541057ac9f524db2de2a33d77 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 14:04:42 -0400
Subject: remove example blog tag pages

Autotag will create them as needed. Avoids some complexity.
---
 debian/changelog                                          | 2 ++
 doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn | 3 +++
 doc/examples/blog/tags/life.mdwn                          | 4 ----
 doc/examples/blog/tags/tech.mdwn                          | 4 ----
 4 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 doc/examples/blog/tags/life.mdwn
 delete mode 100644 doc/examples/blog/tags/tech.mdwn

(limited to 'doc/examples/blog')

diff --git a/debian/changelog b/debian/changelog
index 9a10332ea..a0ea9c156 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (3.20100518.3) UNRELEASED; urgency=low
   * creation_day() etc use local time, not gmtime. To match calendars, which
     use local time.
   * img: Fill in missing height or width when scaling image.
+  * Remove example blog tag pages; allow autotag creation to create them
+    when used.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
index 55669e5c8..9a55c0673 100644
--- a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
+++ b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
@@ -27,3 +27,6 @@ I did not yet do any testing to figure out when this broke.
 >> autotags pages.
 
 >> --[[tschwinge]]
+
+>>> Only way I can reproduce something like this is if tagbase is not set.
+>>> --[[Joey]]
diff --git a/doc/examples/blog/tags/life.mdwn b/doc/examples/blog/tags/life.mdwn
deleted file mode 100644
index e1614dbdc..000000000
--- a/doc/examples/blog/tags/life.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-[[!meta title="tag life"]]
-
-[[!inline pages="tagged(tags/life)" actions="no" archive="yes"
-feedshow=10]]
diff --git a/doc/examples/blog/tags/tech.mdwn b/doc/examples/blog/tags/tech.mdwn
deleted file mode 100644
index 398146cdb..000000000
--- a/doc/examples/blog/tags/tech.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-[[!meta title="tag tech"]]
-
-[[!inline pages="tagged(tags/tech)" actions="no" archive="yes"
-feedshow=10]]
-- 
cgit v1.2.3


From fad44c9d4d7e907b35d99a664f77cb617916f5df Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 14:58:05 -0400
Subject: remove tag on first post

It's a broken link on ikiwiki.info.
---
 doc/examples/blog/posts/first_post.mdwn | 2 --
 1 file changed, 2 deletions(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn
index f2729fcef..343497d18 100644
--- a/doc/examples/blog/posts/first_post.mdwn
+++ b/doc/examples/blog/posts/first_post.mdwn
@@ -1,4 +1,2 @@
 This is the first post to this example blog. To add new posts, just add
 files to the posts/ subdirectory, or use the web form.
-
-[[!tag tech]]
-- 
cgit v1.2.3


From 85546d570e36b85fce27755590ec6e8b8e1fce81 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Jun 2010 01:21:32 -0400
Subject: wording

---
 doc/examples/blog/posts.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/posts.mdwn b/doc/examples/blog/posts.mdwn
index 4b2939120..fa2dbef0e 100644
--- a/doc/examples/blog/posts.mdwn
+++ b/doc/examples/blog/posts.mdwn
@@ -1,3 +1,3 @@
-Here is a full list of posts to my [[blog|index]].
+Here is a full list of posts to the [[blog|index]].
 
 [[!inline pages="./posts/* and !*/Discussion" archive=yes feedshow=10 quick=yes]]
-- 
cgit v1.2.3


From 5071a8eb734d090fd790ae1b9ceafe549c33cda2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jun 2010 12:35:21 -0400
Subject: limit blog inlines to pages

This way images attached to blog posts don't show up as enclosures in the
blog by default.
---
 doc/examples/blog/index.mdwn | 2 +-
 doc/examples/blog/posts.mdwn | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index 220c1b3e3..7914cd203 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -4,7 +4,7 @@
 [[!inline pages=sidebar raw=yes]]
 """]]
 
-[[!inline pages="./posts/* and !*/Discussion" show="10"
+[[!inline pages="page(./posts/*) and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
 
 
diff --git a/doc/examples/blog/posts.mdwn b/doc/examples/blog/posts.mdwn
index fa2dbef0e..08e014838 100644
--- a/doc/examples/blog/posts.mdwn
+++ b/doc/examples/blog/posts.mdwn
@@ -1,3 +1,3 @@
 Here is a full list of posts to the [[blog|index]].
 
-[[!inline pages="./posts/* and !*/Discussion" archive=yes feedshow=10 quick=yes]]
+[[!inline pages="page(./posts/*) and !*/Discussion" archive=yes feedshow=10 quick=yes]]
-- 
cgit v1.2.3


From ad858475e774672c8805cb91431f0b7cb5c2da8d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 14:17:23 -0400
Subject: match only pages in calendar

---
 doc/examples/blog/sidebar.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/examples/blog')

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index 5c1f17723..e0895f63f 100644
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -1,5 +1,5 @@
 [[!if test="enabled(calendar)" then="""
-[[!calendar pages="./posts/* and !*/Discussion"]]
+[[!calendar pages="page(./posts/*) and !*/Discussion"]]
 """]]
 
 [[Recent Comments|comments]]
-- 
cgit v1.2.3


From 29fd100e9f4e71fb85505d932184ffd5e3f26242 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Jun 2010 20:53:58 -0400
Subject: Use comment template on comments page of example blog.

---
 debian/changelog                | 1 +
 doc/examples/blog/comments.mdwn | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc/examples/blog')

diff --git a/debian/changelog b/debian/changelog
index 15ae21a55..0697efffd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
     (Make it relative like everything else.)
   * hnb: Fixed broken use of mkstemp that had caused dangling temp files,
     and prevented actually rendering hnb files.
+  * Use comment template on comments page of example blog.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index f59b44390..52c7d3132 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -6,4 +6,5 @@ Comments in the moderation queue:
 """]]
 
 Recent comments on posts in the [[blog|index]]:
-[[!inline pages="./posts/*/Discussion or comment(./posts/*)"]]
+[[!inline pages="./posts/*/Discussion or comment(./posts/*)"
+template="comment"]]
-- 
cgit v1.2.3


From 7e3fb8b8a230a725df7814c15745c6fee9ddd5b1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 5 Jul 2010 20:19:31 -0400
Subject: comments: Added commentmoderation directive for easy linking to the
 comment moderation queue.

---
 IkiWiki/Plugin/comments.pm                   | 17 +++++++++++++++++
 debian/changelog                             |  2 ++
 doc/examples/blog/comments.mdwn              |  2 +-
 doc/ikiwiki/directive/commentmoderation.mdwn |  9 +++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 doc/ikiwiki/directive/commentmoderation.mdwn

(limited to 'doc/examples/blog')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 30ade5634..f0eec9ace 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -22,6 +22,7 @@ sub import {
 	hook(type => "checkconfig", id => 'comments',  call => \&checkconfig);
 	hook(type => "getsetup", id => 'comments',  call => \&getsetup);
 	hook(type => "preprocess", id => 'comment', call => \&preprocess);
+	hook(type => "preprocess", id => 'commentmoderation', call => \&preprocess_moderation);
 	# here for backwards compatability with old comments
 	hook(type => "preprocess", id => '_comment', call => \&preprocess);
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
@@ -251,6 +252,22 @@ sub preprocess {
 	return $content;
 }
 
+sub preprocess_moderation {
+	my %params = @_;
+
+	$params{desc}=gettext("Comment Moderation")
+		unless defined $params{desc};
+
+	if (length $config{cgiurl}) {
+		return '<a href="'.
+			IkiWiki::cgiurl(do => 'commentmoderation').
+			'">'.$params{desc}.'</a>';
+	}
+	else {
+		return $params{desc};
+	}
+}
+
 sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
diff --git a/debian/changelog b/debian/changelog
index d426be019..18db7c0c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20100705) UNRELEASED; urgency=low
 
   * img: Add a margin around images displayed by this directive.
+  * comments: Added commentmoderation directive for easy linking to the
+    comment moderation queue.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 52c7d3132..e22b50a34 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,7 +1,7 @@
 [[!sidebar content="""
 [[!inline pages="comment_pending(./posts/*)" feedfile=pendingmoderation
 description="comments pending moderation" show=-1]]
-Comments in the moderation queue:
+Comments in the [[!commentmoderation desc="moderation queue"]]:
 [[!pagecount pages="comment_pending(./posts/*)"]]
 """]]
 
diff --git a/doc/ikiwiki/directive/commentmoderation.mdwn b/doc/ikiwiki/directive/commentmoderation.mdwn
new file mode 100644
index 000000000..8553b5b17
--- /dev/null
+++ b/doc/ikiwiki/directive/commentmoderation.mdwn
@@ -0,0 +1,9 @@
+The `commentmoderation` directive is supplied by the
+[[!iki plugins/comments desc=comments]] plugin, and is used to link
+to the comment moderation queue.
+
+Example:
+
+	\[[!commentmoderation desc="here is the comment moderation queue"]]
+
+[[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3