From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 6 Feb 2015 08:53:33 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;ds=sidebyside;h=ea1d4cca6fce7e8a211bf53ad928aa9a7d3c0d10;hp=-c;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

ea1d4cca6fce7e8a211bf53ad928aa9a7d3c0d10
diff --combined lib/Plack/App/Gruntmaster/HTML.pm
index 8e36af5,8f47616..8b7a0a8
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@@ -114,7 -114,6 +114,7 @@@ sub process_us 
  sub process_ct_entry {
  	my ($tree, %args) = @_;
  	$_->edit_href (sub {s/contest_id/$args{id}/}) for $tree->find('a');
 +	$tree->fid('editorial')->detach unless $args{finished};
  	$tree->fid('links')->detach unless $args{started};
  	$tree->content_handler(
  		start       => ftime   $args{start},
@@@ -227,6 -226,8 +227,8 @@@ sub process_log 
  		$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('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});
  		$tr->fclass('format')->replace_content($data->{format});
  		$tr->fclass('size')->namedlink("$data->{id}.$data->{extension}", sprintf "%.2fKB", $data->{size}/1024);