Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Mon, 2 Mar 2015 15:08:18 +0000 (17:08 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Mon, 2 Mar 2015 15:08:18 +0000 (17:08 +0200)
Conflicts:
js/90-themes.js
tmpl/skel.en

1  2 
app.psgi
js/90-themes.js
tmpl/skel.en

diff --cc app.psgi
index 728e144e4cf0b742cf7f22765925419d51f350e1,53721091fb1bf799c058206d811e4bfc12eaf186..be72e9b18b9bd2fa4dd7ea7317d41d84a44e035c
+++ b/app.psgi
@@@ -5,14 -5,11 +5,11 @@@ no if $] >= 5.017011, warnings => 'expe
  use Gruntmaster::Data;
  use Plack::App::Gruntmaster;
  use Plack::Builder;
- use Plack::Request;
  use Plack::Util;
- use Digest::SHA qw/sha256/;
  use Log::Log4perl;
- use Tie::Hash::Expire;
  
  use constant AUTH_TIMEOUT => 5 * 60;
 -use constant ACCESSLOG_FORMAT => 'combined';
 +use constant ACCESSLOG_FORMAT => '%{X-Forwarded-For}i %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"';
  
  sub CONTENT_SECURITY_POLICY () {
        my $csp = <<CSP;
@@@ -20,10 -17,10 +17,10 @@@ default-src 'none
  connect-src 'self'
  form-action 'self'
  frame-ancestors 'none'
 -img-src 'self'
 +img-src 'self' https://static.mindcoding.ro https://www.google-analytics.com/collect
  referrer origin-when-cross-origin
- script-src https://static.mindcoding.ro/js.js https://www.google-analytics.com/analytics.js
- style-src https://static.mindcoding.ro/css/
 -script-src 'self'
 -style-src 'self'
++script-src https://static.mindcoding.ro/static/js.js https://www.google-analytics.com/analytics.js
++style-src https://static.mindcoding.ro/static/css/
  CSP
        chomp $csp;
        $csp =~ s/\n/; /gr;
diff --cc js/90-themes.js
index 3c5d5c57b5f82db72b7b5310ae10d8560dfaa164,1e6fdceb66d996c31291974f5d44412a4abce126..b7d73221bc1a255a63c1f6570a0e1fd9ecc0d045
@@@ -1,14 -1,8 +1,14 @@@
  (function(){
        'use strict';
        function set_style(name){
-               $('#stylesheet').attr("href", "https://static.mindcoding.ro/css/" + name + ".css");
 -              $('#stylesheet').attr("href", "/static/css/" + name + ".css");
++              $('#stylesheet').attr("href", "https://static.mindcoding.ro/static/css/" + name + ".css");
                localStorage.setItem("theme", name);
 +              $(document).ready(function() {
 +                      if(name == 'slate' || name == 'cyborg')
 +                              $('.logo').removeClass('logo-light');
 +                      else
 +                              $('.logo').addClass('logo-light');
 +              });
        }
  
        $( document ).ready(function() {
diff --cc tmpl/skel.en
index 17804ad0eff9098e9c8eb205c8e97008c476a84b,93e07b87142f8b68e5cea212865788296c2c3b67..1f7f60e8aa8e30ffefac3777b04873d0720bf43c
@@@ -3,8 -3,8 +3,8 @@@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
- <link rel="stylesheet" href="https://static.mindcoding.ro/css/slate.css" id="stylesheet">
- <script src="https://static.mindcoding.ro/js.js" type="text/javascript" async defer></script>
 -<link rel="stylesheet" href="/static/css/cyborg.css" id="stylesheet">
 -<script src="/static/js.js" type="text/javascript" async defer></script>
++<link rel="stylesheet" href="https://static.mindcoding.ro/static/css/cyborg.css" id="stylesheet">
++<script src="https://static.mindcoding.ro/static/js.js" type="text/javascript" async defer></script>
  
  <body>
  <nav role="navigation">
This page took 0.013247 seconds and 4 git commands to generate.