From: Jérémy Fabre Date: Thu, 9 Feb 2017 14:35:24 +0000 (+0100) Subject: Network map X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bd528c589e5f9472f23fe4f0686983286bd0aa85;p=mezzo.git Network map --- diff --git a/app/static/src/assets/img/map-legend-blue.png b/app/static/src/assets/img/map-legend-blue.png new file mode 100644 index 00000000..87f2b183 Binary files /dev/null and b/app/static/src/assets/img/map-legend-blue.png differ diff --git a/app/static/src/assets/img/map-legend-green.png b/app/static/src/assets/img/map-legend-green.png new file mode 100644 index 00000000..187c52ea Binary files /dev/null and b/app/static/src/assets/img/map-legend-green.png differ diff --git a/app/static/src/assets/img/map-legend-red.png b/app/static/src/assets/img/map-legend-red.png new file mode 100644 index 00000000..6e36da16 Binary files /dev/null and b/app/static/src/assets/img/map-legend-red.png differ diff --git a/app/static/src/assets/img/map-marker-blue.png b/app/static/src/assets/img/map-marker-blue.png index 8fff3917..65bdc659 100644 Binary files a/app/static/src/assets/img/map-marker-blue.png and b/app/static/src/assets/img/map-marker-blue.png differ diff --git a/app/static/src/assets/img/map-marker-green.png b/app/static/src/assets/img/map-marker-green.png index 1f751ed2..f954e13b 100644 Binary files a/app/static/src/assets/img/map-marker-green.png and b/app/static/src/assets/img/map-marker-green.png differ diff --git a/app/static/src/assets/img/map-marker-red.png b/app/static/src/assets/img/map-marker-red.png index af8357ec..db5fb27d 100644 Binary files a/app/static/src/assets/img/map-marker-red.png and b/app/static/src/assets/img/map-marker-red.png differ diff --git a/app/static/src/js/modules/lightslidernetwork-init.js b/app/static/src/js/modules/lightslidernetwork-init.js index f386fa56..7d7c7acf 100644 --- a/app/static/src/js/modules/lightslidernetwork-init.js +++ b/app/static/src/js/modules/lightslidernetwork-init.js @@ -48,9 +48,9 @@ LightSliderNetworkInit.prototype.init = function() { if($('#network-map').length > 0) { that.map = new google.maps.Map(document.getElementById('network-map'), { - zoom: 3, + zoom: 10, center: {lat: 48.85982, lng: 2.351402}, - styles: [{"featureType":"water","elementType":"geometry","stylers":[{"color":"#e9e9e9"},{"lightness":17}]},{"featureType":"landscape","elementType":"geometry","stylers":[{"color":"#f5f5f5"},{"lightness":20}]},{"featureType":"road.highway","elementType":"geometry.fill","stylers":[{"color":"#ffffff"},{"lightness":17}]},{"featureType":"road.highway","elementType":"geometry.stroke","stylers":[{"color":"#ffffff"},{"lightness":29},{"weight":0.2}]},{"featureType":"road.arterial","elementType":"geometry","stylers":[{"color":"#ffffff"},{"lightness":18}]},{"featureType":"road.local","elementType":"geometry","stylers":[{"color":"#ffffff"},{"lightness":16}]},{"featureType":"poi","elementType":"geometry","stylers":[{"color":"#f5f5f5"},{"lightness":21}]},{"featureType":"poi.park","elementType":"geometry","stylers":[{"color":"#dedede"},{"lightness":21}]},{"elementType":"labels.text.stroke","stylers":[{"visibility":"on"},{"color":"#ffffff"},{"lightness":16}]},{"elementType":"labels.text.fill","stylers":[{"saturation":36},{"color":"#333333"},{"lightness":40}]},{"elementType":"labels.icon","stylers":[{"visibility":"off"}]},{"featureType":"transit","elementType":"geometry","stylers":[{"color":"#f2f2f2"},{"lightness":19}]},{"featureType":"administrative","elementType":"geometry.fill","stylers":[{"color":"#fefefe"},{"lightness":20}]},{"featureType":"administrative","elementType":"geometry.stroke","stylers":[{"color":"#fefefe"},{"lightness":17},{"weight":1.2}]}] + styles: [{"featureType":"all","elementType":"geometry","stylers":[{"color":"#ffffff"}]},{"featureType":"all","elementType":"labels.text.fill","stylers":[{"gamma":0.01},{"lightness":20}]},{"featureType":"all","elementType":"labels.text.stroke","stylers":[{"saturation":-31},{"lightness":-33},{"weight":2},{"gamma":0.8}]},{"featureType":"all","elementType":"labels.icon","stylers":[{"visibility":"off"}]},{"featureType":"administrative.locality","elementType":"labels.text.fill","stylers":[{"color":"#050505"}]},{"featureType":"administrative.locality","elementType":"labels.text.stroke","stylers":[{"color":"#fef3f3"},{"weight":"3.01"}]},{"featureType":"administrative.neighborhood","elementType":"labels.text.fill","stylers":[{"color":"#0a0a0a"},{"visibility":"off"}]},{"featureType":"administrative.neighborhood","elementType":"labels.text.stroke","stylers":[{"color":"#fffbfb"},{"weight":"3.01"},{"visibility":"off"}]},{"featureType":"landscape","elementType":"geometry","stylers":[{"lightness":30},{"saturation":30}]},{"featureType":"poi","elementType":"geometry","stylers":[{"saturation":20}]},{"featureType":"poi.attraction","elementType":"labels.icon","stylers":[{"visibility":"off"}]},{"featureType":"poi.park","elementType":"geometry","stylers":[{"lightness":20},{"saturation":-20}]},{"featureType":"road","elementType":"geometry","stylers":[{"lightness":10},{"saturation":-30}]},{"featureType":"road","elementType":"geometry.stroke","stylers":[{"saturation":25},{"lightness":25}]},{"featureType":"road.highway","elementType":"geometry.fill","stylers":[{"visibility":"on"},{"color":"#a1a1a1"}]},{"featureType":"road.highway","elementType":"geometry.stroke","stylers":[{"color":"#292929"}]},{"featureType":"road.highway","elementType":"labels.text.fill","stylers":[{"visibility":"on"},{"color":"#202020"}]},{"featureType":"road.highway","elementType":"labels.text.stroke","stylers":[{"visibility":"on"},{"color":"#ffffff"}]},{"featureType":"road.highway","elementType":"labels.icon","stylers":[{"visibility":"simplified"},{"hue":"#0006ff"},{"saturation":"-100"},{"lightness":"13"},{"gamma":"0.00"}]},{"featureType":"road.arterial","elementType":"geometry.fill","stylers":[{"visibility":"on"},{"color":"#686868"}]},{"featureType":"road.arterial","elementType":"geometry.stroke","stylers":[{"visibility":"off"},{"color":"#8d8d8d"}]},{"featureType":"road.arterial","elementType":"labels.text.fill","stylers":[{"visibility":"on"},{"color":"#353535"},{"lightness":"6"}]},{"featureType":"road.arterial","elementType":"labels.text.stroke","stylers":[{"visibility":"on"},{"color":"#ffffff"},{"weight":"3.45"}]},{"featureType":"road.local","elementType":"geometry.fill","stylers":[{"color":"#d0d0d0"}]},{"featureType":"road.local","elementType":"geometry.stroke","stylers":[{"lightness":"2"},{"visibility":"on"},{"color":"#999898"}]},{"featureType":"road.local","elementType":"labels.text.fill","stylers":[{"color":"#383838"}]},{"featureType":"road.local","elementType":"labels.text.stroke","stylers":[{"color":"#faf8f8"}]},{"featureType":"water","elementType":"all","stylers":[{"lightness":-20}]}] }); google.maps.event.addListenerOnce(that.map, 'projection_changed', function() { diff --git a/app/templates/network/organization_list.html b/app/templates/network/organization_list.html index 7631729e..2a470acf 100644 --- a/app/templates/network/organization_list.html +++ b/app/templates/network/organization_list.html @@ -20,16 +20,16 @@ {% block page_slider %} -
-
-
-
- {% for type in organization_types %} -
{{ type.0 }}
- {% endfor %} +
+
+
+
+ {% for type in organization_types %} +
{{ type.0 }}
+ {% endfor %} +
-
-
+
diff --git a/docker-compose.yml b/docker-compose.yml index ffed94bf..320614bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,8 +36,6 @@ db: image: postgres:9.5 volumes_from: - var - volumes: - - ./var/lib/postgresql/data:/var/lib/postgresql/data environment: - POSTGRES_PASSWORD=noodFof2Kna