X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster%2FHTML.pm;h=b23ddb970b0269edbb13aa3f0228403d30ce8db0;hb=5776eb1224280d006eda895436aeff574311366c;hp=7863f4f425a43cba20579d9e422af4cc7a6d6b3f;hpb=a9159cae5cd97f3f2d52de2b7c64decd44534f77;p=gruntmaster-page.git

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 7863f4f..b23ddb9 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -64,7 +64,15 @@ sub render {
 	my ($tmpl, $lang, %args) = @_;
 	$lang //= 'en';
 	my $meat = _render($tmpl, $lang, %args);
-	_render('skel', $lang, %args, meat => $meat)
+	my $html = _render('skel', $lang, %args, meat => $meat);
+	if ($tmpl eq 'pb_entry') { # Move sidebar to correct position
+		my $builder = HTML::TreeBuilder->new;
+		$builder->ignore_unknown(0);
+		my $tree = $builder->parse_content($html);
+		$tree->fid('content')->postinsert($tree->fid('sidebar'));
+		$html = $tree->as_HTML(undef, undef, $optional_end_tags)
+	}
+	$html
 }
 
 sub render_article {
@@ -89,13 +97,8 @@ sub _render {
 	$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});