Package: ikiwiki
Version: 3.09
Severity: minor
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
the edit comment page contains some xhtml errors:
- - various form fields are not in a block element like <div>/<p>
- - i think the "charset" attribute should actually be "accept-charset"
attached is a patch which addresses this by changing "charset" and
lumping all the fields inside another div element. however, one
xhtml error remains, but unless you want to mangle the formbuilder
output it should probably be fixed in the formbuilder class itself.
sean
- -- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.26-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages ikiwiki depends on:
ii libhtml-parser-perl 3.60-1 collection of modules that parse H
ii libhtml-scrubber-perl 0.08-4 Perl extension for scrubbing/sanit
ii libhtml-template-perl 2.9-1 HTML::Template : A module for usin
ii liburi-perl 1.37+dfsg-1 Manipulates and accesses URI strin
ii markdown 1.0.1-7 Text-to-HTML conversion tool
ii perl 5.10.0-19 Larry Wall's Practical Extraction
Versions of packages ikiwiki recommends:
ii bzr 1.14~rc1-1 easy to use distributed version co
ii gcc [c-compiler] 4:4.3.3-2 The GNU C compiler
ii gcc-3.4 [c-compiler] 3.4.6-9 The GNU C compiler
ii gcc-4.1 [c-compiler] 4.1.2-25 The GNU C compiler
ii gcc-4.2 [c-compiler] 4.2.4-6 The GNU C compiler
ii gcc-4.3 [c-compiler] 4.3.3-5 The GNU C compiler
ii git-core 1:1.6.2.2-1 fast, scalable, distributed revisi
ii libauthen-passphrase-perl 0.005-3 Perl module encapsulating hashed p
ii libc6-dev [libc-dev] 2.9-7 GNU C Library: Development Librari
ii libcgi-formbuilder-perl 3.05.01-6 Easily generate and process statef
ii libcgi-session-perl 4.41-1 persistent session data in CGI app
ii liblwpx-paranoidagent-perl 1.04-1 a "paranoid" subclass of LWP::User
ii libmail-sendmail-perl 0.79.16-1 Send email from a perl script
ii libnet-openid-consumer-perl 0.14-4 library for consumers of OpenID id
ii libterm-readline-gnu-perl 1.19-1 Perl extension for the GNU Readlin
ii libtimedate-perl 1.1600-9 Time and date functions for Perl
ii libxml-simple-perl 2.18-1 Perl module for reading and writin
ii mercurial 1.2-1 scalable distributed version contr
ii subversion 1.5.6dfsg-1 Advanced version control system
Versions of packages ikiwiki suggests:
pn dvipng <none> (no description available)
ii graphviz 2.20.2-3+b2 rich set of graph drawing tools
ii libcrypt-ssleay-perl 0.57-1+b1 Support for https protocol in LWP
ii libdigest-sha1-perl 2.11-2+b1 NIST SHA-1 message digest algorith
pn libfile-mimeinfo-perl <none> (no description available)
ii libhtml-tree-perl 3.23-1 represent and create HTML syntax t
ii liblocale-gettext-perl 1.05-4 Using libc functions for internati
ii libmailtools-perl 2.04-1 Manipulate email in perl programs
pn libnet-amazon-s3-perl <none> (no description available)
ii librpc-xml-perl 0.64-1 Perl module implementation of XML-
ii libsearch-xapian-perl 1.0.10.0-1 Perl bindings for the Xapian C++ s
pn libsort-naturally-perl <none> (no description available)
pn libtext-csv-perl <none> (no description available)
pn libtext-textile-perl <none> (no description available)
pn libtext-typography-per <none> (no description available)
pn libtext-wikicreole-per <none> (no description available)
pn libtext-wikiformat-per <none> (no description available)
pn libxml-feed-perl <none> (no description available)
ii perlmagick 7:6.3.7.9.dfsg2-1 Perl interface to the libMagick gr
pn polygen <none> (no description available)
ii python 2.5.4-2 An interactive high-level object-o
ii python-docutils 0.5-3 utilities for the documentation of
pn sparkline-php <none> (no description available)
pn texlive <none> (no description available)
ii tidy 20081224cvs-1 HTML syntax checker and reformatte
pn viewvc | gitweb | view <none> (no description available)
ii xapian-omega 1.0.10-5 CGI search interface and indexers
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iD8DBQFJ4SjNynjLPm522B0RAqCAAJsEQqxG3YxZEFM0l4UXHf1lbDjEgwCfdf0A
uqb5Ul2FLZ9ITwZj2bObBoc=
=nw/V
-----END PGP SIGNATURE-----
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index ee53dbc..1fe1ee6 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -262,7 +262,7 @@ sub editcomment ($$) {
my @buttons = (POST_COMMENT, PREVIEW, CANCEL);
my $form = CGI::FormBuilder->new(
fields => [qw{do sid page subject editcontent type author url}],
- charset => 'utf-8',
+ 'accept-charset' => 'utf-8',
method => 'POST',
required => [qw{editcontent}],
javascript => 0,
diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
index 7590cdf..b7cc840 100644
--- a/templates/editcomment.tmpl
+++ b/templates/editcomment.tmpl
@@ -1,6 +1,7 @@
<div class="editcomment">
<TMPL_VAR MESSAGE>
<TMPL_VAR FORM-START>
+<div class="formbody">
<TMPL_VAR FIELD-DO>
<TMPL_VAR FIELD-SID>
<TMPL_VAR FIELD-PAGE>
@@ -14,6 +15,7 @@ Subject: <TMPL_VAR FIELD-SUBJECT><br />
<TMPL_VAR FIELD-EDITCONTENT><br />
<TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br />
IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br />
+</div> <!-- .formbody -->
<TMPL_VAR NAME="FORM-END">
<TMPL_VAR WMD_PREVIEW>
