css/js: better handling of screen size

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;
 	}
 }

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); 

virtualenv/pffedportal/templates/login0.html

@@ -17,7 +17,7 @@
 
 {% block content %}
       <div class="row-fluid">
-        <div class="span4">
+        <div class="span5">
 
 	  {% if disco_stores_read %}
           <div class="well sidebar-nav" id="discoidp">
@@ -49,7 +49,7 @@
           </div><!--/.well -->
         </div><!--/span-->
 
-        <div class="span8">
+        <div class="span7">
 	  <div class="row-fluid">
 	    <div id="map" class="span12">Si la carte ne s'affiche pas, sélectionnez votre établissement d'origine dans la liste.</div>
 	  </div>
@@ -111,6 +111,11 @@
 </script>
 {% endif %}
 
+<script>
+	var start_bounds = {% if start_bounds %}{{ start_bounds }}{% else %}[[41.1, -5.53], [51.5, 9.91]]{% endif %};
+	var start_zoom = {% if start_zoom %}{{ start_zoom }}{% else %}6{% endif %};
+</script>
+
 <script src="{{ MEDIA_URL }}univnautes/js/univnautes.js"></script>
 
 {% endblock %}