Merge branch 'master' into newmc

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

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index dc7b12369ce3079f53671bd353c284e063462fa7..59ee37734ab42b8d1918fd07a05f293b58b5c530 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -150,6 +150,11 @@ sub process_pb_entry {
                level     => ucfirst $args{level},
                author    =>         $args{author},
                owner     =>         $args{owner_name} || $args{owner});
+       if ($args{limits}) {
+               my @limits = (@{$args{limits}}, {format => 'Other', timeout => $args{timeout} });
+               @limits = map { sprintf '%s (%s)', @{$_}{qw/timeout format/} } @limits;
+               $tree->look_down(smap => 'timeout')->replace_content(join ', ', @limits);
+       }
        if ($args{contest_stop}) {
                $tree->fid('solution')->detach;
                $tree->fid('solution_modal')->detach;
@@ -188,7 +193,7 @@ sub process_pb {
                $tr->fclass('name')->namedlink($data->{id}, $data->{name});
                $tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{contest}"}) if $args{contest};
                $tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
-               $tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private};
+               $tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private} && !$args{contest};
        };
        my $iter = sub {
                my ($data, $div) = @_;