Merge branch 'master' into newmc

[gruntmaster-page.git] / lib / Plack / App / Gruntmaster / HTML.pm

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index abb2779ce49f8576527343237f055676b42bcaee..8b7a0a872379f861f9888213b1c09337e1bd447a 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -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},
@@ -226,6 +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);
@@ -254,6 +257,7 @@ sub process_st {
                my ($data, $th) = @_;
                $th->attr(class => undef);
                $th->namedlink(@$data);
+               $th->find('a')->edit_href(sub{s/$/?contest=$args{args}{contest}/});
        };
        $tree->fclass('problem')->iter3($args{problems}, $pbiter);
        my $iter = sub {