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

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index a595331..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/;
 
@@ -45,7 +46,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($_);
 }
@@ -74,13 +75,17 @@ sub _render {
 	$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 scalar read_file "mclogo.svg");
+	$tree->fid('logo')->replace_with(literal $logo);
 	$tree->content_handler(
 		title   =>         $args{title},
 		content => literal $args{meat});
@@ -264,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 {