X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=59e0293df4399ab68f8c9877ef46c66c57c0ec1f;hb=e8147a9466b97f5a2c5d216a0a833abaab19259a;hp=bcd1a887cdb20b2b9a09b27021d83e699e78a81d;hpb=127d5b70463179e8683b802bb85ec5561d3214c1;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index bcd1a88..59e0293 100644
--- 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 {
@@ -185,7 +193,7 @@ sub process_pb_entry {
 		$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;