X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=319a5e509d70d71b881829a4addeb27fd010bae2;hb=b7c79e04cb3c8ea826ea1aac8049333564794536;hp=fe7e4964ebe02507e0f86b4d281667bb0636c593;hpb=20777d844ac7adb5887ea4e50885cd9702b7ee6a;p=gruntmaster-page.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index fe7e496..319a5e5 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) = @_;
@@ -71,6 +71,7 @@ sub _render {
 
 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});
@@ -114,6 +115,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});
@@ -122,6 +124,7 @@ sub process_ct_entry {
 		stop        => ftime   $args{stop},
 		status      => $status,
 		description => literal $args{description});
+	$tree->fid('ctcountdown')->detach if $args{time} >= $args{stop};
 }
 
 sub process_ct {
@@ -161,11 +164,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
 	}
 }
@@ -192,6 +197,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 {
@@ -246,7 +252,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}");
 }
@@ -274,6 +280,7 @@ 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});