X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=9f6f2ec5b27c6454686be8a1916a3b95df8b018e;hb=f8a4fa095f622e783f2e27bfba86c0234a5983cf;hp=f2b4ec9cead19e8e98af996ff35a3e0f4f8bc83f;hpb=4b3f09fe441cc7bfb914c2ee05968ad387ba4f5b;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index f2b4ec9..9f6f2ec 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($_);
 }
@@ -74,7 +82,7 @@ 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;
 }
 
@@ -266,6 +274,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 {