From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 21 Mar 2015 11:36:45 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=9694ccf33654e0cc01a2fa9390b76eb1a276d304;hp=-c;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc
---

9694ccf33654e0cc01a2fa9390b76eb1a276d304
diff --combined lib/Plack/App/Gruntmaster/HTML.pm
index 59ee377,1e0f788..382641e
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@@ -71,7 -71,6 +71,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});
@@@ -172,8 -171,8 +172,8 @@@ sub process_pb_entry 
  		$tree->fid('nosubmit')->detach;
  		$tree->look_down(name => 'problem')->attr(value => $args{id});
  		my $contest = $tree->look_down(name => 'contest');
- 		$contest->attr(value => $args{contest}) if $args{contest};
- 		$contest->detach unless $args{contest}
+ 		$contest->attr(value => $args{args}{contest}) if $args{args}{contest};
+ 		$contest->detach unless $args{args}{contest}
  	} else {
  		$tree->fid('nosubmit')->find('a')->edit_href(sub{s/id/$args{id}/});
  		$tree->fid('submit')->detach
@@@ -237,7 -236,7 +237,7 @@@ sub process_log 
  		my ($data, $tr) = @_;
  		$tr->fclass('id')->namedlink($data->{id});
  		$tr->fclass('problem')->namedlink($data->{problem}, $data->{problem_name});
- 		$tr->fclass('problem')->find('a')->edit_href(sub{$_ .= "?contest=$args{contest}"}) if $args{contest};
+ 		$tr->fclass('problem')->find('a')->edit_href(sub{$_ .= "?contest=$args{args}{contest}"}) if $args{args}{contest};
  		$tr->fclass('contest')->namedlink($data->{contest}, $data->{contest_name}) if $data->{contest};
  		$tr->fclass('contest')->replace_content('None') unless $data->{contest};
  		$tr->fclass('date')->replace_content(ftime $data->{date});