X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=0a10ee83daba80770df48df48366faeeaa6be8e3;hb=b3da373011cea9bfc2349982b523b48c3b09adfc;hp=3195b623170da4c58059fd9f2cc8fcfe4e31d94b;hpb=6533844f1a2ec6b162b696c31a623a4dc8ee72bb;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 3195b62..0a10ee8 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -68,11 +68,13 @@ sub _render {
 	$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('defmap')});
 	$tree->as_HTML;
 }
 
 sub process_skel {
 	my ($tree, %args) = @_;
+	$tree->fid('logo')->replace_with(literal scalar read_file "mclogo.svg");
 	$tree->content_handler(
 		title   =>         $args{title},
 		content => literal $args{meat});
@@ -145,7 +147,6 @@ sub process_pb_entry {
 	$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->fid('job_log')->edit_href(sub{$_ .= "&private=$args{private}"}) if $args{private};
 	$tree->content_handler(
 		statement => literal $args{statement},
 		level     => ucfirst $args{level},
@@ -159,12 +160,10 @@ 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};
 		$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});
@@ -242,7 +241,7 @@ sub process_log {
 		$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});
-		$tr->fclass('source')->namedlink("$data->{id}.$data->{extension}", sprintf "%.2fKB %s", $data->{size}/1024, $data->{format});
+		$tr->fclass('source')->namedlink("$data->{id}.$data->{extension}", sprintf "%.2fKB %s", $data->{size}/1024, Plack::App::Gruntmaster::FORMAT_EXTENSION()->{$data->{format}});
 		$tr->fclass('owner')->namedlink($data->{owner}, $data->{owner_name});
 		$tr->fclass('result_text')->replace_content($data->{result_text});
 		$tr->fclass('result_text')->attr(class => "r$data->{result}");