From 31fa7714e7a3eba6e34b601426047f2aa2f8db01 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 12 Jun 2010 18:10:33 -0400
Subject: editpage: Rename "comments" field to avoid CSS conflict with the
comments div.
---
IkiWiki/Plugin/editpage.pm | 10 +++++-----
debian/changelog | 2 ++
templates/editpage.tmpl | 4 ++--
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 3d731d399..21f1f1824 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -64,7 +64,7 @@ sub cgi_editpage ($$) {
decode_cgi_utf8($q);
- my @fields=qw(do rcsinfo subpage from page type editcontent comments);
+ my @fields=qw(do rcsinfo subpage from page type editcontent editmessage);
my @buttons=("Save Page", "Preview", "Cancel");
eval q{use CGI::FormBuilder};
error($@) if $@;
@@ -144,7 +144,7 @@ sub cgi_editpage ($$) {
$form->field(name => "subpage", type => 'hidden');
$form->field(name => "page", value => $page, force => 1);
$form->field(name => "type", value => $type, force => 1);
- $form->field(name => "comments", type => "text", size => 80);
+ $form->field(name => "editmessage", type => "text", size => 80);
$form->field(name => "editcontent", type => "textarea", rows => 20,
cols => 80);
$form->tmpl_param("can_commit", $config{rcs});
@@ -353,9 +353,9 @@ sub cgi_editpage ($$) {
}
my $message="";
- if (defined $form->field('comments') &&
- length $form->field('comments')) {
- $message=$form->field('comments');
+ if (defined $form->field('editmessage') &&
+ length $form->field('editmessage')) {
+ $message=$form->field('editmessage');
}
my $content=$form->field('editcontent');
diff --git a/debian/changelog b/debian/changelog
index dcf589861..1d849f558 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
useful in a few edge case setups.
* attachment: Show files from underlay in attachments list.
* img: Support hspace and vspace attributes.
+ * editpage: Rename "comments" field to avoid CSS conflict with the
+ comments div.
-- Joey Hess <joeyh@debian.org> Fri, 11 Jun 2010 13:39:15 -0400
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 36076cb35..b4b0d05df 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -23,8 +23,8 @@
</li>
<TMPL_IF NAME="CAN_COMMIT">
<li>
-<label for="comments" class="block">Optional comment about this change:</label>
-<TMPL_VAR FIELD-COMMENTS><br />
+<label for="editmessage" class="block">Optional comment about this change:</label>
+<TMPL_VAR FIELD-EDITMESSAGE><br />
</li>
</TMPL_IF>
</ol>
--
cgit v1.2.3