X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;fp=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=daf739baf65aa85e025b60d01dede6492219ac66;hb=911c62b8bdc652e0d33d33cd366905acdcb93290;hp=8df45ee4f839113259def81fcadf982c14e813d2;hpb=3dbe882702b33302251aee9cc2d1d54b631ab861;p=gruntmaster-page.git diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm index 8df45ee..daf739b 100644 --- a/lib/Plack/App/Gruntmaster/HTML.pm +++ b/lib/Plack/App/Gruntmaster/HTML.pm @@ -9,6 +9,8 @@ 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 ($) { my ($html) = @_; @@ -16,7 +18,7 @@ sub literal ($) { my $b = HTML::TreeBuilder->new; $b->ignore_unknown(0); $b->parse($html); - HTML::Element::Library::super_literal $b->guts->as_HTML; + HTML::Element::Library::super_literal $b->guts->as_HTML(undef, undef, $optional_end_tags); } sub HTML::Element::edit_href { @@ -69,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) } @@ -83,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';