From fdd994fb7365308bde162b72b280512f2db6a339 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 14:15:52 -0500
Subject: more comments doc updates

Moved todo items to a todo page, mark the old todo item about comments as
done, etc.
---
 doc/todo/comments.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/todo/comments.mdwn

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
new file mode 100644
index 000000000..adc302a25
--- /dev/null
+++ b/doc/todo/comments.mdwn
@@ -0,0 +1,8 @@
+Known issues with the [[plugins/comments]] plugin:
+
+* There is some common code cargo-culted from other plugins (notably inline and editpage) which
+  should probably be shared
+* Previews always say "unknown IP address"
+* Add `COMMENTOPENID`: the authenticated/verified user name, if and only if it was an OpenID
+* The default template should have a (?) icon next to unauthenticated users (with the IP address
+  as title) and an OpenID icon next to OpenIDs
-- 
cgit v1.2.3


From 8614abce09f6e4338c10ea1c2d8950fcebbf5869 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 19:47:54 -0500
Subject: two comments ui suggestions

---
 doc/todo/comments.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index adc302a25..38c61287c 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -6,3 +6,8 @@ Known issues with the [[plugins/comments]] plugin:
 * Add `COMMENTOPENID`: the authenticated/verified user name, if and only if it was an OpenID
 * The default template should have a (?) icon next to unauthenticated users (with the IP address
   as title) and an OpenID icon next to OpenIDs
+* Should the comments be visually set off more from the page above?
+  Rather than just a horizontal rule, I'm thinking put the comments
+  in a box like is used for inlined pages.
+* Instead of just a link to add a comment, it could have a form to enter
+  the title, similar to the form for adding a new blog post.
-- 
cgit v1.2.3


From 1074d38f0dc55e74979e4013d4a0d9953a89fa50 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 17 Dec 2008 20:40:46 -0500
Subject: deletion

---
 doc/todo/comments.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 38c61287c..ee158e53c 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -11,3 +11,7 @@ Known issues with the [[plugins/comments]] plugin:
   in a box like is used for inlined pages.
 * Instead of just a link to add a comment, it could have a form to enter
   the title, similar to the form for adding a new blog post.
+* If a spammer posts a comment, it is either impossible or hard to clean
+  up via the web. Would be nice to have some kind of link on the comment
+  that allows trusted users to remove it (using the remove plugin of
+  course).
-- 
cgit v1.2.3


From 835801a6ff13b23cf96b2d080805c095f7110315 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 18 Dec 2008 12:32:23 -0500
Subject: note about comments feed

---
 doc/todo/comments.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index ee158e53c..f5b580da2 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -15,3 +15,10 @@ Known issues with the [[plugins/comments]] plugin:
   up via the web. Would be nice to have some kind of link on the comment
   that allows trusted users to remove it (using the remove plugin of
   course).
