X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=5c108d1a7a035618c3cafd23828f581276a215c6;hb=25ed3a342819b81afaf9d04c8c6f8db372a22392;hp=7df9ef3c5f422fc47b388120bcfdd37b86841f1d;hpb=0f578ab0f7b5798b2b27fb94901e99303da855a2;p=gruntmaster-page.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 7df9ef3..5c108d1 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -14,7 +14,7 @@ my $optional_end_tags = {%HTML::Tagset::optionalEndTag, tr => 1, td => 1, th =>
 sub ftime ($)   { POSIX::strftime '%c', localtime shift }
 sub literal ($) {
 	my ($html) = @_;
-	return unless $html;
+	return '' unless $html;
 	my $b = HTML::TreeBuilder->new;
 	$b->ignore_unknown(0);
 	$b->parse($html);
@@ -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);
 }
@@ -155,6 +161,10 @@ sub process_ct {
 		$tr->fclass('name')->namedlink($data->{id}, $data->{name});
 		$tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
 	};
+	for (@{$args{ct}}) {
+		my $state = $_->{finished} ? 'finished' : $_->{started} ? 'running' : 'pending';
+		push @{$args{$state} //= []}, $_;
+	}
 	$args{$_} ? $tree->fid($_)->find('tbody')->find('tr')->iter3($args{$_}, $iter) : $tree->fid($_)->detach for qw/running pending finished/;
 }
 
@@ -187,16 +197,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 {
@@ -220,6 +225,7 @@ sub process_pb {
 		$div->find('h2')->replace_content(ucfirst $data);
 		$div->find('tbody')->find('tr')->iter3($args{$data}, $titer);
 	};
+	push @{$args{$_->{level}} //= []}, $_ for @{$args{pb}};
 	$tree->fid('beginner')->iter3([grep {$args{$_}} qw/beginner easy medium hard/], $iter);
 	$tree->fid('open-alert')->detach unless $args{contest};
 }
@@ -277,10 +283,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 {
@@ -313,7 +315,7 @@ sub process_ed {
 		$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 = sort { $a->{value} <=> $b->{value} } @{$args{pb}};
 	$tree->fclass('well')->iter3(\@pb, $iter);
 }