X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FBase.pm;h=3a58c188af55920d61d198f64206aab68d04201b;hb=191f4979def520b8be01554eb954c80ee42df38b;hp=47beca71695a2e56c03221d1f5d4c4fbe0143cf2;hpb=a94f84535623ae0de44b63290aa4c8b1bf3e5eaa;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page/Base.pm b/lib/Gruntmaster/Page/Base.pm
index 47beca7..3a58c18 100644
--- a/lib/Gruntmaster/Page/Base.pm
+++ b/lib/Gruntmaster/Page/Base.pm
@@ -27,7 +27,7 @@ sub import {
 	*{"${caller}::TITLE"} = sub () { $title };
 	*{"${caller}::debug"} = sub {
 		local $Log::Log4perl::caller_depth = $Log::Log4perl::caller_depth + 1;
-		$_[0]->({qw/level debug message/ => $_[1]})
+		$_[0]->{'psgix.logger'}->({qw/level debug message/ => $_[1]})
 	};
 }
 
@@ -52,7 +52,7 @@ my %orig_header_templates = (
 
 <div class="collapse navbar-collapse">
 <ul class="nav navbar-nav">
-<li><a href="/pb/">Problem list</a>
+<li><a href="/pb/">Problems</a>
 <li><a href="/ct/">Contests</a>
 <li><a href="/account">Account</a>
 </ul>
@@ -75,9 +75,8 @@ my %orig_header_templates = (
 
 <div class="container-fluid">
 
-<div id="title"><span class="i">i</span><span class="Eval">Eval</span></div>
 <div id="subtitle">TITLE_GOES_HERE</div>
-
+<div id="result"></div>
 HTML
 );
 
@@ -93,7 +92,8 @@ HTML
 );
 
 sub patch_templates {
-	my $root = $ENV{GRUNTMASTER_TEMPLATE_ROOT} or return %{$_[0]};
+	my $root = 'tmpl';
+	return %{$_[0]} unless -d $root;
 	my ($templates, $name) = @_;
 	my %out = %$templates;
 	for (<$root/$name.*>) {
@@ -104,19 +104,15 @@ sub patch_templates {
 	%out
 }
 
-sub reload_templates (){ $ENV{GRUNTMASTER_RELOAD_TEMPLATES} }
-
 my %header_templates = patch_templates \%orig_header_templates, 'header';
 my %footer_templates = patch_templates \%orig_footer_templates, 'footer';
 
 sub header{
   my ($language, $title) = @_;
-  %header_templates = patch_templates \%orig_header_templates, 'header' if reload_templates;
   $header_templates{$language} =~ s/TITLE_GOES_HERE/$title/ger;
 }
 
 sub footer{
-  %footer_templates = patch_templates \%orig_footer_templates, 'footer' if reload_templates;
   $footer_templates{$_[0]};
 }
 
@@ -137,11 +133,11 @@ my %templates;
 sub generate{
 	my ($self, $lang, @args) = @_;
 
-	$templates{$self} = { cook_templates $self->TEMPLATES, $self->NAME => $self->TITLE } if !exists $templates{$self} or reload_templates;
+	$templates{$self} = { cook_templates $self->TEMPLATES, $self->NAME => $self->TITLE } unless exists $templates{$self};
 
 	my $htc = HTML::Template::Compiled->new(scalarref => \$templates{$self}{$lang}, default_escape => 'HTML',);
 	$self->_generate($htc, $lang, @args);
-	[200, ['Content-Type' => 'text/html', 'Content-Language' => $_[1]], [ encode 'UTF-8' => $htc->output ] ]
+	[200, ['Content-Type' => 'text/html', 'Content-Language' => $_[1], 'Vary' => 'Accept-Language'], [ encode 'UTF-8' => $htc->output ] ]
 }
 
 sub _generate {}