X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=b67ef296cf544a0164e7ecadb175a33485680d6c;hb=dd962dd2b75089dabe9f01ddad0a51529e78f3ec;hp=7df9ef3c5f422fc47b388120bcfdd37b86841f1d;hpb=0f578ab0f7b5798b2b27fb94901e99303da855a2;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 7df9ef3..b67ef29 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 {
@@ -83,8 +91,6 @@ sub _render {
 	$tree->defmap(smap => \%args);
 	my $process = __PACKAGE__->can("process_$tmpl");
 	$process->($tree, %args) if $process;
-	$_->detach for $tree->look_down(static => $args{static} ? 'no' : 'yes');
-	$_->attr('static', undef) for $tree->look_down(sub {$_[0]->attr('static')});
 	$_->attr('smap', undef) for $tree->look_down(sub {$_[0]->attr('smap')});
 	$tree->as_HTML(undef, undef, $optional_end_tags);
 }
@@ -187,16 +193,11 @@ sub process_pb_entry {
 		$_->detach for $tree->fclass('rc'); # requires contest
 		$tree->fid('solution_modal')->replace_content(literal $args{solution});
 	}
-	if ($args{cansubmit}) {
-		$tree->fid('nosubmit')->detach;
-		$tree->look_down(name => 'problem')->attr(value => $args{id});
-		my $contest = $tree->look_down(name => 'contest');
-		$contest->attr(value => $args{args}{contest}) if $args{args}{contest};
-		$contest->detach unless $args{args}{contest}
-	} else {
-		$tree->fid('nosubmit')->find('a')->edit_href(sub{s/id/$args{id}/});
-		$tree->fid('submit')->detach
-	}
+
+	$tree->look_down(name => 'problem')->attr(value => $args{id});
+	my $contest = $tree->look_down(name => 'contest');
+	$contest->attr(value => $args{args}{contest}) if $args{args}{contest};
+	$contest->detach unless $args{args}{contest}
 }
 
 sub process_sol {
@@ -277,10 +278,6 @@ sub process_log {
 		$elem->find('a')->edit_href(sub{s/$/&$str/}) if $str;
 	}
 	$tree->fclass('current')->replace_content("Page $args{current_page} of $args{last_page}");
-
-	my @detach;
-	push @detach, $args{args}{$_} ? $tree->fclass($_) : () for qw/problem contest owner/;
-	$_->detach for @detach;
 }
 
 sub process_st {