js/css in https

This commit is contained in:
Thomas NOËL 2013-09-17 11:47:54 +02:00
parent 06b6b3723c
commit 7e150c8eca
2 changed files with 5 additions and 5 deletions

View File

@ -3,8 +3,8 @@
{% load url from future %}
{% block extrascripts %}
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.6.2/leaflet.css" />
<script src="http://cdn.leafletjs.com/leaflet-0.6.2/leaflet.js"></script>
<link rel="stylesheet" href="{{ STATIC_URL }}leaflet/leaflet.css" />
<script src="{{ STATIC_URL }}leaflet/leaflet.js"></script>
<link rel="stylesheet" href="{{ STATIC_URL }}css/MarkerCluster.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}css/MarkerCluster.Default.css" />
<!--[if lte IE 8]><link rel="stylesheet" href="{{ STATIC_URL }}css/MarkerCluster.Default.ie.css" /><![endif]-->

View File

@ -5,11 +5,11 @@
<head>
<meta charset="utf-8"/>
<title>{% block page-title %}Univcloud{% endblock %}</title>
<script src="{{ STATIC_URL }}js/jquery.js"></script>
<script src="https://code.jquery.com/jquery-1.10.1.min.js"></script>
{% block extrascripts %}
{% endblock %}
<link href="http://code.jquery.com/ui/1.10.1/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
<link href='http://fonts.googleapis.com/css?family=Merriweather+Sans:400,300,700' rel='stylesheet' type='text/css'/>
<link href="https://code.jquery.com/ui/1.10.1/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
<link href='https://fonts.googleapis.com/css?family=Merriweather+Sans:400,300,700' rel='stylesheet' type='text/css'/>
<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/style.css"/>
</head>
<body {% block bodyargs %}{% endblock %}>