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

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 40d46af..3195b62 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) = @_;
@@ -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,8 @@ 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')});
 	$tree->as_HTML;
 }
 
@@ -114,11 +116,16 @@ 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});
 	$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 {
@@ -144,28 +151,32 @@ sub process_pb_entry {
 		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;
-		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});
 	}
-	$tree->fid('solution')->detach unless $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}
+		$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
 	}
 }
@@ -183,14 +194,16 @@ 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} && !$args{contest};
 	};
 	my $iter = sub {
 		my ($data, $div) = @_;
 		$div->attr(id => $data);
 		$div->find('h2')->replace_content(ucfirst $data);
-		$div->find('tbody')->iter3($args{$data}, $titer);
+		$div->find('tbody')->find('tr')->iter3($args{$data}, $titer);
 	};
 	$tree->fid('beginner')->iter3([grep {$args{$_}} qw/beginner easy medium hard/], $iter);
+	$tree->fid('open-alert')->detach unless $args{contest};
 }
 
 sub process_log_entry {
@@ -213,6 +226,8 @@ sub process_log_entry {
 		$tr->defmap(class => $data);
 		$tr->fclass('result_text')->attr(class => "r$data->{result}")
 	};
+	$tree->fclass('result_text')->replace_content($args{result_text});
+	$tree->fclass('result_text')->attr(class => "r$args{result}");
 	$args{results} ? $tree->fid('results')->find('tbody')->find('tr')->iter3($args{results}, $iter) : $tree->fid('results')->detach;
 	$tree->fid('no_results')->detach if $tree->fid('results') || $tree->fid('errors');
 }
@@ -223,17 +238,26 @@ 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});
-		$tr->fclass('size')->namedlink("$data->{id}.$data->{extension}", sprintf "%.2fKB", $data->{size}/1024);
-		$tr->fclass('size')->attr('data-private', '') if $data->{private};
+		$tr->fclass('source')->namedlink("$data->{id}.$data->{extension}", sprintf "%.2fKB %s", $data->{size}/1024, $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}");
+		$tr->find('td')->attr(class => $tr->find('td')->attr('class').' warning') if $data->{private};
 	};
 	$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/}) if $str;
+	}
 	$tree->fclass('current')->replace_content("Page $args{current_page} of $args{last_page}");
 }
 
@@ -243,7 +267,8 @@ sub process_st {
 	my $pbiter = sub {
 		my ($data, $th) = @_;
 		$th->attr(class => undef);
-		$th->namedlink($data->id, $data->name);
+		$th->namedlink(@$data);
+		$th->find('a')->edit_href(sub{s/$/?contest=$args{args}{contest}/});
 	};
 	$tree->fclass('problem')->iter3($args{problems}, $pbiter);
 	my $iter = sub {
@@ -256,3 +281,16 @@ sub process_st {
 	};
 	$tree->find('tbody')->find('tr')->iter3($args{st}, $iter);
 }
+
+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});
+		$div->set_child_content(class => 'solution', literal $data->{solution});
+		$div->fclass('problem')->namedlink($data->{id}, $data->{name});
+	};
+	my @pb = map { @{$args{$_} // []} } qw/beginner easy medium hard/;
+	$tree->fclass('well')->iter3(\@pb, $iter);
+}