Merge branch 'master' into newmc

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

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index bcd1a887cdb20b2b9a09b27021d83e699e78a81d..b23ddb970b0269edbb13aa3f0228403d30ce8db0 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -64,7 +64,15 @@ sub render {
        my ($tmpl, $lang, %args) = @_;
        $lang //= 'en';
        my $meat = _render($tmpl, $lang, %args);
-       _render('skel', $lang, %args, meat => $meat)
+       my $html = _render('skel', $lang, %args, meat => $meat);
+       if ($tmpl eq 'pb_entry') { # Move sidebar to correct position
+               my $builder = HTML::TreeBuilder->new;
+               $builder->ignore_unknown(0);
+               my $tree = $builder->parse_content($html);
+               $tree->fid('content')->postinsert($tree->fid('sidebar'));
+               $html = $tree->as_HTML(undef, undef, $optional_end_tags)
+       }
+       $html
 }
 
 sub render_article {
@@ -176,16 +184,13 @@ 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};
                $tree->fid('solution')->detach unless $args{solution};
                $_->detach for $tree->fclass('rc'); # requires contest
-               $tree->fid('solution_modal')->fclass('modal-body')->replace_content(literal $args{solution});
+               $tree->fid('solution_modal')->replace_content(literal $args{solution});
        }
        if ($args{cansubmit}) {
                $tree->fid('nosubmit')->detach;