Commit 243e25eb by Barry Warsaw

Merge branch 'master' into 'master'

switch to https for stylesheet and JS CDN urls

Chrome does not allow to load static content over insecure http
if the site is being served over https. So, we switch to the
https version of the url.

Fixes #8

See merge request !4
parents 7af32358 3d16cc24
......@@ -19,6 +19,10 @@ DEFAULT_LANG = u'en'
URL_PREFIX = ''
# URL to bootstrap cdn over https
BS3_URL = 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css'
BS3_JS = 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js'
# Feed generation is usually not desired when developing
FEED_ALL_ATOM = None
CATEGORY_FEED_ATOM = None
......
......@@ -18,7 +18,7 @@
{% if BS3_URL %}
<link rel="stylesheet" href="{{ genurl( BS3_URL ) }}">
{% else %}
<link rel="stylesheet" href="{{ genurl( 'http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css' ) }}">
<link rel="stylesheet" href="{{ genurl( 'https://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css' ) }}">
{% endif %}
{% if BS3_THEME %}
......@@ -40,13 +40,13 @@
{% if JQUERY_JS %}
<script src="{{ JQUERY_JS }}"></script>
{% else %}
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
<script src="https://code.jquery.com/jquery-1.10.1.min.js"></script>
{% endif %}
{% if JQUERY_MIGRATE_JS %}
<script src="{{ JQUERY_MIGRATE_JS }}"></script>
{% else %}
<script src="http://code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
<script src="https://code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
{% endif %}
{% if BS3_JS %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment