rename comments_display to comment

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index fd9f0acb48fc54a6a27d2f60a5b8f2b5940a687d..705ba340b9c386ad2144d89eae7559678fbcaf13 100644 (file)
--- 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 68513901ec1c592fc089b3763f3705c7cec819a6..6f8137256e54ba8b0068a62bbd20080f01ec6ac7 100644 (file)
--- 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 2bcec69ba923d777e64f46f57abe934f589ccc69..ee2ba7ea086631cb3034576f18cae13c976533b4 100644 (file)
--- 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 6fb4d5f495f627c8ea8dcaa5d210a927e0d48390..63735193bd1f3ca34f2eafda758d9e4ebddc7567 100644 (file)
--- 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 (file)
index 0000000..e7e283b
--- /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 (file)
index e7e283b..0000000
--- 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-->