From 44a7d77a301a1f219c99f3d861f0bce43cd779cf Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 11 Dec 2008 00:22:34 +0000
Subject: comments: rename main field to "editcontent" consistent with editpage

This has the side-effect that Ikiwiki's default style.css gives the text
box 100% width.
---
 IkiWiki/Plugin/comments.pm   | 16 ++++++++--------
 templates/comments_form.tmpl |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index b45a4a97b..46f71e2e7 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -242,10 +242,10 @@ sub sessioncgi ($$) { #{{{
 
 	my @buttons = (POST_COMMENT, PREVIEW, CANCEL);
 	my $form = CGI::FormBuilder->new(
-		fields => [qw{do sid page subject body type}],
+		fields => [qw{do sid page subject editcontent type}],
 		charset => 'utf-8',
 		method => 'POST',
-		required => [qw{body}],
+		required => [qw{editcontent}],
 		javascript => 0,
 		params => $cgi,
 		action => $config{cgiurl},
@@ -280,7 +280,7 @@ sub sessioncgi ($$) { #{{{
 		force => 1);
 	$form->field(name => 'page', type => 'hidden');
 	$form->field(name => 'subject', type => 'text', size => 72);
-	$form->field(name => 'body', type => 'textarea', rows => 10);
+	$form->field(name => 'editcontent', type => 'textarea', rows => 10);
 	$form->field(name => "type", value => $type, force => 1,
 		type => 'select', options => \@page_types);
 
@@ -334,9 +334,9 @@ sub sessioncgi ($$) { #{{{
 
 	my ($authorurl, $author) = linkuser(getcgiuser($session));
 
-	my $body = $form->field('body') || '';
-	$body =~ s/\r\n/\n/g;
-	$body =~ s/\r/\n/g;
+	my $editcontent = $form->field('editcontent') || '';
+	$editcontent =~ s/\r\n/\n/g;
+	$editcontent =~ s/\r/\n/g;
 
 	# FIXME: check that the wiki is locked right now, because
 	# if it's not, there are mad race conditions!
@@ -352,7 +352,7 @@ sub sessioncgi ($$) { #{{{
 
 	my $anchor = "${comments_pagename}${i}";
 
-	$body =~ s/"/\\"/g;
+	$editcontent =~ s/"/\\"/g;
 	my $content = "[[!comment format=$type\n";
 
 	# FIXME: handling of double quotes probably wrong?
@@ -374,7 +374,7 @@ sub sessioncgi ($$) { #{{{
 
 	$content .= " date=\"" . IkiWiki::formattime(time, '%X %x') . "\"\n";
 
-	$content .= " content=\"\"\"\n$body\n\"\"\"]]\n";
+	$content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n";
 
 	# This is essentially a simplified version of editpage:
 	# - the user does not control the page that's created, only the parent
diff --git a/templates/comments_form.tmpl b/templates/comments_form.tmpl
index e798fcdde..9eddaadf5 100644
--- a/templates/comments_form.tmpl
+++ b/templates/comments_form.tmpl
@@ -5,7 +5,7 @@
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-PAGE>
 Subject: <TMPL_VAR FIELD-SUBJECT><br />
-<TMPL_VAR FIELD-BODY><br />
+<TMPL_VAR FIELD-EDITCONTENT><br />
 Page type: <TMPL_VAR FIELD-TYPE><br />
 <TMPL_VAR FORM-SUBMIT><br />
 <TMPL_VAR HELPONFORMATTINGLINK><br />
-- 
cgit v1.2.3