X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=8df45ee4f839113259def81fcadf982c14e813d2;hb=3dbe882702b33302251aee9cc2d1d54b631ab861;hp=a21b6cc933da5393d48e6e67a4ddf84a6397d0ca;hpb=13bd614386ed048bdab35805369d796de1d6ad6d;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index a21b6cc..8df45ee 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -4,12 +4,20 @@ 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/;
 
 sub ftime ($)   { POSIX::strftime '%c', localtime shift }
-sub literal ($) { HTML::Element::Library::super_literal shift // '' }
+sub literal ($) {
+	my ($html) = @_;
+	return unless $html;
+	my $b = HTML::TreeBuilder->new;
+	$b->ignore_unknown(0);
+	$b->parse($html);
+	HTML::Element::Library::super_literal $b->guts->as_HTML;
+}
 
 sub HTML::Element::edit_href {
 	my ($self, $sub) = @_;
@@ -45,7 +53,7 @@ sub HTML::Element::namedlink {
 my %page_cache;
 for (<tmpl/*>) {
 	my ($tmpl, $lang) = m,tmpl/(\w+)\.(\w+),;
-	my $builder = HTML::Seamstress->new;
+	my $builder = HTML::TreeBuilder->new;
 	$builder->ignore_unknown(0);
 	$page_cache{$tmpl, $lang} = $builder->parse_file($_);
 }
@@ -78,8 +86,13 @@ sub _render {
 	$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(HTML::Element::Library::super_literal $logo);
 	$tree->content_handler(
 		title   =>         $args{title},
 		content => literal $args{meat});
@@ -165,10 +178,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};