X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=acb45c049c8eb42c0cfbe08c43e804ff1f207f9d;hb=bca1707ca8c3959ade1ed1004a6ba363e09d8b66;hp=f9f1eb732fa8d93a0651b08a72e6f4e24c1f4a49;hpb=392487d620d90bca05d8706930d567be9eefb16b;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index f9f1eb7..acb45c0 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -50,11 +50,11 @@ sub render {
 }
 
 sub render_article {
-	my ($art, $lang) = @_;
+	my ($art, $lang, %args) = @_;
 	$lang //= 'en';
 	my $title = read_file "a/$art.$lang.title";
 	my $meat  = read_file "a/$art.$lang";
-	_render('skel', $lang, title => $title , meat => $meat)
+	_render('skel', $lang, title => $title , meat => $meat, %args)
 }
 
 sub _render {
@@ -66,6 +66,9 @@ sub _render {
 	$tree->defmap(smap => \%args);
 	my $process = __PACKAGE__->can("process_$tmpl");
 	$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;
 }
 
@@ -114,6 +117,7 @@ sub process_us {
 sub process_ct_entry {
 	my ($tree, %args) = @_;
 	$_->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});
@@ -142,12 +146,16 @@ 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},
 		author    =>         $args{author},
 		owner     =>         $args{owner_name} || $args{owner});
+	if ($args{limits}) {
+		my @limits = (@{$args{limits}}, {format => 'Other', timeout => $args{timeout} });
+		@limits = map { sprintf '%s (%s)', @{$_}{qw/timeout format/} } @limits;
+		$tree->look_down(smap => 'timeout')->replace_content(join ', ', @limits);
+	}
 	if ($args{contest_stop}) {
 		$tree->fid('solution')->detach;
 		$tree->fid('solution_modal')->detach;
@@ -157,6 +165,7 @@ sub process_pb_entry {
 		$score->attr('data-value'  => $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});
@@ -165,8 +174,8 @@ sub process_pb_entry {
 		$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}
+		$contest->attr(value => $args{args}{contest}) if $args{args}{contest};
+		$contest->detach unless $args{args}{contest}
 	} else {
 		$tree->fid('nosubmit')->find('a')->edit_href(sub{s/id/$args{id}/});
 		$tree->fid('submit')->detach
@@ -186,7 +195,7 @@ sub process_pb {
 		$tr->fclass('name')->namedlink($data->{id}, $data->{name});
 		$tr->fclass('name')->find('a')->edit_href(sub {$_ .= "?contest=$args{contest}"}) if $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};
+		$tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private} && !$args{contest};
 	};
 	my $iter = sub {
 		my ($data, $div) = @_;
@@ -230,7 +239,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{contest}"}) if $args{contest};
+		$tr->fclass('problem')->find('a')->edit_href(sub{$_ .= "?contest=$args{args}{contest}"}) if $args{args}{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});