From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 11 Apr 2015 12:26:16 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=911c62b8bdc652e0d33d33cd366905acdcb93290;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc
---

911c62b8bdc652e0d33d33cd366905acdcb93290
diff --cc lib/Plack/App/Gruntmaster/HTML.pm
index 8df45ee,bcd1a88..daf739b
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@@ -83,16 -86,11 +86,16 @@@ sub _render 
  	$_->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('smap')});
- 	$tree->as_HTML;
+ 	$tree->as_HTML(undef, undef, $optional_end_tags);
  }
  
 +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});