diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-01-10 14:15:47 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-01-10 14:15:47 -0500 |
| commit | 3572f5ea1af1b5b20fbd2377e71e3dfeedbabe0a (patch) | |
| tree | 74072e712dfef408acaa37a0a8b5a6e6375f93f0 | |
| parent | 81b87d41fb2efb5d5e1b365fcde7d5e2a2f7ce91 (diff) | |
| parent | 79676ca44561a412a2d4d1b98f28c14b55048125 (diff) | |
Merge commit 'smcv/comments'
| -rw-r--r-- | IkiWiki/Plugin/comments.pm | 14 | ||||
| -rw-r--r-- | templates/comment.tmpl | 11 |
2 files changed, 25 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index 3a0465dbb..1c4ab4895 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -604,6 +604,12 @@ sub pagetemplate (@) { } } + # everything below this point is only relevant to the comments + # themselves + if (!exists $commentstate{$page}) { + return; + } + if ($template->query(name => 'commentuser')) { $template->param(commentuser => $commentstate{$page}{commentuser}); @@ -628,6 +634,14 @@ sub pagetemplate (@) { $template->param(commentauthorurl => $commentstate{$page}{commentauthorurl}); } + + if ($template->query(name => 'removeurl') && + IkiWiki::Plugin::remove->can("check_canremove") && + length $config{cgiurl}) { + $template->param(removeurl => IkiWiki::cgiurl(do => 'remove', + page => $page)); + $template->param(have_actions => 1); + } } package IkiWiki::PageSpec; diff --git a/templates/comment.tmpl b/templates/comment.tmpl index 6f2b1619e..582efccb8 100644 --- a/templates/comment.tmpl +++ b/templates/comment.tmpl @@ -39,4 +39,15 @@ Comment by — <TMPL_VAR CTIME> </div> + +<TMPL_IF NAME="HAVE_ACTIONS"> +<div class="actions"> +<ul> +<TMPL_IF NAME="REMOVEURL"> +<li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li> +</TMPL_IF> +</ul> +</div><!--.actions--> +</TMPL_IF> + </div><!--.comment--> |