X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=b4f863ad2187550ea35dd9ee242dc71111d4339a;hb=fd15256b2c8997bdda94c1ebadb15d86a280d9d4;hp=3404ddb2b04ecbc4a5a23a56870a7abd06ee3f06;hpb=00398f5cc3854c6e0364a61c086ba22fdce6a5d1;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 3404ddb..b4f863a 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -114,6 +114,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});
@@ -162,11 +163,13 @@ sub process_pb_entry {
 		$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
 	}
 }
@@ -184,7 +187,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) = @_;
@@ -193,6 +196,7 @@ sub process_pb {
 		$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 {
@@ -231,9 +235,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('format')->replace_content($data->{format});
-		$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}");
@@ -247,7 +249,7 @@ sub process_log {
 		next unless $elem;
 		delete $args{args}{page};
 		my $str = join '&', map { $_ . '=' . $args{args}{$_} } keys %{$args{args}};
-		$elem->find('a')->edit_href(sub{s/$/&$str/});
+		$elem->find('a')->edit_href(sub{s/$/&$str/}) if $str;
 	}
 	$tree->fclass('current')->replace_content("Page $args{current_page} of $args{last_page}");
 }
@@ -275,12 +277,13 @@ 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});
 		$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/;
+	my @pb = map { @{$args{$_} // []} } qw/beginner easy medium hard/;
 	$tree->fclass('well')->iter3(\@pb, $iter);
 }