X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=7863f4f425a43cba20579d9e422af4cc7a6d6b3f;hb=d19b7b577a3b51ad59f88cf0057bf9ff49343d7e;hp=396f7d9fbdc93e54964e25c869543a37c90bb042;hpb=f2752dd5062a025917bb88bda9ced71bc6d06875;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 396f7d9..7863f4f 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -9,8 +9,17 @@ use HTML::TreeBuilder;
 use POSIX qw//;
 use Data::Dumper qw/Dumper/;
 
+my $optional_end_tags = {%HTML::Tagset::optionalEndTag, tr => 1, td => 1, th => 1};
+
 sub ftime ($)   { POSIX::strftime '%c', localtime shift }
-sub literal ($) { HTML::Element::Library::super_literal shift // '' }
+sub literal ($) {
+	my ($html) = @_;
+	return unless $html;
+	my $b = HTML::TreeBuilder->new;
+	$b->ignore_unknown(0);
+	$b->parse($html);
+	HTML::Element::Library::super_literal $b->guts->as_HTML(undef, undef, $optional_end_tags);
+}
 
 sub HTML::Element::edit_href {
 	my ($self, $sub) = @_;
@@ -62,6 +71,7 @@ sub render_article {
 	my ($art, $lang, %args) = @_;
 	$lang //= 'en';
 	my $title = read_file "a/$art.$lang.title";
+	chomp $title;
 	my $meat  = read_file "a/$art.$lang";
 	_render('skel', $lang, title => $title , meat => $meat, %args)
 }
@@ -76,7 +86,7 @@ sub _render {
 	$_->detach for $tree->look_down(static => $args{static} ? 'no' : 'yes');
 	$_->attr('static', undef) for $tree->look_down(sub {$_[0]->attr('static')});
 	$_->attr('smap', undef) for $tree->look_down(sub {$_[0]->attr('smap')});
-	$tree->as_HTML;
+	$tree->as_HTML(undef, undef, $optional_end_tags);
 }
 
 my $logo = read_file 'mclogo.svg';
@@ -85,7 +95,7 @@ $logo =~ s/(\s+)/ /g;
 
 sub process_skel {
 	my ($tree, %args) = @_;
-	$tree->fid('logo')->replace_with(literal $logo);
+	$tree->fid('logo')->replace_with(HTML::Element::Library::super_literal $logo);
 	$tree->content_handler(
 		title   =>         $args{title},
 		content => literal $args{meat});
@@ -177,7 +187,7 @@ sub process_pb_entry {
 		$tree->fid('job_log')->edit_href(sub{$_ .= "&private=$args{private}"}) if $args{private};
 		$tree->fid('solution')->detach unless $args{solution};
 		$_->detach for $tree->fclass('rc'); # requires contest
-		$tree->fid('solution_modal')->fclass('modal-body')->replace_content(literal $args{solution});
+		$tree->fid('solution_modal')->replace_content(literal $args{solution});
 	}
 	if ($args{cansubmit}) {
 		$tree->fid('nosubmit')->detach;