Re: gitweb html validation
- From
Ralf Thielow <ralf.thielow@gmail.com>
- Date
- Nov 15, 2016, 18:26 UTC
- Message-ID
- <20161115182632.GA17539@gmail.com>
- In-Reply-To
- <13c9b4a74d82a1f0ed3f626406a43e92@rapsys.eu>
Raphaël Gertz <mageia@rapsys.eu> wrote:
Show 8 quoted lines
> Hi, > > There a small bug in gitweb html validation, you need the following patch to > pass w3c check with searchbox enabled. > > The problem lies in the input directly embed inside a form without a wrapper > which is not valid. >
I agree this is a small bug. Only block level elements are allowed to be inside form tags, according to https://www.w3.org/2010/04/xhtml10-strict.html#elem_form
Show 21 quoted lines
> Best regards
>
> The following patch fix the issue for git-2.10.2 :
> --- /usr/share/gitweb/gitweb.cgi.orig 2016-11-15 15:37:21.149805026 +0100
> +++ /usr/share/gitweb/gitweb.cgi 2016-11-15 15:37:48.579240429 +0100
> @@ -5518,6 +5518,7 @@ sub git_project_search_form {
>
> print "<div class=\"projsearch\">\n";
> print $cgi->start_form(-method => 'get', -action => $my_uri) .
> + '<div>'.
> $cgi->hidden(-name => 'a', -value => 'project_list') . "\n";
> print $cgi->hidden(-name => 'pf', -value => $project_filter). "\n"
> if (defined $project_filter);
> @@ -5529,6 +5530,7 @@ sub git_project_search_form {
> -checked => $search_use_regexp) .
> "</span>\n" .
> $cgi->submit(-name => 'btnS', -value => 'Search') .
> + '</div>'.
> $cgi->end_form() . "\n" .
> $cgi->a({-href => href(project => undef, searchtext => undef,
> project_filter => $project_filter)},I think it's better to just move the <form>-Tag outside of the surrounding div? Something like this perhaps, I didn't test it myself yet.
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 7cf68f07b..33d7c154f 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -5531,8 +5531,8 @@ sub git_project_search_form { $limit = " in '$project_filter/'"; } - print "<div class=\"projsearch\">\n"; print $cgi->start_form(-method => 'get', -action => $my_uri) . + "<div class=\"projsearch\">\n" . $cgi->hidden(-name => 'a', -value => 'project_list') . "\n"; print $cgi->hidden(-name => 'pf', -value => $project_filter). "\n" if (defined $project_filter); @@ -5544,11 +5544,11 @@ sub git_project_search_form { -checked => $search_use_regexp) . "</span>\n" . $cgi->submit(-name => 'btnS', -value => 'Search') . - $cgi->end_form() . "\n" . $cgi->a({-href => href(project => undef, searchtext => undef, project_filter => $project_filter)}, esc_html("List all projects$limit")) . "<br />\n"; - print "</div>\n"; + print "</div>\n" . + $cgi->end_form() . "\n"; } # entry for given @keys needs filling if at least one of keys in list diff --git a/gitweb/static/gitweb.css b/gitweb/static/gitweb.css index 321260103..507740b6a 100644 --- a/gitweb/static/gitweb.css +++ b/gitweb/static/gitweb.css @@ -539,7 +539,7 @@ div.projsearch { margin: 20px 0px; } -div.projsearch form { +form div.projsearch { margin-bottom: 2px; }