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

Merge branch 'master' into newmc
---

3dbe882702b33302251aee9cc2d1d54b631ab861
diff --combined lib/Plack/App/Gruntmaster/HTML.pm
index a501998,9f6f2ec..8df45ee
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@@ -11,9 -11,11 +11,11 @@@ use Data::Dumper qw/Dumper/
  
  sub ftime ($)   { POSIX::strftime '%c', localtime shift }
  sub literal ($) {
+ 	my ($html) = @_;
+ 	return unless $html;
  	my $b = HTML::TreeBuilder->new;
  	$b->ignore_unknown(0);
- 	$b->parse(shift // '');
+ 	$b->parse($html);
  	HTML::Element::Library::super_literal $b->guts->as_HTML;
  }
  
@@@ -84,13 -86,8 +86,13 @@@ sub _render 
  	$tree->as_HTML;
  }
  
 +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});
@@@ -176,7 -173,10 +178,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};