Skip to content
Snippets Groups Projects
Commit d6b6c9ab5ef5 authored by Florent Aide's avatar Florent Aide
Browse files

cleanup assets loading to make lines and pointer removal possible

parent c7997f13867b
No related tags found
No related merge requests found
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>pyTSPrf Conf Map</title> <title>pyTSPrf Conf Map</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="TSP web Service" /> <meta name="description" content="TSP web Service" />
<meta name="keywords" content="pyconf 2015, tsp, restful, web service, xcg-consulting" /> <meta name="keywords" content="pyconf 2015, tsp, restful, web service, xcg-consulting" />
<meta name="author" content="Florent Aide, Patrice Journoud" /> <meta name="author" content="Florent Aide, Patrice Journoud" />
...@@ -8,11 +7,11 @@ ...@@ -8,11 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="TSP web Service" /> <meta name="description" content="TSP web Service" />
<meta name="keywords" content="pyconf 2015, tsp, restful, web service, xcg-consulting" /> <meta name="keywords" content="pyconf 2015, tsp, restful, web service, xcg-consulting" />
<meta name="author" content="Florent Aide, Patrice Journoud" /> <meta name="author" content="Florent Aide, Patrice Journoud" />
<!--link type="text/css" rel="stylesheet" href="assets/css/norican.css"--> <link type="text/css" rel="stylesheet" href="assets/css/norican.css">
<script type="text/javascript" src="assets/jquery/1.8.2/jquery.min.js"></script> <script type="text/javascript" src="assets/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript" src="assets/jquery/plugins/jquery.cookie.js"></script> <script type="text/javascript" src="assets/jquery/plugins/jquery.cookie.js"></script>
<script type="text/javascript" src="assets/bootstrap/js/bootstrap.min.js"></script> <script type="text/javascript" src="assets/bootstrap/js/bootstrap.min.js"></script>
<link type="text/css" rel="stylesheet" href="assets/bootstrap/css/bootstrap.css"> <link type="text/css" rel="stylesheet" href="assets/bootstrap/css/bootstrap.css">
...@@ -15,7 +14,10 @@ ...@@ -15,7 +14,10 @@
<script type="text/javascript" src="assets/jquery/plugins/jquery.cookie.js"></script> <script type="text/javascript" src="assets/jquery/plugins/jquery.cookie.js"></script>
<script type="text/javascript" src="assets/bootstrap/js/bootstrap.min.js"></script> <script type="text/javascript" src="assets/bootstrap/js/bootstrap.min.js"></script>
<link type="text/css" rel="stylesheet" href="assets/bootstrap/css/bootstrap.css"> <link type="text/css" rel="stylesheet" href="assets/bootstrap/css/bootstrap.css">
<link type="text/css" rel="stylesheet" href="assets/leaflet/leaflet.css" /> <link type="text/css" rel="stylesheet" href="assets/leaflet/0.7.5/leaflet.css" />
<script type="text/javascript" src="assets/leaflet/leaflet.js"></script> <script src="assets/leaflet/0.7.5/leaflet.js"></script>
<script type="text/javascript" src="assets/leaflet/plugins/Leaflet.label/leaflet.label.js"></script>
<script type="text/javascript" src="assets/leaflet/plugins/leaflet.markercluster/leaflet.markercluster.js"></script>
<!--[if lte IE 8]><link type="text/css" rel="stylesheet" href="assets/leaflet/leaflet.ie.css" /><![endif]-->
<link type="text/css" rel="stylesheet" href="assets/leaflet/plugins/Leaflet.label/leaflet.label.css" /> <link type="text/css" rel="stylesheet" href="assets/leaflet/plugins/Leaflet.label/leaflet.label.css" />
...@@ -21,5 +23,3 @@ ...@@ -21,5 +23,3 @@
<link type="text/css" rel="stylesheet" href="assets/leaflet/plugins/Leaflet.label/leaflet.label.css" /> <link type="text/css" rel="stylesheet" href="assets/leaflet/plugins/Leaflet.label/leaflet.label.css" />
<script type="text/javascript" src="assets/leaflet/plugins/Leaflet.label/leaflet.label.js"></script>
<!--[if lte IE 8]><link type="text/css" rel="stylesheet" href="assets/leaflet/leaflet.ie.css" /><![endif]-->
<link type="text/css" rel="stylesheet" href="assets/leaflet/plugins/leaflet.markercluster/MarkerCluster.css" /> <link type="text/css" rel="stylesheet" href="assets/leaflet/plugins/leaflet.markercluster/MarkerCluster.css" />
<link type="text/css" rel="stylesheet" href="assets/leaflet/plugins/leaflet.markercluster/MarkerCluster.Default.css" /> <link type="text/css" rel="stylesheet" href="assets/leaflet/plugins/leaflet.markercluster/MarkerCluster.Default.css" />
...@@ -24,6 +24,5 @@ ...@@ -24,6 +24,5 @@
<link type="text/css" rel="stylesheet" href="assets/leaflet/plugins/leaflet.markercluster/MarkerCluster.css" /> <link type="text/css" rel="stylesheet" href="assets/leaflet/plugins/leaflet.markercluster/MarkerCluster.css" />
<link type="text/css" rel="stylesheet" href="assets/leaflet/plugins/leaflet.markercluster/MarkerCluster.Default.css" /> <link type="text/css" rel="stylesheet" href="assets/leaflet/plugins/leaflet.markercluster/MarkerCluster.Default.css" />
<script type="text/javascript" src="assets/leaflet/plugins/leaflet.markercluster/leaflet.markercluster.js"></script>
<link type="text/css" rel="stylesheet" href="assets/css/pytsprf.css" /> <link type="text/css" rel="stylesheet" href="assets/css/pytsprf.css" />
<script type="text/javascript" src="assets/js/pytsprf.js"></script> <script type="text/javascript" src="assets/js/pytsprf.js"></script>
...@@ -40,7 +39,7 @@ ...@@ -40,7 +39,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="#" onclick="return false;">TSP web Service</a> <a class="brand" href="#" onclick="return false;">PyConFR 2015</a>
<div class="nav-collapse"> <div class="nav-collapse">
<ul class="nav"> <ul class="nav">
<li><a href="#" onclick="$('#aboutModal').modal('show'); return false;"><i class="icon-question-sign icon-white"></i> About The Map</a></li> <li><a href="#" onclick="$('#aboutModal').modal('show'); return false;"><i class="icon-question-sign icon-white"></i> About The Map</a></li>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment