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

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index acb45c0..396f7d9 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -4,7 +4,8 @@ use parent qw/Exporter/;
 our @EXPORT = qw/render render_article/;
 
 use File::Slurp qw/read_file/;
-use HTML::Seamstress;
+use HTML::Element::Library;
+use HTML::TreeBuilder;
 use POSIX qw//;
 use Data::Dumper qw/Dumper/;
 
@@ -42,6 +43,14 @@ sub HTML::Element::namedlink {
 	$self->replace_content($name);
 }
 
+my %page_cache;
+for (<tmpl/*>) {
+	my ($tmpl, $lang) = m,tmpl/(\w+)\.(\w+),;
+	my $builder = HTML::TreeBuilder->new;
+	$builder->ignore_unknown(0);
+	$page_cache{$tmpl, $lang} = $builder->parse_file($_);
+}
+
 sub render {
 	my ($tmpl, $lang, %args) = @_;
 	$lang //= 'en';
@@ -59,21 +68,24 @@ sub render_article {
 
 sub _render {
 	my ($tmpl, $lang, %args) = @_;
-	my $builder = HTML::Seamstress->new;
-	$builder->ignore_unknown(0);
-	my $tree = $builder->parse_file("tmpl/$tmpl.$lang");
+	my $tree = $page_cache{$tmpl, $lang}->clone or die "No such template/language combination: $tmpl/$lang\n";
 	$tree = $tree->guts unless $tmpl eq 'skel';
 	$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')});
+	$_->attr('smap', undef) for $tree->look_down(sub {$_[0]->attr('smap')});
 	$tree->as_HTML;
 }
 
+my $logo = read_file 'mclogo.svg';
+$logo =~ y/\n//d;
+$logo =~ s/(\s+)/ /g;
+
 sub process_skel {
 	my ($tree, %args) = @_;
+	$tree->fid('logo')->replace_with(literal $logo);
 	$tree->content_handler(
 		title   =>         $args{title},
 		content => literal $args{meat});
@@ -159,10 +171,7 @@ sub process_pb_entry {
 	if ($args{contest_stop}) {
 		$tree->fid('solution')->detach;
 		$tree->fid('solution_modal')->detach;
-		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('score')->replace_content($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};
@@ -243,7 +252,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('source')->namedlink("$data->{id}.$data->{extension}", sprintf "%.2fKB %s", $data->{size}/1024, $data->{format});
+		$tr->fclass('source')->namedlink("$data->{id}.$data->{extension}", sprintf "%.2fKB %s", $data->{size}/1024, Plack::App::Gruntmaster::FORMAT_EXTENSION()->{$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}");
@@ -260,6 +269,10 @@ sub process_log {
 		$elem->find('a')->edit_href(sub{s/$/&$str/}) if $str;
 	}
 	$tree->fclass('current')->replace_content("Page $args{current_page} of $args{last_page}");
+
+	my @detach;
+	push @detach, $args{args}{$_} ? $tree->fclass($_) : () for qw/problem contest owner/;
+	$_->detach for @detach;
 }
 
 sub process_st {
@@ -295,3 +308,6 @@ sub process_ed {
 	my @pb = map { @{$args{$_} // []} } qw/beginner easy medium hard/;
 	$tree->fclass('well')->iter3(\@pb, $iter);
 }
+
+1;
+__END__