From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 11 Apr 2015 12:26:16 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=911c62b8bdc652e0d33d33cd366905acdcb93290;hp=-c;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

911c62b8bdc652e0d33d33cd366905acdcb93290
diff --combined lib/Plack/App/Gruntmaster/HTML.pm
index 8df45ee,bcd1a88..daf739b
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@@ -9,6 -9,8 +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 +18,7 @@@
  	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 +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,16 -86,11 +86,16 @@@ 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';
 +$logo =~ y/\n//d;
 +$logo =~ s/(\s+)/ /g;
 +
  sub process_skel {
  	my ($tree, %args) = @_;
 +	$tree->fid('logo')->replace_with(HTML::Element::Library::super_literal $logo);
  	$tree->content_handler(
  		title   =>         $args{title},
  		content => literal $args{meat});
@@@ -178,7 -176,10 +181,7 @@@ sub process_pb_entry 
  	if ($args{contest_stop}) {
  		$tree->fid('solution')->detach;
  		$tree->fid('solution_modal')->detach;
 -		my $score = $tree->fid('score');
 -		$score->attr('data-start' => $args{open_time});
 -		$score->attr('data-stop'  => $args{contest_stop});
 -		$score->attr('data-value'  => $args{value});
 +		$tree->fid('score')->replace_content($args{value});
  		$tree->fid('countdown')->attr('data-stop' => $args{contest_stop});
  	} else {
  		$tree->fid('job_log')->edit_href(sub{$_ .= "&private=$args{private}"}) if $args{private};