]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
editpage: Rename "comments" field to avoid CSS conflict with the comments div.
authorJoey Hess <joey@kitenet.net>
Sat, 12 Jun 2010 22:10:33 +0000 (18:10 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 12 Jun 2010 22:10:33 +0000 (18:10 -0400)
IkiWiki/Plugin/editpage.pm
debian/changelog
templates/editpage.tmpl

index 3d731d399f34e9b857616135574727b24abb1757..21f1f18240350ebc2e509e2b3b164c04b3205611 100644 (file)
@@ -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');
index dcf58986144d0bc3f108190db54726a3f15c8f5d..1d849f55873e0c497ba0be27e0c43587a5f3557d 100644 (file)
@@ -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
 
index 36076cb3534bfb269e2cb174784be90ceee88deb..b4b0d05dfd12fb9feaf38e18a18b682e8ded50a1 100644 (file)
@@ -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>