Merge branch 'master' into newmc

diff --combined lib/Plack/App/Gruntmaster/HTML.pm
index 80ecac4c9f627c25f628472c23750ac0fea01490,b361978fb9e17ddb1f9241f6008121b1f53aca42..b8e0562186439164b2632e6de451a77020bc554c
--- 1/lib/Plack/App/Gruntmaster/HTML.pm
--- 2/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@@ -186,7 -186,10 +186,7 @@@ sub process_pb_entry 
        if ($args{contest_stop}) {
                $tree->fid('solution')->detach;
                $tree->fid('solution_modal')->detach;
 -              my $score = $tree->fid('score');
 -              $score->attr('data-start' => $args{open_time});
 -              $score->attr('data-stop'  => $args{contest_stop});
 -              $score->attr('data-value'  => $args{value});
 +              $tree->fid('score')->replace_content($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};
@@@ -213,13 -216,13 +213,13 @@@ sub process_pb 
                $tr->set_child_content(class => 'author', $data->{author});
                $tr->set_child_content(class => 'level', ucfirst $data->{level});
                $tr->fclass('name')->namedlink($data->{id}, $data->{name});
-               $tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{contest}"}) if $args{contest};
+               $tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{args}{contest}"}) if $args{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} && !$args{contest};
+               $tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private} && !$args{args}{contest};
        };
  
        $tree->find('tbody')->find('tr')->iter3([pb_sort @{$args{pb}}], $iter);
-       $tree->fid('open-alert')->detach unless $args{contest};
+       $tree->fid('open-alert')->detach unless $args{args}{contest};
  }
  
  sub process_log_entry {