X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=dc7b12369ce3079f53671bd353c284e063462fa7;hb=84899acc134472beb68d9ff03a4da0134b88e2e6;hp=0a681161a51f91856bedde4e9b43d49177ef0a29;hpb=760348134595e67b49d9be7284ae9c74c1d2d9b5;p=gruntmaster-page.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 0a68116..dc7b123 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -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});
@@ -196,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 {
@@ -234,9 +236,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}");
@@ -250,7 +250,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}");
 }
@@ -278,12 +278,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);
 }