X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=21bb9d4edb648537e8a78a24af00ff59483d1721;hb=e2c74da60e49fefe027701ff143af2c5e0e109a4;hp=ea2e99ea3c44d199ccd1460c859a5bd10d9db861;hpb=2d39838c2a02e453a7c9c4d0d2633a250004aec8;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index ea2e99e..21bb9d4 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -49,7 +49,7 @@ sub HTML::Element::fclass { shift->look_down(class => qr/\b$_[0]\b/) }
 
 sub HTML::Element::namedlink {
 	my ($self, $id, $name) = @_;
-	$name = $id unless $name =~ /[[:graph:]]/;
+	$name = $id unless $name && $name =~ /[[:graph:]]/;
 	$self = $self->find('a');
 	$self->edit_href(sub {s/id/$id/});
 	$self->replace_content($name);
@@ -186,10 +186,7 @@ sub process_pb_entry {
 	if ($args{contest_stop}) {
 		$tree->fid('solution')->detach;
 		$tree->fid('solution_modal')->detach;
-		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('score')->replace_content($args{value});
 		$tree->fid('countdown')->attr('data-stop' => $args{contest_stop});
 	} else {
 		$tree->fid('job_log')->edit_href(sub{$_ .= "&private=$args{private}"}) if $args{private};
@@ -216,13 +213,13 @@ sub process_pb {
 		$tr->set_child_content(class => 'author', $data->{author});
 		$tr->set_child_content(class => 'level', ucfirst $data->{level});
 		$tr->fclass('name')->namedlink($data->{id}, $data->{name});
-		$tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{contest}"}) if $args{contest};
+		$tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{args}{contest}"}) if $args{args}{contest};
 		$tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
-		$tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private} && !$args{contest};
+		$tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private} && !$args{args}{contest};
 	};
 
 	$tree->find('tbody')->find('tr')->iter3([pb_sort @{$args{pb}}], $iter);
-	$tree->fid('open-alert')->detach unless $args{contest};
+	$tree->fid('open-alert')->detach unless $args{args}{contest};
 }
 
 sub process_log_entry {
@@ -257,7 +254,7 @@ sub process_log {
 		my ($data, $tr) = @_;
 		$tr->fclass('id')->namedlink($data->{id});
 		$tr->fclass('problem')->namedlink($data->{problem}, $data->{problem_name});
-		$tr->fclass('problem')->find('a')->edit_href(sub{$_ .= "?contest=$args{args}{contest}"}) if $args{args}{contest};
+		$tr->fclass('problem')->find('a')->edit_href(sub{$_ .= '?contest='.$data->{contest}}) if $data->{contest};
 		$tr->fclass('contest')->namedlink($data->{contest}, $data->{contest_name}) if $data->{contest};
 		$tr->fclass('contest')->replace_content('None') unless $data->{contest};
 		$tr->fclass('date')->replace_content(ftime $data->{date});