rename comments_form to editcomment

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 705ba340b9c386ad2144d89eae7559678fbcaf13..a155712fba34e59b124fadf633cfd25af08dd159 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -281,7 +281,7 @@ sub sessioncgi ($$) {
                action => $config{cgiurl},
                header => 0,
                table => 0,
-               template => scalar IkiWiki::template_params('comments_form.tmpl'),
+               template => scalar IkiWiki::template_params('editcomment.tmpl'),
                # wtf does this do in editpage?
                wikiname => $config{wikiname},
        );

diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
index 63735193bd1f3ca34f2eafda758d9e4ebddc7567..dc217cd30f4e72c64b50447e7b301de381f45fa4 100644 (file)
--- a/doc/wikitemplates.mdwn
+++ b/doc/wikitemplates.mdwn
@@ -31,7 +31,7 @@ located in /usr/share/ikiwiki/templates by default.
   [[plugins/search]] plugin.
 * `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
+* `editcomment.tmpl` - This template is the comment post form for the
   [[plugins/comments]] plugin.
 
 The [[plugins/pagetemplate]] plugin can allow individual pages to use a

diff --git a/templates/comments_form.tmpl b/templates/comments_form.tmpl
deleted file mode 100644 (file)
index 9a9455f..0000000
--- a/templates/comments_form.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="comments-form">
-<TMPL_VAR MESSAGE>
-<TMPL_VAR FORM-START>
-<TMPL_VAR FIELD-DO>
-<TMPL_VAR FIELD-SID>
-<TMPL_VAR FIELD-PAGE>
-<TMPL_IF NAME=USERNAME>
-Signed in as <TMPL_VAR NAME=USERNAME ESCAPE=HTML><br />
-<TMPL_ELSE>
-<TMPL_IF NAME=ALLOWAUTHOR>
-Name: <TMPL_VAR NAME=FIELD-AUTHOR> (optional)<br />
-Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
-</TMPL_IF>
-</TMPL_IF>
-Subject: <TMPL_VAR FIELD-SUBJECT><br />
-<TMPL_VAR FIELD-EDITCONTENT><br />
-Page type: <TMPL_VAR FIELD-TYPE><br />
-<TMPL_VAR FORM-SUBMIT><br />
-<TMPL_VAR HELPONFORMATTINGLINK><br />
-A subset of HTML is allowed.<br />
-IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br />
-<TMPL_VAR NAME="FORM-END">
-
-<TMPL_IF NAME="PAGE_PREVIEW">
-<hr />
-<div class="header">
-<span>Comment preview:</span>
-</div><!-- .header -->
-<div id="preview">
-<TMPL_VAR PAGE_PREVIEW>
-</div><!-- #preview -->
-</TMPL_IF>
-
-</div><!-- .comments-form -->

diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
new file mode 100644 (file)
index 0000000..a08b896
--- /dev/null
+++ b/templates/editcomment.tmpl
@@ -0,0 +1,34 @@
+<div class="editcomment">
+<TMPL_VAR MESSAGE>
+<TMPL_VAR FORM-START>
+<TMPL_VAR FIELD-DO>
+<TMPL_VAR FIELD-SID>
+<TMPL_VAR FIELD-PAGE>
+<TMPL_IF NAME=USERNAME>
+Signed in as <TMPL_VAR NAME=USERNAME ESCAPE=HTML><br />
+<TMPL_ELSE>
+<TMPL_IF NAME=ALLOWAUTHOR>
+Name: <TMPL_VAR NAME=FIELD-AUTHOR> (optional)<br />
+Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
+</TMPL_IF>
+</TMPL_IF>
+Subject: <TMPL_VAR FIELD-SUBJECT><br />
+<TMPL_VAR FIELD-EDITCONTENT><br />
+Page type: <TMPL_VAR FIELD-TYPE><br />
+<TMPL_VAR FORM-SUBMIT><br />
+<TMPL_VAR HELPONFORMATTINGLINK><br />
+A subset of HTML is allowed.<br />
+IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br />
+<TMPL_VAR NAME="FORM-END">
+
+<TMPL_IF NAME="PAGE_PREVIEW">
+<hr />
+<div class="header">
+<span>Comment preview:</span>
+</div><!-- .header -->
+<div id="preview">
+<TMPL_VAR PAGE_PREVIEW>
+</div><!-- #preview -->
+</TMPL_IF>
+
+</div><!-- .editcomment -->