+* One can use inline to set up a feed of all comments posted to any page.
+  Using template=comments_display they are displayed right. Only problem
+  is there is no indication in that template of what page each comment in the
+  feed is a comment on. So, if a comment is inlined into a different page,
+  I think it should show a link back to the page commented on.
+  (BTW, the rss feed in this situation seems ok; there the link element
+  points back to the parent page.
-- 
cgit v1.2.3


From b2439a3e5193022c7ed52a726dd5906643ca45c7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 18 Dec 2008 12:53:47 -0500
Subject: pagespec thoughts

---
 doc/todo/comments.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index f5b580da2..c571b8c56 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -22,3 +22,8 @@ Known issues with the [[plugins/comments]] plugin:
   I think it should show a link back to the page commented on.
   (BTW, the rss feed in this situation seems ok; there the link element
   points back to the parent page.
+* It would be useful to have a pagespec that always matches all comments on 
+  pages matching a glob. Something like `comment(blog/*)`.
+  Perhaps postcomment could also be folded into this? Then the pagespec
+  would match both existing comments, as well as new comments that are
+  being posted.
-- 
cgit v1.2.3


From a115ff254dd97a182b8ca21609e8453a514c3d25 Mon Sep 17 00:00:00 2001
From: "smcv@" <smcv@>
Date: Thu, 18 Dec 2008 21:08:33 +0000
Subject: Update todo/comments with today's fixes, and thoughts about the
 remaining items

---
 doc/todo/comments.mdwn | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index c571b8c56..6a4b40332 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -2,19 +2,47 @@ Known issues with the [[plugins/comments]] plugin:
 
 * There is some common code cargo-culted from other plugins (notably inline and editpage) which
   should probably be shared
+
+  > Actually, there's less of this now than there used to be - a lot of simple
+  > things that were shared have become unshareable as they became more
+  > complex. --[[smcv]]
+
 * Previews always say "unknown IP address"
+
 * Add `COMMENTOPENID`: the authenticated/verified user name, if and only if it was an OpenID
+
+  > Done in my comments git branch --[[smcv]]
+
 * The default template should have a (?) icon next to unauthenticated users (with the IP address
   as title) and an OpenID icon next to OpenIDs
+
+  > Done in my comments git branch, at least as a mockup (using the (?),
+  > {x} and {*} smileys for anonymous, OpenID and login respectively).
+  > --[[smcv]]
+
 * Should the comments be visually set off more from the page above?
   Rather than just a horizontal rule, I'm thinking put the comments
   in a box like is used for inlined pages.
+
+  > I did put them in a box in the CSS... I agree the default template
+  > could do with visual improvement though. --[[smcv]]
+
 * Instead of just a link to add a comment, it could have a form to enter
   the title, similar to the form for adding a new blog post.
+
+  > I'm not sure this is so useful? On Livejournal titles are allowed on
+  > comments, but very rarely used (and indeed usually not very useful);
+  > it's hard enough to get some people to title their blog posts :-)
+  > --[[smcv]]
+
 * If a spammer posts a comment, it is either impossible or hard to clean
   up via the web. Would be nice to have some kind of link on the comment
   that allows trusted users to remove it (using the remove plugin of
   course).
+
+  > Won't the remove plugin refuse to remove internal pages? This would be
+  > a good feature to have, though. --[[smcv]]
+
 * One can use inline to set up a feed of all comments posted to any page.
   Using template=comments_display they are displayed right. Only problem
   is there is no indication in that template of what page each comment in the
@@ -22,8 +50,30 @@ Known issues with the [[plugins/comments]] plugin:
   I think it should show a link back to the page commented on.
   (BTW, the rss feed in this situation seems ok; there the link element
   points back to the parent page.
+
 * It would be useful to have a pagespec that always matches all comments on 
   pages matching a glob. Something like `comment(blog/*)`.
   Perhaps postcomment could also be folded into this? Then the pagespec
   would match both existing comments, as well as new comments that are
   being posted.
+
+  > Please see [[plugins/comment/discussion]]. If I've convinced you that
+  > internal pages are the way forward, then sure, we can do that, because
+  > people who can comment still won't be able to edit others' comments
+  > (one of my goals is that commenters can't put words into each other's
+  > mouths :-) )
+  >
+  > On the other hand, if you still want me to switch this plugin to "real"
+  > pages, or if internal pages might become editable in future, then
+  > configuring lockedit/anonok so a user X can add comments to blog pages
+  > would also let X edit/delete comments on blog pages (including those
+  > written by others) in arbitrary ways, which doesn't seem good. --[[smcv]]
+
+* One of Joey's commit messages says "Not ideal, it would be nicer to jump to
+  the actual comment posted, but no anchor is available". In fact there is
+  an anchor - the `\[[_comment]]` preprocessing wraps the comment in a <div>
+  with id="comment_123" or something. I'll fix this, unless Joey gets there
+  first. --[[smcv]]
+
+* Now that inline has some comments-specific functionality anyway, it would
+  be good to output <link rel="comments"> in Atom and the equivalent in RSS.
-- 
cgit v1.2.3


From 1d82ac40d48d0d07aed8a596a90f060f03fdb0b0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 18 Dec 2008 20:10:42 -0500
Subject: responses

---
 doc/todo/comments.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 6a4b40332..c81947e74 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -13,6 +13,8 @@ Known issues with the [[plugins/comments]] plugin:
 
   > Done in my comments git branch --[[smcv]]
 
+  > Not seeing it there, which branch? --[[Joey]] 
+
 * The default template should have a (?) icon next to unauthenticated users (with the IP address
   as title) and an OpenID icon next to OpenIDs
 
@@ -69,6 +71,10 @@ Known issues with the [[plugins/comments]] plugin:
   > would also let X edit/delete comments on blog pages (including those
   > written by others) in arbitrary ways, which doesn't seem good. --[[smcv]]
 
+  > I had a look at implementing comment() and fell afoul of 
+  > some optimisations that assume only internal() will be used to match
+  > internal pages. So probably this isn't worth doing. --[[Joey]] 
+
 * One of Joey's commit messages says "Not ideal, it would be nicer to jump to
   the actual comment posted, but no anchor is available". In fact there is
   an anchor - the `\[[_comment]]` preprocessing wraps the comment in a <div>
-- 
cgit v1.2.3


From 7521dd6c7571cba4a3b882ecffc02dbcbed2805e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 18 Dec 2008 20:58:16 -0500
Subject: jump to comment after posting

Jumping to the just posted comment was the imputus, but I killed a number
of birds here.

Added a INLINEPAGE template variable, which can be used to add anchors to
any inline template.

To keep that sufficiently general, it is the full page name, so the
comment anchors and links changed form.

Got rid of the FIXMEd hardcoded html anchor div.

More importantly, the anchor is now to the very top of the comment, not the
text below. So you can see the title, and how it attributes you.

Avoid changing the permalink of pages that are not really comments, but
happen to contain the _comment directive. I think that behavior was a bug,
though not a likely one to occur since _comment should only really be used
on comment pages.
---
 IkiWiki/Plugin/comments.pm      | 14 ++++----------
 IkiWiki/Plugin/inline.pm        |  1 +
 doc/todo/comments.mdwn          |  2 ++
 templates/comments_display.tmpl |  2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'doc/todo/comments.mdwn')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 2ca2d0a1d..3b8752894 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -193,12 +193,10 @@ sub preprocess {
 		$pagestate{$page}{meta}{title} = $params{subject};
 	}
 
-	my $baseurl = urlto($params{destpage}, undef, 1);
-	my $anchor = "";
 	if ($params{page} =~ m/\/(\Q$config{comments_pagename}\E\d+)$/) {
-		$anchor = $1;
+		$pagestate{$page}{meta}{permalink} = urlto($params{destpage}, undef, 1).
+			"#".$params{page};
 	}
-	$pagestate{$page}{meta}{permalink} = "${baseurl}#${anchor}";
 
 	eval q{use Date::Parse};
 	if (! $@) {
@@ -206,8 +204,6 @@ sub preprocess {
 		$IkiWiki::pagectime{$page} = $time if defined $time;
 	}
 
-	# FIXME: hard-coded HTML (although it's just to set an ID)
-	return "<div id=\"$anchor\">$content</div>" if $anchor;
 	return $content;
 }
 
@@ -499,10 +495,8 @@ sub sessioncgi ($$) {
 		# breaks it or something
 		error($conflict) if defined $conflict;
 
-		# Bounce back to where we were, but defeat broken caches
-		# and jump to the comments anchor.
-		my $anticache = "?updated=$page/$config{comments_pagename}$i#comments";
-		IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
+		# Jump to the new comment on the page.
+		IkiWiki::redirect($cgi, urlto($page, undef, 1)."#$location");
 	}
 	else {
 		IkiWiki::showform ($form, \@buttons, $session, $cgi,
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index d37db97ec..8490b455f 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -340,6 +340,7 @@ sub preprocess_inline (@) {
 					$template->param(content => $content);
 				}
 				$template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
+				$template->param(inlinepage => $page);
 				$template->param(title => pagetitle(basename($page)));
 				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
 				$template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));
diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index c81947e74..2bcec69ba 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -81,5 +81,7 @@ Known issues with the [[plugins/comments]] plugin:
   with id="comment_123" or something. I'll fix this, unless Joey gets there
   first. --[[smcv]]
 
+  > done --[[Joey]] 
+
 * Now that inline has some comments-specific functionality anyway, it would
   be good to output <link rel="comments"> in Atom and the equivalent in RSS.
diff --git a/templates/comments_display.tmpl b/templates/comments_display.tmpl
index bc4b70273..e7e283bbf 100644
--- a/templates/comments_display.tmpl
+++ b/templates/comments_display.tmpl
@@ -1,4 +1,4 @@
-<div class="comments-display">
+<div class="comments-display" id="<TMPL_VAR NAME=INLINEPAGE>">
 
 <div class="comments-header">
 Posted by
-- 
cgit v1.2.3


From ddabb010b2c45556046fd1ba982893395c7a46f6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Dec 2008 14:03:26 -0500
Subject: rename comments_display to comment

---
 IkiWiki/Plugin/comments.pm      |  4 ++--
 doc/tips/comments_feed.mdwn     |  2 +-
 doc/todo/comments.mdwn          |  2 +-
 doc/wikitemplates.mdwn          |  2 +-
 templates/comment.tmpl          | 36 ++++++++++++++++++++++++++++++++++++
 templates/comments_display.tmpl | 36 ------------------------------------
 6 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 templates/comment.tmpl
 delete mode 100644 templates/comments_display.tmpl

(limited to 'doc/todo/comments.mdwn')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index fd9f0acb4..705ba340b 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -447,7 +447,7 @@ sub sessioncgi ($$) {
 					content => $preview);
 			});
 
-		my $template = template("comments_display.tmpl");
+		my $template = template("comment.tmpl");
 		$template->param(content => $preview);
 		$template->param(title => $form->field('subject'));
 		$template->param(ctime => displaytime(time));
