From: Jérémy Fabre <Jeremy@iMac-de-Jeremy-2.fritz.box>
Date: Tue, 14 Feb 2017 14:14:58 +0000 (+0100)
Subject: Add description to network page
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0b96cbcc97310ab53e635b1860b73f77368a032b;p=mezzo.git

Add description to network page
---

diff --git a/app/static/src/js/modules/lightslidernetwork-init.js b/app/static/src/js/modules/lightslidernetwork-init.js
index b46372a1..b8798324 100644
--- a/app/static/src/js/modules/lightslidernetwork-init.js
+++ b/app/static/src/js/modules/lightslidernetwork-init.js
@@ -84,7 +84,7 @@ LightSliderNetworkInit.prototype.initMarkers = function() {
         };
 
         var info = new google.maps.InfoWindow({
-            content: '<div class="map-infowindow"><div class="map-infowindow__image"><a href="' + $(this).attr('data-marker-url') + '" target="_blank"><img src="' + $(this).attr('data-marker-image') + '" /></a></div><div class="map-infowindow__content"><div class="map-infowindow__title">' + $(this).find('[data-marker-title]').text() + '</div><div class="map-infowindow__subtitle">' + $(this).find('[data-marker-subtitle]').text() + '</div></div></div>'
+            content: '<div class="map-infowindow"><div class="map-infowindow__image"><a href="' + $(this).attr('data-marker-url') + '" target="_blank"><img src="' + $(this).attr('data-marker-image') + '" /></a></div><div class="map-infowindow__content"><div class="map-infowindow__title">' + $(this).find('[data-marker-title]').text() + '</div><div class="map-infowindow__subtitle">' + $(this).find('[data-marker-subtitle]').text() + '</div><p>' + $(this).find('[data-marker-description]').text() + '</p></div></div>'
         });
 
         obj.info = info;
diff --git a/app/static/src/sass/modules/_map-infowindow.scss b/app/static/src/sass/modules/_map-infowindow.scss
index 501656e8..bc98a972 100644
--- a/app/static/src/sass/modules/_map-infowindow.scss
+++ b/app/static/src/sass/modules/_map-infowindow.scss
@@ -25,10 +25,17 @@ $module: ".map-infowindow";
     @include padding(1);
     @include clearfix;
 
+    margin-right: -23px;
+    color: $color-background;
+
     &__content {
 
         //float: left;
-        @include margin-left(1);
+        text-align: center;
+
+        p {
+            @include margin(0);
+        }
 
     }
 
@@ -37,7 +44,8 @@ $module: ".map-infowindow";
         @include font-size(m);
         @include line-height(.75);
         @include typeface(sans-serif);
-        font-weight: weight(bold);
+        text-transform: uppercase;
+        font-weight: weight(regular);
 
     }
 
@@ -48,7 +56,11 @@ $module: ".map-infowindow";
         @include font-size(xs);
         @include line-height(.5);
         @include typeface(serif);
-        font-weight: weight(bold);
+        font-weight: weight(regular);
+
+        & + p {
+            @include margin-top(.5);
+        }
 
     }
 
diff --git a/app/static/src/sass/modules/_map-legend.scss b/app/static/src/sass/modules/_map-legend.scss
index 4d196af2..dd49c725 100644
--- a/app/static/src/sass/modules/_map-legend.scss
+++ b/app/static/src/sass/modules/_map-legend.scss
@@ -41,6 +41,7 @@ $module: ".map-legend";
         color: $color-black;
         display: inline-block;
         line-height: 22px;
+        @include margin-right(.5);
 
         &:last-child {
             @include margin-right(0);
diff --git a/app/templates/network/organization_list.html b/app/templates/network/organization_list.html
index 2a470acf..3365e92d 100644
--- a/app/templates/network/organization_list.html
+++ b/app/templates/network/organization_list.html
@@ -53,6 +53,9 @@
                                 <div class="">
                                     {{ organization.type }}, {{ organization.type.css_class }}
                                 </div>
+                                <div class="slider-network__slide-description" data-marker-description>
+                                    {{ organization.description }}
+                                </div>
                             </li>
 
                             {% comment %}