Merge branch 'master' into newmc

diff --combined lib/Plack/App/Gruntmaster/HTML.pm
index 7c26902709d498ee802bb0ec7b4617ed0d49a6c9,cd65088a44a40c83fb7e7b21ac3d833897f2788e..f0c49cd66813882540b0db71f552c49ecb26d9b5
--- 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});
@@@ -251,7 -249,7 +251,7 @@@ sub process_log 
                next unless $elem;
                delete $args{args}{page};
                my $str = join '&', map { $_ . '=' . $args{args}{$_} } keys %{$args{args}};
-               $elem->find('a')->edit_href(sub{s/$/&$str/});
+               $elem->find('a')->edit_href(sub{s/$/&$str/}) if $str;
        }
        $tree->fclass('current')->replace_content("Page $args{current_page} of $args{last_page}");
  }
@@@ -279,7 -277,6 +279,7 @@@ sub process_st 
  
  sub process_ed {
        my ($tree, %args) = @_;
 +      $tree->content_handler(editorial => literal $args{editorial});
        my $iter = sub {
                my ($data, $div) = @_;
                $div->set_child_content(class => 'value', $data->{value});