@@ -538,7 +538,7 @@ sub pagetemplate (@) {
 		if ($shown) {
 			$comments = IkiWiki::preprocess_inline(
 				pages => "internal($page/$config{comments_pagename}*)",
-				template => 'comments_display',
+				template => 'comment',
 				show => 0,
 				reverse => 'yes',
 				page => $page,
diff --git a/doc/tips/comments_feed.mdwn b/doc/tips/comments_feed.mdwn
index 68513901e..6f8137256 100644
--- a/doc/tips/comments_feed.mdwn
+++ b/doc/tips/comments_feed.mdwn
@@ -3,7 +3,7 @@ blog can have comments added to them. Pages with comments even have special
 feeds that can be used to subscribe to those comments. But you'd like to
 add a feed that contains all the comments posted to any page. Here's how:
 
-	\[[!inline pages="internal(*/comment_*)" template=comments_display]]
+	\[[!inline pages="internal(*/comment_*)" template=comment]]
 
 The special [[ikiwiki/PageSpec]] matches all comments. The
 [[template|wikitemplates]] causes the comments to be displayed formatted
diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 2bcec69ba..ee2ba7ea0 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -46,7 +46,7 @@ Known issues with the [[plugins/comments]] plugin:
   > a good feature to have, though. --[[smcv]]
 
 * One can use inline to set up a feed of all comments posted to any page.
-  Using template=comments_display they are displayed right. Only problem
+  Using template=comment they are displayed right. Only problem
   is there is no indication in that template of what page each comment in the
   feed is a comment on. So, if a comment is inlined into a different page,
   I think it should show a link back to the page commented on.
diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
index 6fb4d5f49..63735193b 100644
--- a/doc/wikitemplates.mdwn
+++ b/doc/wikitemplates.mdwn
@@ -29,7 +29,7 @@ located in /usr/share/ikiwiki/templates by default.
   form to wiki pages.
 * `searchquery.tmpl` - This is an omega template, used by the
   [[plugins/search]] plugin.
-* `comments_display.tmpl` - This template is used to display a comment
+* `comment.tmpl` - This template is used to display a comment
   by the [[plugins/comments]] plugin.
 * `comments_form.tmpl` - This template is the comment post form for the
   [[plugins/comments]] plugin.
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
new file mode 100644
index 000000000..e7e283bbf
--- /dev/null
+++ b/templates/comment.tmpl
@@ -0,0 +1,36 @@
+<div class="comments-display" id="<TMPL_VAR NAME=INLINEPAGE>">
+
+<div class="comments-header">
+Posted by
+<TMPL_IF NAME="COMMENTUSER">
+<span class="author">
+<TMPL_IF NAME="COMMENTAUTHORURL">
+<a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR NAME=AUTHOR>
+</TMPL_IF>
+</span>
+<TMPL_ELSE>
+<TMPL_IF NAME=COMMENTIP>
+<span class="author">
+<TMPL_VAR NAME=COMMENTIP>
+</span>
+<TMPL_ELSE>
+unknown IP address
+</TMPL_IF>
+
+<TMPL_IF NAME=AUTHOR>
+(<span class="claimedauthor"><TMPL_IF NAME="AUTHORURL"><a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a><TMPL_ELSE><TMPL_VAR NAME=AUTHOR></TMPL_IF></span>)
+</TMPL_IF>
+</TMPL_IF>
+
+(<TMPL_VAR CTIME>)
+</div>
+
+<div class="comments-subject"><TMPL_VAR TITLE></div>
+
+<div class="inlinecontent">
+<TMPL_VAR CONTENT>
+</div>
+
+</div><!--.comments-display-->
diff --git a/templates/comments_display.tmpl b/templates/comments_display.tmpl
deleted file mode 100644
index e7e283bbf..000000000
--- a/templates/comments_display.tmpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="comments-display" id="<TMPL_VAR NAME=INLINEPAGE>">
-
-<div class="comments-header">
-Posted by
-<TMPL_IF NAME="COMMENTUSER">
-<span class="author">
-<TMPL_IF NAME="COMMENTAUTHORURL">
-<a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
-<TMPL_ELSE>
-<TMPL_VAR NAME=AUTHOR>
-</TMPL_IF>
-</span>
-<TMPL_ELSE>
-<TMPL_IF NAME=COMMENTIP>
-<span class="author">
-<TMPL_VAR NAME=COMMENTIP>
-</span>
-<TMPL_ELSE>
-unknown IP address
-</TMPL_IF>
-
-<TMPL_IF NAME=AUTHOR>
-(<span class="claimedauthor"><TMPL_IF NAME="AUTHORURL"><a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a><TMPL_ELSE><TMPL_VAR NAME=AUTHOR></TMPL_IF></span>)
-</TMPL_IF>
-</TMPL_IF>
-
-(<TMPL_VAR CTIME>)
-</div>
-
-<div class="comments-subject"><TMPL_VAR TITLE></div>
-
-<div class="inlinecontent">
-<TMPL_VAR CONTENT>
-</div>
-
-</div><!--.comments-display-->
-- 
cgit v1.2.3


From 091c7fd25bcc39069df9dd81941c5329f26b8988 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Dec 2008 14:20:07 -0500
Subject: add link from comment subject to its permalink

---
 doc/todo/comments.mdwn | 2 ++
 templates/comment.tmpl | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index ee2ba7ea0..a429be525 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -53,6 +53,8 @@ Known issues with the [[plugins/comments]] plugin:
   (BTW, the rss feed in this situation seems ok; there the link element
   points back to the parent page.
 
+  > done --[[Joey]] 
+
 * It would be useful to have a pagespec that always matches all comments on 
   pages matching a glob. Something like `comment(blog/*)`.
   Perhaps postcomment could also be folded into this? Then the pagespec
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index 9d223bd7f..19698cd33 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -27,7 +27,7 @@ unknown IP address
 (<TMPL_VAR CTIME>)
 </div>
 
-<div class="comment-subject"><TMPL_VAR TITLE></div>
+<div class="comment-subject"><a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a></div>
 
 <div class="inlinecontent">
 <TMPL_VAR CONTENT>
-- 
cgit v1.2.3


From 4ed092c05b3ba825a13da4460949bbcf990db8e1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Dec 2008 17:07:54 -0500
Subject: typos

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

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index a429be525..aa6b130dc 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -61,7 +61,7 @@ Known issues with the [[plugins/comments]] plugin:
   would match both existing comments, as well as new comments that are
   being posted.
 
-  > Please see [[plugins/comment/discussion]]. If I've convinced you that
+  > Please see [[plugins/comments/discussion]]. If I've convinced you that
   > internal pages are the way forward, then sure, we can do that, because
   > people who can comment still won't be able to edit others' comments
   > (one of my goals is that commenters can't put words into each other's
@@ -86,4 +86,4 @@ Known issues with the [[plugins/comments]] plugin:
   > done --[[Joey]] 
 
 * Now that inline has some comments-specific functionality anyway, it would
-  be good to output <link rel="comments"> in Atom and the equivalent in RSS.
+  be good to output '<link rel="comments">' in Atom and the equivalent in RSS.
-- 
cgit v1.2.3


From 0b002b79b7241ea87ce3489b75a34116c32630e6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Dec 2008 17:26:41 -0500
Subject: update

---
 doc/todo/comments.mdwn |   4 +-
 po/es.po               | 150 +++++++++++++++++++++++--------------------------
 2 files changed, 72 insertions(+), 82 deletions(-)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index aa6b130dc..81c2f2722 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -53,7 +53,9 @@ Known issues with the [[plugins/comments]] plugin:
   (BTW, the rss feed in this situation seems ok; there the link element
   points back to the parent page.
 
-  > done --[[Joey]] 
+  > done
+  > Er, no, I added a link but it does not go back to the parent page of a
+  > comment if the comment is inlined elsewhere. --[[Joey]] 
 
 * It would be useful to have a pagespec that always matches all comments on 
   pages matching a glob. Something like `comment(blog/*)`.
diff --git a/po/es.po b/po/es.po
index 02fda1e71..4e54ef276 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-19 08:04+0100\n"
+"POT-Creation-Date: 2008-12-11 14:46-0500\n"
 "PO-Revision-Date: 2008-12-19 08:10+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -24,7 +24,7 @@ msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:350
 msgid "Your login session has expired."
 msgstr "Su registro en el sistema ha expirado."
 
@@ -48,7 +48,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1204
 msgid "Error"
 msgstr "Error"
 
@@ -66,62 +66,62 @@ msgstr ""
 msgid "missing %s parameter"
 msgstr "falta el parámetro %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:251
+#: ../IkiWiki/Plugin/aggregate.pm:250
 msgid "new feed"
 msgstr "nueva entrada"
 
-#: ../IkiWiki/Plugin/aggregate.pm:265
+#: ../IkiWiki/Plugin/aggregate.pm:264
 msgid "posts"
 msgstr "entradas"
 
-#: ../IkiWiki/Plugin/aggregate.pm:267
+#: ../IkiWiki/Plugin/aggregate.pm:266
 msgid "new"
 msgstr "nuevo"
 
-#: ../IkiWiki/Plugin/aggregate.pm:430
+#: ../IkiWiki/Plugin/aggregate.pm:429
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "%s caducada (%s días de antigüedad)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:437
+#: ../IkiWiki/Plugin/aggregate.pm:436
 #, perl-format
 msgid "expiring %s"
 msgstr "%s caducada"
 
-#: ../IkiWiki/Plugin/aggregate.pm:464
+#: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
 msgid "last checked %s"
 msgstr "última comprobación el %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:468
+#: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "comprobando fuente de datos %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:473
+#: ../IkiWiki/Plugin/aggregate.pm:472
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "no puedo encontrar la fuente de datos en %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:492
+#: ../IkiWiki/Plugin/aggregate.pm:487
 msgid "feed not found"
 msgstr "fuente de datos no encontrada"
 
-#: ../IkiWiki/Plugin/aggregate.pm:503
+#: ../IkiWiki/Plugin/aggregate.pm:498
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(una secuencia UTF-8 inválida ha sido eliminada de la fuente de datos)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:511
+#: ../IkiWiki/Plugin/aggregate.pm:506
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(los caracteres especiales de la fuente de datos están exceptuados)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:519
+#: ../IkiWiki/Plugin/aggregate.pm:514
 msgid "feed crashed XML::Feed!"
 msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !"
 
-#: ../IkiWiki/Plugin/aggregate.pm:600
+#: ../IkiWiki/Plugin/aggregate.pm:595
 #, perl-format
 msgid "creating new page %s"
 msgstr "creando nueva página %s"
@@ -173,7 +173,7 @@ msgid "automatic index generation"
 msgstr "creación de índice automática"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261
-#: ../IkiWiki/Plugin/inline.pm:354 ../IkiWiki/Plugin/opendiscussion.pm:26
+#: ../IkiWiki/Plugin/inline.pm:344 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
 msgid "discussion"
@@ -188,60 +188,6 @@ msgstr "%s desde la página %s"
 msgid "There are no broken links!"
 msgstr "¡ No hay enlaces rotos !"
 
-#: ../IkiWiki/Plugin/comments.pm:119 ../IkiWiki/Plugin/format.pm:23
-#, perl-format
-msgid "unsupported page format %s"
-msgstr "formato de página %s no soportado"
-
-#: ../IkiWiki/Plugin/comments.pm:124
-msgid "comment must have content"
-msgstr "Un comentario debe tener algún contenido"
-
-#: ../IkiWiki/Plugin/comments.pm:164
-msgid "Anonymous"
-msgstr "Anónimo"
-
-#: ../IkiWiki/Plugin/comments.pm:225 ../IkiWiki/Plugin/recentchanges.pm:101
-msgid "missing page"
-msgstr "página no encontrada"
-
-#: ../IkiWiki/Plugin/comments.pm:227 ../IkiWiki/Plugin/recentchanges.pm:103
-#, perl-format
-msgid "The page %s does not exist."
-msgstr "No existe la página %s."
-
-#: ../IkiWiki/Plugin/comments.pm:339 ../IkiWiki/Plugin/editpage.pm:125
-msgid "bad page name"
-msgstr "nombre de página erróneo"
-
-#: ../IkiWiki/Plugin/comments.pm:346
-#, perl-format
-msgid "commenting on %s"
-msgstr "creando comentarios en la página %s"
-
-#: ../IkiWiki/Plugin/comments.pm:364
-#, perl-format
-msgid "page '%s' doesn't exist, so you can't comment"
-msgstr "la página '%s' no existe, así que no se puede comentar sobre ella"
-
-#: ../IkiWiki/Plugin/comments.pm:371
-#, perl-format
-msgid "comments on page '%s' are closed"
-msgstr "los comentarios para la página '%s' están cerrados"
-
-#: ../IkiWiki/Plugin/comments.pm:473
-msgid "Added a comment"
-msgstr "Añadir un comentario"
-
-#: ../IkiWiki/Plugin/comments.pm:477
-#, perl-format
-msgid "Added a comment: %s"
-msgstr "Comentario añadido: %s"
-
-#: ../IkiWiki/Plugin/comments.pm:569
-msgid "Comments"
-msgstr "Comentarios"
-
 #: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
 #: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
 #: ../IkiWiki/Plugin/testpagespec.pm:26
@@ -263,6 +209,10 @@ msgstr "no se ha copiado ningún texto con el identificador %s en esta pagina"
 msgid "removing old preview %s"
 msgstr "eliminando la antigua previsualización %s"
 
+#: ../IkiWiki/Plugin/editpage.pm:125
+msgid "bad page name"
+msgstr "nombre de página erróneo"
+
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
 msgid "%s is not an editable page"
@@ -273,9 +223,9 @@ msgstr "la página %s no es modificable"
 msgid "creating %s"
 msgstr "creando página %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:335 ../IkiWiki/Plugin/editpage.pm:354
-#: ../IkiWiki/Plugin/editpage.pm:364 ../IkiWiki/Plugin/editpage.pm:399
-#: ../IkiWiki/Plugin/editpage.pm:444
+#: ../IkiWiki/Plugin/editpage.pm:335 ../IkiWiki/Plugin/editpage.pm:363
+#: ../IkiWiki/Plugin/editpage.pm:373 ../IkiWiki/Plugin/editpage.pm:408
+#: ../IkiWiki/Plugin/editpage.pm:453
 #, perl-format
 msgid "editing %s"
 msgstr "modificando página %s"
@@ -301,6 +251,11 @@ msgstr "fallo en el proceso"
 msgid "must specify format and text"
 msgstr "se deben especificar tanto el formato como el texto"
 
+#: ../IkiWiki/Plugin/format.pm:23
+#, perl-format
+msgid "unsupported page format %s"
+msgstr "formato de página %s no soportado"
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "el programa fortune ha fallado"
@@ -389,20 +344,20 @@ msgstr "falta el parámetro pages"
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki/Plugin/inline.pm:307
+#: ../IkiWiki/Plugin/inline.pm:297
 msgid "Add a new post titled:"
 msgstr "Añadir una entrada nueva titulada:"
 
-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:318
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "la plantilla %s no existe "
 
-#: ../IkiWiki/Plugin/inline.pm:362 ../IkiWiki/Render.pm:83
+#: ../IkiWiki/Plugin/inline.pm:352 ../IkiWiki/Render.pm:83
 msgid "Discussion"
 msgstr "Comentarios"
 
-#: ../IkiWiki/Plugin/inline.pm:587
+#: ../IkiWiki/Plugin/inline.pm:577
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
 
@@ -427,15 +382,15 @@ msgstr ""
 "no he podido cargar el módulo Perl Markdown.pm (%s) ó no he podido ejecutar "
 "el programa /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:151
+#: ../IkiWiki/Plugin/meta.pm:150
 msgid "stylesheet not found"
 msgstr "hoja de estilo no encontrada "
 
-#: ../IkiWiki/Plugin/meta.pm:185
+#: ../IkiWiki/Plugin/meta.pm:184
 msgid "redir page not found"
 msgstr "falta la página a donde redirigir"
 
-#: ../IkiWiki/Plugin/meta.pm:198
+#: ../IkiWiki/Plugin/meta.pm:197
 msgid "redir cycle is not allowed"
 msgstr "ciclo de redirección no permitido"
 
@@ -622,6 +577,15 @@ msgstr "%s es un valor erróneo para un porcentaje"
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'"
 
+#: ../IkiWiki/Plugin/recentchanges.pm:101
+msgid "missing page"
+msgstr "página no encontrada"
+
+#: ../IkiWiki/Plugin/recentchanges.pm:103
+#, perl-format
+msgid "The page %s does not exist."
+msgstr "No existe la página %s."
+
 #: ../IkiWiki/Plugin/recentchangesdiff.pm:37
 msgid "(Diff truncated)"
 msgstr "(Lista de diferencias truncada)"
@@ -1058,6 +1022,30 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 
+#~ msgid "comment must have content"
+#~ msgstr "Un comentario debe tener algún contenido"
+
+#~ msgid "Anonymous"
+#~ msgstr "Anónimo"
+
+#~ msgid "commenting on %s"
+#~ msgstr "creando comentarios en la página %s"
+
+#~ msgid "page '%s' doesn't exist, so you can't comment"
+#~ msgstr "la página '%s' no existe, así que no se puede comentar sobre ella"
+
+#~ msgid "comments on page '%s' are closed"
+#~ msgstr "los comentarios para la página '%s' están cerrados"
+
+#~ msgid "Added a comment"
+#~ msgstr "Añadir un comentario"
+
+#~ msgid "Added a comment: %s"
+#~ msgstr "Comentario añadido: %s"
+
+#~ msgid "Comments"
+#~ msgstr "Comentarios"
+
 #~ msgid "processed ok at %s"
 #~ msgstr "proceso completado con éxito a %s"
 
-- 
cgit v1.2.3


From 301733ba13f8fdaf53df0a6058f92d305507a97f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Dec 2008 17:33:40 -0500
Subject: fix comment permalink to always point to comment parent page

---
 IkiWiki/Plugin/comments.pm | 2 +-
 doc/todo/comments.mdwn     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'doc/todo/comments.mdwn')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 50c048fee..c50729a34 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -194,7 +194,7 @@ sub preprocess {
 	}
 
 	if ($params{page} =~ m/\/(\Q$config{comments_pagename}\E\d+)$/) {
-		$pagestate{$page}{meta}{permalink} = urlto($params{destpage}, undef, 1).
+		$pagestate{$page}{meta}{permalink} = urlto(IkiWiki::dirname($params{page}), undef, 1).
 			"#".$params{page};
 	}
 
diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 81c2f2722..aa6b130dc 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -53,9 +53,7 @@ Known issues with the [[plugins/comments]] plugin:
   (BTW, the rss feed in this situation seems ok; there the link element
   points back to the parent page.
 
-  > done
-  > Er, no, I added a link but it does not go back to the parent page of a
-  > comment if the comment is inlined elsewhere. --[[Joey]] 
+  > done --[[Joey]] 
 
 * It would be useful to have a pagespec that always matches all comments on 
   pages matching a glob. Something like `comment(blog/*)`.
-- 
cgit v1.2.3


From 4b3d3f519d019f47087a62514799578de7cd7f2b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 20 Dec 2008 13:03:44 -0500
Subject:

---
 doc/todo/comments.mdwn | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index aa6b130dc..50fd89682 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -13,7 +13,10 @@ Known issues with the [[plugins/comments]] plugin:
 
   > Done in my comments git branch --[[smcv]]
 
-  > Not seeing it there, which branch? --[[Joey]] 
+  > Not seeing it there, which branch? --[[Joey]]
+
+  >> Bah, git push --all is not the default... 'comments' branch now (I've also rebased it).
+  >> Sorry, I'm on mobile Internet at the moment... --[[smcv]]
 
 * The default template should have a (?) icon next to unauthenticated users (with the IP address
   as title) and an OpenID icon next to OpenIDs
@@ -22,6 +25,9 @@ Known issues with the [[plugins/comments]] plugin:
   > {x} and {*} smileys for anonymous, OpenID and login respectively).
   > --[[smcv]]
 
+  >> I've improved this to use independent icons from the wikiicons
+  >> directory (untested!) --[[smcv]]
+
 * Should the comments be visually set off more from the page above?
   Rather than just a horizontal rule, I'm thinking put the comments
   in a box like is used for inlined pages.
-- 
cgit v1.2.3


From 7bf121889b96dd8c9f372d366a6c801830850ad6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 20 Dec 2008 18:18:19 -0500
Subject: note new bug

---
 doc/todo/comments.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 50fd89682..3a18d63b8 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -28,6 +28,9 @@ Known issues with the [[plugins/comments]] plugin:
   >> I've improved this to use independent icons from the wikiicons
   >> directory (untested!) --[[smcv]]
 
+  >>> The new code produces links like /wikiisons/openid.png, which
+  >>> fail if ikiwiki is not at the root of the web server. --[[Joey]] 
+
 * Should the comments be visually set off more from the page above?
   Rather than just a horizontal rule, I'm thinking put the comments
   in a box like is used for inlined pages.
-- 
cgit v1.2.3


From 6042e607f33966279f1360d42e46dd0bf7e439e8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 20 Dec 2008 18:51:09 -0500
Subject: alternate idea

---
 doc/todo/comments.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 3a18d63b8..12aef0bb3 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -31,6 +31,13 @@ Known issues with the [[plugins/comments]] plugin:
   >>> The new code produces links like /wikiisons/openid.png, which
   >>> fail if ikiwiki is not at the root of the web server. --[[Joey]] 
 
+  >>> I got to wondering if the icons are needed. On my comments branch
+  >>> (not master), I've dropped the icons and info can be seen by hovering
+  >>> over the author's name. Idea being that you probably don't care how
+  >>> they authenticated unless something is weird, and in that case you
+  >>> can hover to check. Does that make sense, should I merge it?
+  >>> --[[Joey]] 
+
 * Should the comments be visually set off more from the page above?
   Rather than just a horizontal rule, I'm thinking put the comments
   in a box like is used for inlined pages.
-- 
cgit v1.2.3


From c85e7c1bf4ac95bdbe0f9e2b8dfdd038bda455d0 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 21 Dec 2008 04:31:49 -0500
Subject: fix markdown

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

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 12aef0bb3..119b0dafa 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -102,4 +102,4 @@ Known issues with the [[plugins/comments]] plugin:
   > done --[[Joey]] 
 
 * Now that inline has some comments-specific functionality anyway, it would
-  be good to output '<link rel="comments">' in Atom and the equivalent in RSS.
+  be good to output `<link rel="comments">` in Atom and the equivalent in RSS.
-- 
cgit v1.2.3


From ee24feece09422efdec7dce54b5fcbfc5ad2a5f1 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Dec 2008 10:08:53 +0000
Subject: comments: note fixed things and recommend merging origin/comments

---
 doc/todo/comments.mdwn | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 119b0dafa..cbc982772 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -18,6 +18,8 @@ Known issues with the [[plugins/comments]] plugin:
   >> Bah, git push --all is not the default... 'comments' branch now (I've also rebased it).
   >> Sorry, I'm on mobile Internet at the moment... --[[smcv]]
 
+  >>> merged by [[Joey]] in commit 0f03af38 --[[smcv]]
+
 * The default template should have a (?) icon next to unauthenticated users (with the IP address
   as title) and an OpenID icon next to OpenIDs
 
@@ -29,14 +31,27 @@ Known issues with the [[plugins/comments]] plugin:
   >> directory (untested!) --[[smcv]]
 
   >>> The new code produces links like /wikiisons/openid.png, which
-  >>> fail if ikiwiki is not at the root of the web server. --[[Joey]] 
+  >>> fail if ikiwiki is not at the root of the web server. --[[Joey]]
+
+  >>>> Sorry, I should have spotted that (the assumption failed on my demo
+  >>>> site, but the push to that site was when I was on the way out, so I
+  >>>> didn't have time to investigate). As a note for other ikiwiki hackers,
+  >>>> I should have used 
+  >>>> `<img src="<TMPL_VAR NAME=BASEURL>wikiicons/openid.png" />`. --[[smcv]]
 
   >>> I got to wondering if the icons are needed. On my comments branch
   >>> (not master), I've dropped the icons and info can be seen by hovering
   >>> over the author's name. Idea being that you probably don't care how
   >>> they authenticated unless something is weird, and in that case you
   >>> can hover to check. Does that make sense, should I merge it?
-  >>> --[[Joey]] 
+  >>> --[[Joey]]
+
+  >>>> Yeah, go ahead. I preferred my layout with the author before the
+  >>>> comment - perhaps that's Livejournal's influence :-) - but I can always
+  >>>> edit the templates for my own site. As long as the default is something
+  >>>> reasonable and both layouts are possible, I don't really mind.
+  >>>> Minimizing the number of "resource" files in the basewiki also seems
+  >>>> a good goal. --[[smcv]]
 
 * Should the comments be visually set off more from the page above?
   Rather than just a horizontal rule, I'm thinking put the comments
@@ -45,6 +60,8 @@ Known issues with the [[plugins/comments]] plugin:
   > I did put them in a box in the CSS... I agree the default template
   > could do with visual improvement though. --[[smcv]]
 
+  >> I'll consider this solved by [[Joey]]'s changes. --[[smcv]]
+
 * Instead of just a link to add a comment, it could have a form to enter
   the title, similar to the form for adding a new blog post.
 
-- 
cgit v1.2.3


From 2884d20950681fac16390f61da11afe44508f2cd Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Dec 2008 10:11:48 +0000
Subject: todo/comments: reorganise by status

---
 doc/todo/comments.mdwn | 114 ++++++++++++++++++++++++++-----------------------
 1 file changed, 61 insertions(+), 53 deletions(-)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index cbc982772..33d688ab3 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -1,24 +1,29 @@
-Known issues with the [[plugins/comments]] plugin:
+# Known issues with the [[plugins/comments]] plugin
 
-* There is some common code cargo-culted from other plugins (notably inline and editpage) which
-  should probably be shared
-
-  > Actually, there's less of this now than there used to be - a lot of simple
-  > things that were shared have become unshareable as they became more
-  > complex. --[[smcv]]
+## Unimplemented
 
 * Previews always say "unknown IP address"
 
-* Add `COMMENTOPENID`: the authenticated/verified user name, if and only if it was an OpenID
+* Instead of just a link to add a comment, it could have a form to enter
+  the title, similar to the form for adding a new blog post.
 
-  > Done in my comments git branch --[[smcv]]
+  > I'm not sure this is so useful? On Livejournal titles are allowed on
+  > comments, but very rarely used (and indeed usually not very useful);
+  > it's hard enough to get some people to title their blog posts :-)
+  > --[[smcv]]
 
-  > Not seeing it there, which branch? --[[Joey]]
+* If a spammer posts a comment, it is either impossible or hard to clean
+  up via the web. Would be nice to have some kind of link on the comment
+  that allows trusted users to remove it (using the remove plugin of
+  course).
 
-  >> Bah, git push --all is not the default... 'comments' branch now (I've also rebased it).
-  >> Sorry, I'm on mobile Internet at the moment... --[[smcv]]
+  > Won't the remove plugin refuse to remove internal pages? This would be
+  > a good feature to have, though. --[[smcv]]
 
-  >>> merged by [[Joey]] in commit 0f03af38 --[[smcv]]
+* Now that inline has some comments-specific functionality anyway, it would
+  be good to output `<link rel="comments">` in Atom and the equivalent in RSS.
+
+## Patches pending merge
 
 * The default template should have a (?) icon next to unauthenticated users (with the IP address
   as title) and an OpenID icon next to OpenIDs
@@ -36,7 +41,7 @@ Known issues with the [[plugins/comments]] plugin:
   >>>> Sorry, I should have spotted that (the assumption failed on my demo
   >>>> site, but the push to that site was when I was on the way out, so I
   >>>> didn't have time to investigate). As a note for other ikiwiki hackers,
-  >>>> I should have used 
+  >>>> I should have used
   >>>> `<img src="<TMPL_VAR NAME=BASEURL>wikiicons/openid.png" />`. --[[smcv]]
 
   >>> I got to wondering if the icons are needed. On my comments branch
@@ -53,42 +58,16 @@ Known issues with the [[plugins/comments]] plugin:
   >>>> Minimizing the number of "resource" files in the basewiki also seems
   >>>> a good goal. --[[smcv]]
 
-* Should the comments be visually set off more from the page above?
-  Rather than just a horizontal rule, I'm thinking put the comments
-  in a box like is used for inlined pages.
-
-  > I did put them in a box in the CSS... I agree the default template
-  > could do with visual improvement though. --[[smcv]]
-
-  >> I'll consider this solved by [[Joey]]'s changes. --[[smcv]]
-
-* Instead of just a link to add a comment, it could have a form to enter
-  the title, similar to the form for adding a new blog post.
-
-  > I'm not sure this is so useful? On Livejournal titles are allowed on
-  > comments, but very rarely used (and indeed usually not very useful);
-  > it's hard enough to get some people to title their blog posts :-)
-  > --[[smcv]]
-
-* If a spammer posts a comment, it is either impossible or hard to clean
-  up via the web. Would be nice to have some kind of link on the comment
-  that allows trusted users to remove it (using the remove plugin of
-  course).
-
-  > Won't the remove plugin refuse to remove internal pages? This would be
-  > a good feature to have, though. --[[smcv]]
+## Won't fix
 
-* One can use inline to set up a feed of all comments posted to any page.
-  Using template=comment they are displayed right. Only problem
-  is there is no indication in that template of what page each comment in the
-  feed is a comment on. So, if a comment is inlined into a different page,
-  I think it should show a link back to the page commented on.
-  (BTW, the rss feed in this situation seems ok; there the link element
-  points back to the parent page.
+* There is some common code cargo-culted from other plugins (notably inline and editpage) which
+  should probably be shared
 
-  > done --[[Joey]] 
+  > Actually, there's less of this now than there used to be - a lot of simple
+  > things that were shared have become unshareable as they became more
+  > complex. --[[smcv]]
 
-* It would be useful to have a pagespec that always matches all comments on 
+* It would be useful to have a pagespec that always matches all comments on
   pages matching a glob. Something like `comment(blog/*)`.
   Perhaps postcomment could also be folded into this? Then the pagespec
   would match both existing comments, as well as new comments that are
@@ -106,9 +85,41 @@ Known issues with the [[plugins/comments]] plugin:
   > would also let X edit/delete comments on blog pages (including those
   > written by others) in arbitrary ways, which doesn't seem good. --[[smcv]]
 
-  > I had a look at implementing comment() and fell afoul of 
+  > I had a look at implementing comment() and fell afoul of
   > some optimisations that assume only internal() will be used to match
-  > internal pages. So probably this isn't worth doing. --[[Joey]] 
+  > internal pages. So probably this isn't worth doing. --[[Joey]]
+
+## Done
+
+* Add `COMMENTOPENID`: the authenticated/verified user name, if and only if it was an OpenID
+
+  > Done in my comments git branch --[[smcv]]
+
+  > Not seeing it there, which branch? --[[Joey]]
+
+  >> Bah, git push --all is not the default... 'comments' branch now (I've also rebased it).
+  >> Sorry, I'm on mobile Internet at the moment... --[[smcv]]
+
+  >>> merged by [[Joey]] in commit 0f03af38 --[[smcv]]
+
+* Should the comments be visually set off more from the page above?
+  Rather than just a horizontal rule, I'm thinking put the comments
+  in a box like is used for inlined pages.
+
+  > I did put them in a box in the CSS... I agree the default template
+  > could do with visual improvement though. --[[smcv]]
+
+  >> I'll consider this solved by [[Joey]]'s changes. --[[smcv]]
+
+* One can use inline to set up a feed of all comments posted to any page.
+  Using template=comment they are displayed right. Only problem
+  is there is no indication in that template of what page each comment in the
+  feed is a comment on. So, if a comment is inlined into a different page,
+  I think it should show a link back to the page commented on.
+  (BTW, the rss feed in this situation seems ok; there the link element
+  points back to the parent page.
+
+  > done --[[Joey]]
 
 * One of Joey's commit messages says "Not ideal, it would be nicer to jump to
   the actual comment posted, but no anchor is available". In fact there is
@@ -116,7 +127,4 @@ Known issues with the [[plugins/comments]] plugin:
   with id="comment_123" or something. I'll fix this, unless Joey gets there
   first. --[[smcv]]
 
-  > done --[[Joey]] 
-
-* Now that inline has some comments-specific functionality anyway, it would
-  be good to output `<link rel="comments">` in Atom and the equivalent in RSS.
+  > done --[[Joey]]
-- 
cgit v1.2.3


From bd80ca37d541f33d04f61a910e49086698e8b34e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Dec 2008 10:16:58 +0000
Subject: todo/comments: Properly escape inline HTML

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

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 33d688ab3..4edc3c3a1 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -123,7 +123,7 @@
 
 * One of Joey's commit messages says "Not ideal, it would be nicer to jump to
   the actual comment posted, but no anchor is available". In fact there is
-  an anchor - the `\[[_comment]]` preprocessing wraps the comment in a <div>
+  an anchor - the `\[[_comment]]` preprocessing wraps the comment in a `<div>`
   with id="comment_123" or something. I'll fix this, unless Joey gets there
   first. --[[smcv]]
 
-- 
cgit v1.2.3


From 7bdeee20329e1d1132fbc218c49da75c22f07b03 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Dec 2008 15:39:40 +0000
Subject: Record another couple of pending bugfixes

---
 doc/todo/comments.mdwn | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 4edc3c3a1..7e35a2619 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -2,8 +2,6 @@
 
 ## Unimplemented
 
-* Previews always say "unknown IP address"
-
 * Instead of just a link to add a comment, it could have a form to enter
   the title, similar to the form for adding a new blog post.
 
@@ -58,6 +56,17 @@
   >>>> Minimizing the number of "resource" files in the basewiki also seems
   >>>> a good goal. --[[smcv]]
 
+* Previews always say "unknown IP address"
+
+  > Fixed in my comments branch by commits bc66a00b and 95b3bbbf --[[smcv]]
+
+* The Comments link in the "toolbar" is to `index.html#comments`, not the
+  desired `./#comments`
+
+  > Fixed in my comments branch by commit 0844bd0b; commits 5b1cf21a
+  > and c42f174e fix another `beautify_urlpath` bug and add a regression test
+  > --[[smcv]]
+
 ## Won't fix
 
 * There is some common code cargo-culted from other plugins (notably inline and editpage) which
-- 
cgit v1.2.3


From ca1437c9e10dc940b94edb364ddfbb2083724182 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Dec 2008 17:18:43 +0000
Subject: Another comments improvement

---
 doc/todo/comments.mdwn | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 7e35a2619..a2c1deeb3 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -18,9 +18,6 @@
   > Won't the remove plugin refuse to remove internal pages? This would be
   > a good feature to have, though. --[[smcv]]
 
-* Now that inline has some comments-specific functionality anyway, it would
-  be good to output `<link rel="comments">` in Atom and the equivalent in RSS.
-
 ## Patches pending merge
 
 * The default template should have a (?) icon next to unauthenticated users (with the IP address
@@ -67,6 +64,11 @@
   > and c42f174e fix another `beautify_urlpath` bug and add a regression test
   > --[[smcv]]
 
+* Now that inline has some comments-specific functionality anyway, it would
+  be good to output `<link rel="comments">` in Atom and the equivalent in RSS.
+
+  > Fixed in my comments branch by d0d598e4, 3feebe31, 9e5f504e --[[smcv]]
+
 ## Won't fix
 
 * There is some common code cargo-culted from other plugins (notably inline and editpage) which
-- 
cgit v1.2.3


From 041f8e3774dc129346622df26647e49d7aa85375 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 21 Dec 2008 13:08:26 -0500
Subject: more reorg

---
 doc/todo/comments.mdwn | 67 ++++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 32 deletions(-)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index a2c1deeb3..bab46a0b2 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -20,6 +20,41 @@
 
 ## Patches pending merge
 
+* There is some common code cargo-culted from other plugins (notably inline and editpage) which
+  should probably be shared
+
+  > Actually, there's less of this now than there used to be - a lot of simple
+  > things that were shared have become unshareable as they became more
+  > complex. --[[smcv]]
+
+  > There's still goto. You have a branch for that. --[[Joey]] 
+
+## Won't fix
+
+* It would be useful to have a pagespec that always matches all comments on
+  pages matching a glob. Something like `comment(blog/*)`.
+  Perhaps postcomment could also be folded into this? Then the pagespec
+  would match both existing comments, as well as new comments that are
+  being posted.
+
+  > Please see [[plugins/comments/discussion]]. If I've convinced you that
+  > internal pages are the way forward, then sure, we can do that, because
+  > people who can comment still won't be able to edit others' comments
+  > (one of my goals is that commenters can't put words into each other's
+  > mouths :-) )
+  >
+  > On the other hand, if you still want me to switch this plugin to "real"
+  > pages, or if internal pages might become editable in future, then
+  > configuring lockedit/anonok so a user X can add comments to blog pages
+  > would also let X edit/delete comments on blog pages (including those
+  > written by others) in arbitrary ways, which doesn't seem good. --[[smcv]]
+
+  > I had a look at implementing comment() and fell afoul of
+  > some optimisations that assume only internal() will be used to match
+  > internal pages. So probably this isn't worth doing. --[[Joey]]
+
+## Done
+
 * The default template should have a (?) icon next to unauthenticated users (with the IP address
   as title) and an OpenID icon next to OpenIDs
 
@@ -69,38 +104,6 @@
 
   > Fixed in my comments branch by d0d598e4, 3feebe31, 9e5f504e --[[smcv]]
 
-## Won't fix
-
-* There is some common code cargo-culted from other plugins (notably inline and editpage) which
-  should probably be shared
-
-  > Actually, there's less of this now than there used to be - a lot of simple
-  > things that were shared have become unshareable as they became more
-  > complex. --[[smcv]]
-
-* It would be useful to have a pagespec that always matches all comments on
-  pages matching a glob. Something like `comment(blog/*)`.
-  Perhaps postcomment could also be folded into this? Then the pagespec
-  would match both existing comments, as well as new comments that are
-  being posted.
-
-  > Please see [[plugins/comments/discussion]]. If I've convinced you that
-  > internal pages are the way forward, then sure, we can do that, because
-  > people who can comment still won't be able to edit others' comments
-  > (one of my goals is that commenters can't put words into each other's
-  > mouths :-) )
-  >
-  > On the other hand, if you still want me to switch this plugin to "real"
-  > pages, or if internal pages might become editable in future, then
-  > configuring lockedit/anonok so a user X can add comments to blog pages
-  > would also let X edit/delete comments on blog pages (including those
-  > written by others) in arbitrary ways, which doesn't seem good. --[[smcv]]
-
-  > I had a look at implementing comment() and fell afoul of
-  > some optimisations that assume only internal() will be used to match
-  > internal pages. So probably this isn't worth doing. --[[Joey]]
-
-## Done
 
 * Add `COMMENTOPENID`: the authenticated/verified user name, if and only if it was an OpenID
 
-- 
cgit v1.2.3


From 00e55ed171c1da5f6cca22cdb8aaab099dde9c09 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Dec 2008 22:31:22 -0500
Subject: 1st comment spam

---
 doc/todo/comments.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index bab46a0b2..832441be1 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -18,6 +18,11 @@
   > Won't the remove plugin refuse to remove internal pages? This would be
   > a good feature to have, though. --[[smcv]]
 
+  > Here, FWIW, is the first ikiwiki comment spam I've seen:
+  > <http://waldeneffect.org/blog/Snake_bite_information/#blog/Snake_bite_information/comment_1>
+  > So that took about 10 days...
+  > --[[Joey]] 
+
 ## Patches pending merge
 
 * There is some common code cargo-culted from other plugins (notably inline and editpage) which
-- 
cgit v1.2.3


From 81b87d41fb2efb5d5e1b365fcde7d5e2a2f7ce91 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 10 Jan 2009 11:41:41 +0000
Subject: Request review for my comments branch

Partially addresses [[todo/comments]]
---
 doc/todo/comments.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 832441be1..e8698f721 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -10,6 +10,8 @@
   > it's hard enough to get some people to title their blog posts :-)
   > --[[smcv]]
 
+## Patches pending merge
+
 * If a spammer posts a comment, it is either impossible or hard to clean
   up via the web. Would be nice to have some kind of link on the comment
   that allows trusted users to remove it (using the remove plugin of
@@ -23,7 +25,9 @@
   > So that took about 10 days...
   > --[[Joey]] 
 
-## Patches pending merge
+  >> Implemented in my 'comments' branch, please review. It turns out
+  >> [[plugins/remove]] is happy to remove internal pages, so it was quite
+  >> easy to do. --[[smcv]]
 
 * There is some common code cargo-culted from other plugins (notably inline and editpage) which
   should probably be shared
-- 
cgit v1.2.3


From af9566a6952905beff7f1ca9db64f01c3faf4ff2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 10 Jan 2009 14:17:27 -0500
Subject: comments: Add support for removing comments via web interface. (smcv)

---
 debian/changelog       |  1 +
 doc/todo/comments.mdwn | 36 +++++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'doc/todo/comments.mdwn')

diff --git a/debian/changelog b/debian/changelog
index 74556906e..61aee299d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.02) UNRELEASED; urgency=low
   * repolist: New plugin to support the rel=vcs-* microformat.
   * goodstuff: Include repolist by default. (But it does nothing until
     configured with the repository locations.)
+  * comments: Add support for removing comments via web interface. (smcv)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index e8698f721..c74ded8f6 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -12,23 +12,6 @@
 
 ## Patches pending merge
 
-* If a spammer posts a comment, it is either impossible or hard to clean
-  up via the web. Would be nice to have some kind of link on the comment
-  that allows trusted users to remove it (using the remove plugin of
-  course).
-
-  > Won't the remove plugin refuse to remove internal pages? This would be
-  > a good feature to have, though. --[[smcv]]
-
-  > Here, FWIW, is the first ikiwiki comment spam I've seen:
-  > <http://waldeneffect.org/blog/Snake_bite_information/#blog/Snake_bite_information/comment_1>
-  > So that took about 10 days...
-  > --[[Joey]] 
-
-  >> Implemented in my 'comments' branch, please review. It turns out
-  >> [[plugins/remove]] is happy to remove internal pages, so it was quite
-  >> easy to do. --[[smcv]]
-
 * There is some common code cargo-culted from other plugins (notably inline and editpage) which
   should probably be shared
 
@@ -151,3 +134,22 @@
   first. --[[smcv]]
 
   > done --[[Joey]]
+
+* If a spammer posts a comment, it is either impossible or hard to clean
+  up via the web. Would be nice to have some kind of link on the comment
+  that allows trusted users to remove it (using the remove plugin of
+  course).
+
+  > Won't the remove plugin refuse to remove internal pages? This would be
+  > a good feature to have, though. --[[smcv]]
+
+  > Here, FWIW, is the first ikiwiki comment spam I've seen:
+  > <http://waldeneffect.org/blog/Snake_bite_information/#blog/Snake_bite_information/comment_1>
+  > So that took about 10 days...
+  > --[[Joey]] 
+
+  >> Implemented in my 'comments' branch, please review. It turns out
+  >> [[plugins/remove]] is happy to remove internal pages, so it was quite
+  >> easy to do. --[[smcv]]
+
+  >>> done --[[Joey]] 
-- 
cgit v1.2.3


From bc3fb1ceabf7f2139ce42e782e3f9d96e33dce0f Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 3 Feb 2009 13:33:59 -0500
Subject: Update the to-do list for comments, and explain why we can't have a
 form for the whole comment

---
 doc/todo/comments.mdwn | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index c74ded8f6..8da640f26 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -10,19 +10,13 @@
   > it's hard enough to get some people to title their blog posts :-)
   > --[[smcv]]
 
-## Patches pending merge
-
-* There is some common code cargo-culted from other plugins (notably inline and editpage) which
-  should probably be shared
-
-  > Actually, there's less of this now than there used to be - a lot of simple
-  > things that were shared have become unshareable as they became more
-  > complex. --[[smcv]]
-
-  > There's still goto. You have a branch for that. --[[Joey]] 
-
 ## Won't fix
 
+* Because IkiWiki generates static HTML, we can't have a form inlined in
+  page.tmpl where the user fills in an entire comment and can submit it in
+  a single button-press, without being vulnerable to cross-site request forgery.
+  So I'll put this in as wontfix. --[[smcv]]
+
 * It would be useful to have a pagespec that always matches all comments on
   pages matching a glob. Something like `comment(blog/*)`.
   Perhaps postcomment could also be folded into this? Then the pagespec
@@ -47,6 +41,17 @@
 
 ## Done
 
+* There is some common code cargo-culted from other plugins (notably inline and editpage) which
+  should probably be shared
+
+  > Actually, there's less of this now than there used to be - a lot of simple
+  > things that were shared have become unshareable as they became more
+  > complex. --[[smcv]]
+
+  > There's still goto. You have a branch for that. --[[Joey]] 
+
+  >> Now merged --[[smcv]]
+
 * The default template should have a (?) icon next to unauthenticated users (with the IP address
   as title) and an OpenID icon next to OpenIDs
 
@@ -91,6 +96,7 @@
   > and c42f174e fix another `beautify_urlpath` bug and add a regression test
   > --[[smcv]]
 
+
 * Now that inline has some comments-specific functionality anyway, it would
   be good to output `<link rel="comments">` in Atom and the equivalent in RSS.
 
-- 
cgit v1.2.3


From 1b3dbe0b91d7646096229fb531a3527df3b3587a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 3 Feb 2009 13:51:10 -0500
Subject: not so fast

---
 doc/todo/comments.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'doc/todo/comments.mdwn')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 8da640f26..7a113bee3 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -17,6 +17,15 @@
   a single button-press, without being vulnerable to cross-site request forgery.
   So I'll put this in as wontfix. --[[smcv]]
 
+  > Surely there's a way around that?
+  > A web 2.0 way comes to mind: The user clicks on a link
+  > to open the comment post form. While the nasty web 2.0 javascript :)
+  > is manipulating the page to add the form to it, it looks at the cookie
+  > and uses that to insert a sid field.
+  > 
+  > Or, it could have a mandatory preview page and do the CSRF check then.
+  > --[[Joey]]
+
 * It would be useful to have a pagespec that always matches all comments on
   pages matching a glob. Something like `comment(blog/*)`.
   Perhaps postcomment could also be folded into this? Then the pagespec
-- 
cgit v1.2.3