From: Marius Gavrilescu <marius@ieval.ro>
Date: Sun, 22 Mar 2015 17:18:08 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=b8caa1675f0dc5c501fccb3716395709032519fb;hp=-c;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc
---

b8caa1675f0dc5c501fccb3716395709032519fb
diff --combined lib/Plack/App/Gruntmaster/HTML.pm
index 18bf1cc,acb45c0..057c90a
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@@ -74,7 -74,6 +74,7 @@@ sub _render 
  
  sub process_skel {
  	my ($tree, %args) = @_;
 +	$tree->fid('logo')->replace_with(literal scalar read_file "mclogo.svg");
  	$tree->content_handler(
  		title   =>         $args{title},
  		content => literal $args{meat});
@@@ -147,7 -146,6 +147,6 @@@ sub process_pb_entry 
  	$tree->fid('owner')->edit_href(sub{s/owner_id/$args{owner}/});
  	$tree->fid('job_log')->edit_href(sub{s/problem_id/$args{id}/});
  	$tree->fid('solution')->edit_href(sub{s/problem_id/$args{id}/});
- 	$tree->fid('job_log')->edit_href(sub{$_ .= "&private=$args{private}"}) if $args{private};
  	$tree->content_handler(
  		statement => literal $args{statement},
  		level     => ucfirst $args{level},
@@@ -167,6 -165,7 +166,7 @@@
  		$score->attr('data-value'  => $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};
  		$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});