Module: tools Branch: master Commit: 5860a0d1e71dff0c918d6519cdb18be043b4a622 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5860a0d1e71dff0c918d6519... Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 22 10:56:27 2018 +0200 testbot/web: Fix some HTML closing tags. Also call the parent GenerateFooter() method in the Activity page so the HTML page is terminated correctly. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 6 ++++-- testbot/web/Stats.pl | 1 + testbot/web/Submit.pl | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 5124017..fa842d9 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -94,7 +94,7 @@ sub GenerateBody($) # Generate a custom form to let the user specify the Hours field. $self->GenerateFormStart(); - print "<div class='ItemProperty'><label>Analyze the activity of the past <div class='ItemValue'><input type='text' name='Hours' maxlength='3' size='3' value='$self->{hours}'/></div> hours.</div>\n"; + print "<div class='ItemProperty'><label>Analyze the activity of the past <div class='ItemValue'><input type='text' name='Hours' maxlength='3' size='3' value='$self->{hours}'/></div> hours.</label></div>\n"; $self->GenerateFormEnd(); print "<h1>${ProjectName} Test Bot activity</h1>\n"; @@ -267,6 +267,7 @@ EOF ### Generate the table footer print "</tbody></table></div>\n"; + print "</div>\n"; } sub GenerateFooter($) @@ -294,8 +295,9 @@ sub GenerateFooter($) print "<span class='Record-deleted'>deletion</span>.</p>\n"; print "</td></tr></tbody>\n"; - print "</tbody></table></div>\n"; + print "</table></div>\n"; print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; + $self->SUPER::GenerateFooter(); } diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 64f29bd..ccabb32 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -335,6 +335,7 @@ sub GenerateBody($) print "</tbody></table></div>\n"; print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; + print "</div>\n"; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 926fcb7..440bd8e 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -237,7 +237,7 @@ sub GenerateFields($) print "<thead><tr><th class='Record'></th>\n"; print "<th class='Record'>VM Name</th>\n"; print "<th class='Record'>Description</th>\n"; - print "</th><tbody>\n"; + print "</thead><tbody>\n"; my $VMs = CreateVMs(); if ($self->{FileType} eq "exe64") @@ -296,6 +296,7 @@ sub GenerateFields($) print "</tr>\n"; } print "</tbody></table>\n"; + print "</div><!--CollectionBlock-->\n"; } else {