Merge branch 'master' into newmc

diff --combined lib/Plack/App/Gruntmaster/HTML.pm
index 66468ca6a1aa6eabf2b3de81ec10d2ce6777ebef,f9f1eb732fa8d93a0651b08a72e6f4e24c1f4a49..dc7b12369ce3079f53671bd353c284e063462fa7
--- 1/lib/Plack/App/Gruntmaster/HTML.pm
--- 2/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});
@@@ -115,7 -114,6 +115,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};
        my $status = ($args{time} < $args{start} ? 'starts' : 'ends');
        $tree->fclass('timer')->attr('data-stop', $status eq 'ends' ? $args{stop} : $args{start});
@@@ -236,9 -234,7 +236,7 @@@ sub process_log 
                $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);
-               $tr->fclass('size')->attr('data-private', '') if $data->{private};
+               $tr->fclass('source')->namedlink("$data->{id}.$data->{extension}", sprintf "%.2fKB %s", $data->{size}/1024, $data->{format});
                $tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
                $tr->fclass('result_text')->replace_content($data->{result_text});
                $tr->fclass('result_text')->attr(class => "r$data->{result}");