X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=3306be2100508109375494120dfba633ef897bdd;hb=4a3952b20e4aea2e548cbd806953e4d7c61f495f;hp=0ac0c88b6fe17667139cd11983aaf8c751a84985;hpb=0f67fb9082cb5c513730a28b6a7363268d835f9f;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 0ac0c88..3306be2 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -154,12 +154,12 @@ sub process_pb_entry {
 		my $left = $args{contest_stop} - $args{time};
 		$countdown->replace_content(sprintf '%02d:%02d:%02d', $left/60/60, $left/60%60, $left%60);
 		$tree->fid('score')->attr('data-value' => $args{value});
-		$tree->fid('score')->replace_content(Gruntmaster::Data::calc_score($args{value}, $args{time} - $args{open_time}, 0, $args{contest_stop} - $args{contest_start}));
+		$tree->fid('score')->replace_content(Gruntmaster::Data::Result::Contest::calc_score($args{value}, $args{time} - $args{open_time}, 0, $args{contest_stop} - $args{contest_start}));
 	} else {
+		$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')->detach unless $args{solution};
 	if ($args{cansubmit}) {
 		$tree->look_down(name => 'problem')->attr(value => $args{id});
 		my $contest = $tree->look_down(name => 'contest');
@@ -234,6 +234,13 @@ sub process_log {
 	$tree->find('table')->find('tbody')->find('tr')->iter3($args{log}, $iter);
 	$args{next_page} ? $tree->fclass('next')->namedlink($args{next_page}, 'Next') : $tree->fclass('next')->detach;
 	$args{previous_page} ? $tree->fclass('previous')->namedlink($args{previous_page}, 'Previous') : $tree->fclass('previous')->detach;
+	for my $cls (qw/next previous/) {
+		my $elem = $tree->fclass($cls);
+		next unless $elem;
+		delete $args{args}{page};
+		my $str = join '&', map { $_ . '=' . $args{args}{$_} } keys $args{args};
+		$elem->find('a')->edit_href(sub{s/$/&$str/});
+	}
 	$tree->fclass('current')->replace_content("Page $args{current_page} of $args{last_page}");
 }
 
@@ -243,7 +250,7 @@ sub process_st {
 	my $pbiter = sub {
 		my ($data, $th) = @_;
 		$th->attr(class => undef);
-		$th->namedlink($data->id, $data->name);
+		$th->namedlink(@$data);
 	};
 	$tree->fclass('problem')->iter3($args{problems}, $pbiter);
 	my $iter = sub {