X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=ce7ca7968d94cf733fd6e72d1b5f8d1584fd9d41;hb=00c887ce06707532ce45ad863139f79455480d24;hp=090ca325e85dc3d486453b2bec0c332b999a5a98;hpb=4e2ae6f8f5cb92a1938eb1a9f5b692b230cacced;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 090ca32..ce7ca79 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -32,7 +32,7 @@ sub HTML::Element::iter3 {
 }
 
 sub HTML::Element::fid    { shift->look_down(id    => shift) }
-sub HTML::Element::fclass { shift->look_down(class => shift) }
+sub HTML::Element::fclass { shift->look_down(class => qr/\b$_[0]\b/) }
 
 sub HTML::Element::namedlink {
 	my ($self, $id, $name) = @_;
@@ -116,10 +116,14 @@ sub process_ct_entry {
 	$_->edit_href (sub {s/contest_id/$args{id}/}) for $tree->find('a');
 	$tree->fid('editorial')->detach unless $args{finished};
 	$tree->fid('links')->detach unless $args{started};
+	my $status = ($args{time} < $args{start} ? 'starts' : 'ends');
+	$tree->fclass('timer')->attr('data-stop', $status eq 'ends' ? $args{stop} : $args{start});
 	$tree->content_handler(
 		start       => ftime   $args{start},
 		stop        => ftime   $args{stop},
+		status      => $status,
 		description => literal $args{description});
+	$tree->fid('ctcountdown')->detach if $args{time} >= $args{stop};
 }
 
 sub process_ct {
@@ -148,25 +152,24 @@ sub process_pb_entry {
 	if ($args{contest_stop}) {
 		$tree->fid('solution')->detach;
 		$tree->fid('solution_modal')->detach;
-		my $countdown = $tree->fid('countdown');
-		$countdown->attr('data-start' => $args{open_time});
-		$countdown->attr('data-stop' => $args{contest_stop});
-		$countdown->attr('data-time' => $args{time});
-		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::Result::Contest::calc_score($args{value}, $args{time} - $args{open_time}, 0, $args{contest_stop} - $args{contest_start}));
+		my $score = $tree->fid('score');
+		$score->attr('data-start' => $args{open_time});
+		$score->attr('data-stop'  => $args{contest_stop});
+		$score->attr('data-value'  => $args{value});
+		$tree->fid('countdown')->attr('data-stop' => $args{contest_stop});
 	} 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});
 	}
 	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{contest}) if $args{contest};
 		$contest->detach unless $args{contest}
 	} else {
+		$tree->fid('nosubmit')->find('a')->edit_href(sub{s/id/$args{id}/});
 		$tree->fid('submit')->detach
 	}
 }
@@ -275,6 +278,7 @@ sub process_st {
 
 sub process_ed {
 	my ($tree, %args) = @_;
+	$tree->content_handler(editorial => literal $args{editorial});
 	my $iter = sub {
 		my ($data, $div) = @_;
 		$div->set_child_content(class => 'value', $data->{value});