X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=a82cafd1cd3ab7023a788bd9463d86673601f6be;hb=dc7e3b7c32ab45ca72d1ec68e74d1aceab7fe041;hp=04127828de03ee7704f2deb2887d0eba9142a2ee;hpb=9a4806b3c49eef940ac5d2d2b38f9d47b346d544;p=gruntmaster-page.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 0412782..a82cafd 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -118,11 +118,14 @@ sub process_pb_entry {
 	my ($tree, %args) = @_;
 	$tree->fid('owner')->edit_href(sub{s/owner_id/$args{owner}/});
 	$tree->fid('job_log')->edit_href(sub{s/problem_id/$args{id}/});
+	$tree->fid('solution')->edit_href(sub{s/problem_id/$args{id}/});
 	$tree->content_handler(
 		statement => literal $args{statement},
 		author    =>         $args{author},
 		owner     =>         $args{owner_name} || $args{owner});
 	if ($args{contest_stop}) {
+		$tree->fid('solution')->detach;
+		$tree->fid('solution_modal')->detach;
 		my $countdown = $tree->fid('countdown');
 		$countdown->attr('data-start' => $args{contest_start});
 		$countdown->attr('data-stop' => $args{contest_stop});
@@ -133,6 +136,7 @@ sub process_pb_entry {
 		$tree->fid('score')->replace_content(Gruntmaster::Data::calc_score($args{value}, $args{time} - $args{contest_start}, 0, $args{contest_stop} - $args{contest_start}));
 	} else {
 		$_->detach for $tree->fclass('rc'); # requires contest
+		$tree->fid('solution_modal')->fclass('modal-body')->replace_content(literal $args{solution});
 	}
 	if ($args{cansubmit}) {
 		$tree->look_down(name => 'problem')->attr(value => $args{id});
@@ -144,6 +148,11 @@ sub process_pb_entry {
 	}
 }
 
+sub process_sol {
+	my ($tree, %args) = @_;
+	$tree->content_handler(solution => literal $args{solution});
+}
+
 sub process_pb {
 	my ($tree, %args) = @_;
 	my $titer = sub {
@@ -207,7 +216,7 @@ sub process_st {
 		my ($st, $tr) = @_;
 		$tr->set_child_content(class => 'rank', $st->{rank});
 		$tr->set_child_content(class => 'score', $st->{score});
-		$tr->fclass('user')->namedlink($st->{user}->id, $st->{user}->name);
+		$tr->fclass('user')->namedlink($st->{user}, $st->{user_name});
 		my $pbscore = $tr->fclass('pbscore');
 		$pbscore->detach unless $st->{problems};
 		$pbscore->iter($pbscore => @{$st->{scores}});