From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 23 Feb 2015 18:34:51 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;ds=sidebyside;h=af74ccc4bb368985516d7d13ab854c67b562ef79;hp=-c;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc
---

af74ccc4bb368985516d7d13ab854c67b562ef79
diff --combined lib/Plack/App/Gruntmaster.pm
index 288f18c,3ec5284..2bacc0a
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@@ -75,7 -75,7 +75,7 @@@ sub job     { db->job     ($_{job}
  sub user    { db->user    ($_{user})    }
  
  sub redirect { [301, ['X-Forever' => 1, 'Location' => $_[0]], []] }
- sub reply    { [200, ['Content-Type' => 'text/plain'], \@_] }
+ sub reply    { [200, ['Content-Type' => 'text/plain; charset=utf-8'], \@_] }
  sub response {
  	my ($template, $title, $params, $maxage) = @_;
  	unless ($params) {
@@@ -104,14 -104,14 +104,14 @@@ sub dispatch_request
  			return NOT_FOUND unless -e "css/themes/$theme.css";
  			my $css = read_file "css/themes/$theme.css";
  			$css .= read_file $_ for <css/*.css>;
- 			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'text/css');
+ 			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'text/css; charset=utf-8');
  			[200, \@headers, [development ? $css : CSS::Minifier::XS::minify $css]]
  		},
  
  		sub (/js.js) {
  			my $js;
  			$js .= read_file $_ for <js/*.js>;
- 			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'application/javascript');
+ 			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'application/javascript; charset=utf-8');
  			[200, \@headers, [development ? $js : JavaScript::Minifier::XS::minify $js]]
  		},
  
@@@ -148,9 -148,9 +148,9 @@@
  				return $r if ref $r ne 'Plack::App::Gruntmaster::Response';
  				my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}");
  				push @hdrs, Vary => 'Authorization' if $privacy eq 'private';
- 				return [200, ['Content-Type' => 'application/json', @hdrs], [encode_json $r->{params}]] if $format eq 'json';
+ 				return [200, ['Content-Type' => 'application/json; charset=utf-8', @hdrs], [encode_json $r->{params}]] if $format eq 'json';
  				my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}};
- 				[200, ['Content-Type' => 'text/html', @hdrs], [encode 'UTF-8', $ret]]
+ 				[200, ['Content-Type' => 'text/html; charset=utf-8', @hdrs], [encode 'UTF-8', $ret]]
  			},
  		},
  
@@@ -166,8 -166,7 +166,8 @@@
  
  		sub (/ed/:contest) {
  			forbid contest->is_running;
 -			response ed => 'Editorial of ' . contest->name, db->problem_list(contest => $_{contest}, solution => 1);
 +			my $pblist = db->problem_list(contest => $_{contest}, solution => 1);
 +			response ed => 'Editorial of ' . contest->name, {%$pblist, editorial => contest->editorial};
  		},
  
  		sub (/login) {
@@@ -214,7 -213,7 +214,7 @@@
  
  		sub (/) { redispatch_to '/index' },
  		sub (/favicon.ico) { redirect '/static/favicon.ico' },
- 		sub (/:article) { [200, ['Content-Type' => 'text/html', 'Cache-Control' => 'public, max-age=60', 'X-Forever' => 1], [render_article $_{article}, 'en']] }
+ 		sub (/:article) { [200, ['Content-Type' => 'text/html; charset=utf-8', 'Cache-Control' => 'public, max-age=60', 'X-Forever' => 1], [render_article $_{article}, 'en']] }
  	},
  
  	sub (POST) {