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 0a681161a51f91856bedde4e9b43d49177ef0a29..66468ca6a1aa6eabf2b3de81ec10d2ce6777ebef 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -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});
@@ -196,6 +197,7 @@ sub process_pb {
                $div->find('tbody')->find('tr')->iter3($args{$data}, $titer);
        };
        $tree->fid('beginner')->iter3([grep {$args{$_}} qw/beginner easy medium hard/], $iter);
+       $tree->fid('open-alert')->detach unless $args{contest};
 }
 
 sub process_log_entry {
@@ -250,7 +252,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}");
 }
@@ -278,12 +280,13 @@ 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});
                $div->set_child_content(class => 'solution', literal $data->{solution});
                $div->fclass('problem')->namedlink($data->{id}, $data->{name});
        };
-       my @pb = map { @{$args{$_}} } qw/beginner easy medium hard/;
+       my @pb = map { @{$args{$_} // []} } qw/beginner easy medium hard/;
        $tree->fclass('well')->iter3(\@pb, $iter);
 }