From 731fc9e7a2ce818f0b7069cf0353931ec2dc8b43 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 25 Jan 2009 18:49:57 -0500 Subject: comments: Add a moderation web interface. --- templates/commentmoderation.tmpl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 templates/commentmoderation.tmpl (limited to 'templates') diff --git a/templates/commentmoderation.tmpl b/templates/commentmoderation.tmpl new file mode 100644 index 000000000..3dadb791b --- /dev/null +++ b/templates/commentmoderation.tmpl @@ -0,0 +1,23 @@ + +
+
+ + + +
+
+ +
+Defer +Accept +Reject +
+
+ + +
+ +

+No comments need moderation at this time. +

+ -- cgit v1.2.3 From 9a5085e5126d1f76d28a4438b1527659183477b5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 25 Jan 2009 18:56:47 -0500 Subject: clean up comment preview Remove actions from it, and avoid a broken title link. --- IkiWiki/Plugin/comments.pm | 2 ++ templates/comment.tmpl | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'templates') diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index 388a983f7..ad5395a82 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -673,6 +673,8 @@ sub previewcomment ($$$) { template => $template); }); + $template->param(have_actions => 0); + return $template->output; } diff --git a/templates/comment.tmpl b/templates/comment.tmpl index 582efccb8..b4f235845 100644 --- a/templates/comment.tmpl +++ b/templates/comment.tmpl @@ -1,6 +1,12 @@
-
+
+ + + + + +
-- cgit v1.2.3 From 9d4f396b1353d58c6b526818b69ada459b1be24c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 25 Jan 2009 22:25:45 -0500 Subject: add reject all marked defer checkbox --- IkiWiki/Plugin/comments.pm | 17 ++++++++--------- templates/commentmoderation.tmpl | 12 +++++++++--- 2 files changed, 17 insertions(+), 12 deletions(-) (limited to 'templates') diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index f0b67a9eb..32f3712f2 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -539,12 +539,14 @@ sub commentmoderation ($$) { if (defined $cgi->param('sid')) { IkiWiki::checksessionexpiry($cgi, $session); + my $rejectalldefer=$cgi->param('rejectalldefer'); + my %vars=$cgi->Vars; my $added=0; foreach my $id (keys %vars) { if ($id =~ /(.*)\Q._comment\E$/) { my $action=$cgi->param($id); - next if $action eq 'Defer'; + next if $action eq 'Defer' && ! $rejectalldefer; # Make sure that the id is of a legal # pending comment before untainting. @@ -601,7 +603,6 @@ sub commentmoderation ($$) { my ($id, $ctime)=@{$_}; my $file="$config{wikistatedir}/comments_pending/$id"; my $content=readfile($file); - my $ctime=(stat($file))[10]; { id => $id, view => previewcomment($content, $id, @@ -668,14 +669,12 @@ sub previewcomment ($$$) { my $preview = IkiWiki::htmlize($location, $page, '_comment', IkiWiki::linkify($location, $page, - IkiWiki::preprocess($location, $page, - IkiWiki::filter($location, - $page, $content), - 0, 1))); + IkiWiki::preprocess($location, $page, + IkiWiki::filter($location, $page, $content), 0, 1))); IkiWiki::run_hooks(format => sub { - $preview = shift->(page => $page, - content => $preview); - }); + $preview = shift->(page => $page, + content => $preview); + }); my $template = template("comment.tmpl"); $template->param(content => $preview); diff --git a/templates/commentmoderation.tmpl b/templates/commentmoderation.tmpl index 3dadb791b..e91d3146d 100644 --- a/templates/commentmoderation.tmpl +++ b/templates/commentmoderation.tmpl @@ -3,18 +3,24 @@
+ +Reject +all comments marked Defer +
-Defer -Accept -Reject +Defer +Accept +Reject

+Reject +all comments marked Defer

-- cgit v1.2.3 From 0c287d85bb12dc882518fc86536a6397151753ac Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 25 Jan 2009 22:44:38 -0500 Subject: typo --- templates/comment.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/comment.tmpl b/templates/comment.tmpl index b4f235845..1b9064ea0 100644 --- a/templates/comment.tmpl +++ b/templates/comment.tmpl @@ -1,7 +1,7 @@

- + -- cgit v1.2.3