diff --git a/virtualenv/pffedportal/media/univnautes/css/univnautes.css b/virtualenv/pffedportal/media/univnautes/css/univnautes.css index f3656df..25c4692 100644 --- a/virtualenv/pffedportal/media/univnautes/css/univnautes.css +++ b/virtualenv/pffedportal/media/univnautes/css/univnautes.css @@ -21,9 +21,9 @@ a.discoidp, a.defaultidp { /* Large desktop */ @media (min-width: 1200px) { - #map { height: 700px; } + #map { height: 560px; } ul#idps { - height: 570px; + height: 350px; overflow-y: auto; } } @@ -32,7 +32,7 @@ a.discoidp, a.defaultidp { @media (min-width: 768px) and (max-width: 979px) { #map { height: 500px; } ul#idps { - height: 350px; + height: 290px; overflow-y: auto; } } @@ -41,7 +41,7 @@ a.discoidp, a.defaultidp { @media (max-width: 767px) { #map { height: 450px; } ul#idps { - height: 300px; + height: 240px; overflow-y: auto; } } diff --git a/virtualenv/pffedportal/media/univnautes/js/univnautes.js b/virtualenv/pffedportal/media/univnautes/js/univnautes.js index c81549d..4ab7ed5 100644 --- a/virtualenv/pffedportal/media/univnautes/js/univnautes.js +++ b/virtualenv/pffedportal/media/univnautes/js/univnautes.js @@ -1,9 +1,12 @@ $(function() { +var start_lat = (start_bounds[0][0] + start_bounds[1][0])/2; +var start_lon = (start_bounds[0][1] + start_bounds[1][1])/2; +var start_center = [start_lat, start_lon]; + var redirectTimeout; var refreshmarkersTimeout; var redirectLink = ''; -var metropole = [ [41.1, -5.53], [51.5, 9.91] ]; var mapstyle = 'cm-22677'; var searchinput = $('input#search'); var markers = new L.MarkerClusterGroup({ @@ -13,11 +16,12 @@ var markers = new L.MarkerClusterGroup({ animateAddingMarkers: false, disableClusteringAtZoom: 50, maxClusterRadius: 25, + spiderfyDistanceMultiplier: 3, // singleMarkerMode: true, }); var map = L.map('map', { - center: [46.5, 2.0], - zoom: 6, + center: start_center, + zoom: start_zoom, maxZoom: 16, }); @@ -102,7 +106,7 @@ function delayRefresh(e) { refreshmarkersTimeout = setTimeout(refreshmarkers, 500); } -map.fitBounds(metropole); +map.fitBounds(start_bounds); map.addLayer(markers); refreshmarkers(); map.on('moveend', delayRefresh); diff --git a/virtualenv/pffedportal/templates/login0.html b/virtualenv/pffedportal/templates/login0.html index 4a0a013..ec31308 100644 --- a/virtualenv/pffedportal/templates/login0.html +++ b/virtualenv/pffedportal/templates/login0.html @@ -17,7 +17,7 @@ {% block content %}
-
+
{% if disco_stores_read %}
-
+
Si la carte ne s'affiche pas, sélectionnez votre établissement d'origine dans la liste.
@@ -111,6 +111,11 @@ {% endif %} + + {% endblock %}