[Frontend] Carte producteurs #1125

backend/views/producer-admin/_form.php

@@ -49,6 +49,8 @@ use common\logic\Producer\Producer\Model\Producer;
 <?= $form->field($model, 'type')->textInput(['placeholder' => 'Boulangerie, brasserie, ferme ...']); ?>
 <?= $form->field($model, 'postcode') ?>
 <?= $form->field($model, 'city') ?>
+<?= $form->field($model, 'latitude') ?>
+<?= $form->field($model, 'longitude') ?>
 <?= $form->field($model, 'code')->label('Code d\'accès') ?>
 
 <h3>Facturation</h3>

common/logic/Producer/Producer/Model/Producer.php

@@ -282,7 +282,9 @@ class Producer extends ActiveRecordCommon
                 'free_price',
                 'credit_limit_reminder',
                 'credit_limit',
-                'option_billing_permanent_transfer_amount'
+                'option_billing_permanent_transfer_amount',
+                'latitude',
+                'longitude'
             ], 'double'],
             [
                 'free_price',
@@ -401,7 +403,9 @@ class Producer extends ActiveRecordCommon
             'option_billing_reduction_percentage' => 'Réduction : pourcentage',
             'option_billing_permanent_transfer' => 'Virement permanent',
             'option_billing_permanent_transfer_amount' => 'Virement permanent : montant',
-            'option_point_sale_wording' => 'Libellé points de vente'
+            'option_point_sale_wording' => 'Libellé points de vente',
+            'latitude' => 'Latitude',
+            'longitude' => 'Longitude'
         ];
     }
 

common/logic/Producer/Producer/Repository/ProducerRepository.php

@@ -60,7 +60,9 @@ class ProducerRepository extends AbstractRepository
 
     public function queryProducersActive()
     {
-        return $this->createQuery()->filterIsActive();
+        return $this->createQuery()
+            ->filterIsActive()
+            ->orderBy('producer.name ASC');
     }
 
     /**

console/migrations/m230725_072843_producer_add_latitude_longitude.php

@@ -0,0 +1,28 @@
+<?php
+
+use yii\db\Migration;
+use yii\db\Schema;
+
+/**
+ * Class m230725_072843_producer_add_latitude_longitude
+ */
+class m230725_072843_producer_add_latitude_longitude extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->addColumn('producer', 'latitude', Schema::TYPE_FLOAT);
+        $this->addColumn('producer', 'longitude', Schema::TYPE_FLOAT);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropColumn('producer', 'latitude');
+        $this->dropColumn('producer', 'longitude');
+    }
+}

frontend/assets/AppAsset.php

@@ -59,9 +59,11 @@ class AppAsset extends \common\components\MyAssetBundle
         parent::__construct() ;
         
         // css
+        $this->addAsset('css','js/leaflet/leaflet-1.9.4.css');
         $this->addAsset('css','css/screen.css');
 
         // js
+        $this->addAsset('js','js/leaflet/leaflet-1.9.4.min.js');
         $this->addAsset('js','js/frontend.js');
     }
 }

frontend/controllers/SiteController.php

@@ -47,6 +47,7 @@ use frontend\forms\SignupForm;
 use common\forms\ContactForm;
 use yii\base\InvalidParamException;
 use yii\data\ActiveDataProvider;
+use yii\helpers\Html;
 use yii\web\BadRequestHttpException;
 use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
@@ -165,10 +166,32 @@ class SiteController extends FrontendController
         ]);
 
         return $this->render('producers', [
-            'dataProviderProducers' => $dataProviderProducers
+            'dataProviderProducers' => $dataProviderProducers,
+            'producersArray' => $this->getProducerManager()->findProducersActive()
         ]);
     }
 
+    /**
+     * Liste les producteurs utilisant la plateforme.
+     */
+    public function actionAjaxProducers()
+    {
+        \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $producersArray = $this->getProducerManager()->findProducersActive();
+        $producersArrayReturn = [];
+
+        foreach($producersArray as $producer) {
+            $producersArrayReturn[] = [
+                'id' => $producer->id,
+                'name' => Html::encode($producer->name),
+                'latitude' => $producer->latitude,
+                'longitude' => $producer->longitude,
+            ];
+        }
+
+        return $producersArrayReturn;
+    }
+
     /**
      * Affiche la page de connexion et traite le formulaire de connexion.
      */

frontend/views/layouts/main.php

@@ -59,6 +59,8 @@ if ($userManager->isCurrentProducer()) {
     <title><?php if ($isHome): ?>Opendistrib | <?= Html::encode($this->title) ?><?php else: ?><?= Html::encode($this->title) ?> | Opendistrib<?php endif; ?></title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="baseurl" content="<?= Yii::$app->urlManagerFrontend->baseUrl ; ?>">
+    <meta name="baseurl-absolute" content="<?= Yii::$app->urlManagerFrontend->getHostInfo().Yii::$app->urlManagerBackend->baseUrl; ?>">
     <?= Html::csrfMetaTags() ?>
     <link rel="icon" type="image/png" href="<?= $this->getUrlManager()->getBaseUrl(); ?>/img/favicon-distrib.png"/>
     <!--[if IE]><link rel="shortcut icon" type="image/x-icon" href="<?= \Yii::$app->urlManager->getBaseUrl(); ?>/img/favicon.ico" /><![endif]-->
@@ -112,12 +114,12 @@ if ($userManager->isCurrentProducer()) {
                             'active' => $this->getControllerAction() == 'site/producers',
                             'options' => ['id' => 'li-producteurs']
                         ],
-                        [
+                        /*[
                             'label' => '<span class="glyphicon glyphicon-info-sign"></span> À propos',
                             'url' => $this->getUrlManager()->createUrl(['site/about']),
                             'active' => $this->getControllerAction() == 'site/about',
                             'options' => ['id' => 'li-about']
-                        ],
+                        ],*/
                         [
                             'label' => '<span class="glyphicon glyphicon-envelope"></span> Contact',
                             'url' => $this->getUrlManager()->createUrl(['site/contact']),

frontend/views/site/producers.php

@@ -44,10 +44,49 @@ $this->setMeta('description', 'Retrouvez les producteurs présents sur Opendistr
 
 ?>
 
-<h1 class="title-system-order"><span class="glyphicon glyphicon-search"></span>&nbsp;&nbsp;<?= Html::encode($this->title) ?></h1>
+<div class="site-producers">
+    <h1 class="title-system-order"><span class="glyphicon glyphicon-search"></span>&nbsp;&nbsp;<?= Html::encode($this->title) ?></h1>
 
-<?= 
+    <div class="col-md-6">
+        <div id="producers-list" class="pre-scrollable">
+        <?php foreach($producersArray as $producer): ?>
+            <div class="panel panel-default">
+                <div class="panel-body">
+                    <div class="<?= $producer->logo ? 'col-md-8' : 'col-md-12'; ?>">
+                        <h2><?= Html::encode($producer->name) ?></h2>
+                        <p class="producer-type"><?= Html::encode($producer->type) ?></p>
+                        <p class="producer-location">
+                            <?php if($producer->latitude && $producer->longitude): ?>
+                                <?= Html::a('<span class="glyphicon glyphicon-map-marker"></span> '.Html::encode($producer->postcode.' '.$producer->city),'javascript:void(0);', ['class' => 'btn btn-default view-producer', 'data-id' => $producer->id]);?>
+                            <?php else: ?>
+                                <span class="glyphicon glyphicon-map-marker"></span>
+                                <?= Html::encode($producer->postcode.' '.$producer->city); ?>
+                            <?php endif; ?>
+                        </p>
+                    </div>
+                    <?php if($producer->logo): ?>
+                        <div class="col-md-4">
+                            <div class="logo"<?php if (!is_null($producer->background_color_logo) && strlen($producer->background_color_logo)): ?> style="background-color:<?= Html::encode($producer->background_color_logo); ?>"<?php endif; ?>>
+                                <img class="img-logo"
+                                     src="<?= \Yii::$app->urlManagerProducer->baseUrl; ?>/uploads/<?= $producer->logo; ?>"
+                                     alt="Logo <?= Html::encode($producer->name) ?>"/>
+                            </div>
+                        </div>
+                    <?php endif; ?>
+                </div>
+                <div class="panel-footer">
+                    <?= Html::a('Visiter',Yii::$app->urlManagerProducer->createAbsoluteUrl(['site/index', 'slug_producer' => $producer->slug]), ['class'=>'btn btn-primary']) ; ?>
+                </div>
+            </div>
+        <?php endforeach; ?>
+        </div>
+    </div>
+    <div class="col-md-6">
+        <div id="producers-map" class=""></div>
+    </div>
 
+<?php
+/*
 GridView::widget([
     'dataProvider' => $dataProviderProducers,
     'summary' => '',
@@ -76,5 +115,7 @@ GridView::widget([
         ],
     ]
 ]);
-                    
-?>
+            */
+?>
+
+</div>

frontend/web/js/frontend.js

@@ -33,10 +33,64 @@
  pris connaissance de la licence CeCILL, et que vous en avez accepté les
  termes.
  */
+
 $(document).ready(function () {
     opendistrib_signup();
+    producersMapModule.init();
 });
 
+var UrlManager = {
+    getBaseUrl: function () {
+        return $('meta[name=baseurl]').attr('content') + '/';
+
+    },
+    getBaseUrlAbsolute: function () {
+        return $('meta[name=baseurl-absolute]').attr('content') + '/';
+    }
+};
+
+var producersMapModule = {
+    map: null,
+    mapMarkers: [],
+    init: function() {
+        this.initMap();
+        this.initEventViewProducer();
+    },
+    initMap: function() {
+        var app = this;
+        app.map = L.map('producers-map').setView([46.5471789, 2.534168], 6);
+        L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+            maxZoom: 19,
+            attribution: '© OpenStreetMap'
+        }).addTo(app.map);
+
+        $.get(UrlManager.getBaseUrl() + 'site/ajax-producers', {}, function(producers) {
+            for(var i = 0; i < producers.length ; i++) {
+                if(producers[i].latitude && producers[i].longitude) {
+                    app.mapMarkers[producers[i].id] = L.marker([producers[i].latitude, producers[i].longitude]).bindPopup(producers[i].name).addTo(app.map);
+                }
+            }
+        });
+    },
+    initEventViewProducer: function() {
+        var app = this;
+        $('#producers-list .view-producer').click(function() {
+            app.viewProducer($(this).data('id'));
+            return false;
+        });
+    },
+    viewProducer: function(idProducer) {
+        var app = this;
+        if(app.mapMarkers[idProducer]) {
+            var marker = app.mapMarkers[idProducer];
+            var latLngs = [marker.getLatLng()];
+            var markerBounds = L.latLngBounds(latLngs);
+            app.map.fitBounds(markerBounds, {maxZoom: 9});
+            marker.openPopup();
+        }
+    }
+};
+
 function opendistrib_signup() {
     if ($('#form-signup').size()) {
         opendistrib_signup_fields_producer();

frontend/web/js/leaflet/leaflet-1.9.4.css

@@ -0,0 +1,661 @@
+/* required styles */
+
+.leaflet-pane,
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow,
+.leaflet-tile-container,
+.leaflet-pane > svg,
+.leaflet-pane > canvas,
+.leaflet-zoom-box,
+.leaflet-image-layer,
+.leaflet-layer {
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+.leaflet-container {
+    overflow: hidden;
+}
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    user-select: none;
+    -webkit-user-drag: none;
+}
+/* Prevents IE11 from highlighting tiles in blue */
+.leaflet-tile::selection {
+    background: transparent;
+}
+/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
+.leaflet-safari .leaflet-tile {
+    image-rendering: -webkit-optimize-contrast;
+}
+/* hack that prevents hw layers "stretching" when loading new tiles */
+.leaflet-safari .leaflet-tile-container {
+    width: 1600px;
+    height: 1600px;
+    -webkit-transform-origin: 0 0;
+}
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+    display: block;
+}
+/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
+/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
+.leaflet-container .leaflet-overlay-pane svg {
+    max-width: none !important;
+    max-height: none !important;
+}
+.leaflet-container .leaflet-marker-pane img,
+.leaflet-container .leaflet-shadow-pane img,
+.leaflet-container .leaflet-tile-pane img,
+.leaflet-container img.leaflet-image-layer,
+.leaflet-container .leaflet-tile {
+    max-width: none !important;
+    max-height: none !important;
+    width: auto;
+    padding: 0;
+}
+
+.leaflet-container img.leaflet-tile {
+    /* See: https://bugs.chromium.org/p/chromium/issues/detail?id=600120 */
+    mix-blend-mode: plus-lighter;
+}
+
+.leaflet-container.leaflet-touch-zoom {
+    -ms-touch-action: pan-x pan-y;
+    touch-action: pan-x pan-y;
+}
+.leaflet-container.leaflet-touch-drag {
+    -ms-touch-action: pinch-zoom;
+    /* Fallback for FF which doesn't support pinch-zoom */
+    touch-action: none;
+    touch-action: pinch-zoom;
+}
+.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
+    -ms-touch-action: none;
+    touch-action: none;
+}
+.leaflet-container {
+    -webkit-tap-highlight-color: transparent;
+}
+.leaflet-container a {
+    -webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
+}
+.leaflet-tile {
+    filter: inherit;
+    visibility: hidden;
+}
+.leaflet-tile-loaded {
+    visibility: inherit;
+}
+.leaflet-zoom-box {
+    width: 0;
+    height: 0;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    z-index: 800;
+}
+/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
+.leaflet-overlay-pane svg {
+    -moz-user-select: none;
+}
+
+.leaflet-pane         { z-index: 400; }
+
+.leaflet-tile-pane    { z-index: 200; }
+.leaflet-overlay-pane { z-index: 400; }
+.leaflet-shadow-pane  { z-index: 500; }
+.leaflet-marker-pane  { z-index: 600; }
+.leaflet-tooltip-pane   { z-index: 650; }
+.leaflet-popup-pane   { z-index: 700; }
+
+.leaflet-map-pane canvas { z-index: 100; }
+.leaflet-map-pane svg    { z-index: 200; }
+
+.leaflet-vml-shape {
+    width: 1px;
+    height: 1px;
+}
+.lvml {
+    behavior: url(#default#VML);
+    display: inline-block;
+    position: absolute;
+}
+
+
+/* control positioning */
+
+.leaflet-control {
+    position: relative;
+    z-index: 800;
+    pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
+    pointer-events: auto;
+}
+.leaflet-top,
+.leaflet-bottom {
+    position: absolute;
+    z-index: 1000;
+    pointer-events: none;
+}
+.leaflet-top {
+    top: 0;
+}
+.leaflet-right {
+    right: 0;
+}
+.leaflet-bottom {
+    bottom: 0;
+}
+.leaflet-left {
+    left: 0;
+}
+.leaflet-control {
+    float: left;
+    clear: both;
+}
+.leaflet-right .leaflet-control {
+    float: right;
+}
+.leaflet-top .leaflet-control {
+    margin-top: 10px;
+}
+.leaflet-bottom .leaflet-control {
+    margin-bottom: 10px;
+}
+.leaflet-left .leaflet-control {
+    margin-left: 10px;
+}
+.leaflet-right .leaflet-control {
+    margin-right: 10px;
+}
+
+
+/* zoom and fade animations */
+
+.leaflet-fade-anim .leaflet-popup {
+    opacity: 0;
+    -webkit-transition: opacity 0.2s linear;
+    -moz-transition: opacity 0.2s linear;
+    transition: opacity 0.2s linear;
+}
+.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
+    opacity: 1;
+}
+.leaflet-zoom-animated {
+    -webkit-transform-origin: 0 0;
+    -ms-transform-origin: 0 0;
+    transform-origin: 0 0;
+}
+svg.leaflet-zoom-animated {
+    will-change: transform;
+}
+
+.leaflet-zoom-anim .leaflet-zoom-animated {
+    -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
+    -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
+    transition:         transform 0.25s cubic-bezier(0,0,0.25,1);
+}
+.leaflet-zoom-anim .leaflet-tile,
+.leaflet-pan-anim .leaflet-tile {
+    -webkit-transition: none;
+    -moz-transition: none;
+    transition: none;
+}
+
+.leaflet-zoom-anim .leaflet-zoom-hide {
+    visibility: hidden;
+}
+
+
+/* cursors */
+
+.leaflet-interactive {
+    cursor: pointer;
+}
+.leaflet-grab {
+    cursor: -webkit-grab;
+    cursor:    -moz-grab;
+    cursor:         grab;
+}
+.leaflet-crosshair,
+.leaflet-crosshair .leaflet-interactive {
+    cursor: crosshair;
+}
+.leaflet-popup-pane,
+.leaflet-control {
+    cursor: auto;
+}
+.leaflet-dragging .leaflet-grab,
+.leaflet-dragging .leaflet-grab .leaflet-interactive,
+.leaflet-dragging .leaflet-marker-draggable {
+    cursor: move;
+    cursor: -webkit-grabbing;
+    cursor:    -moz-grabbing;
+    cursor:         grabbing;
+}
+
+/* marker & overlays interactivity */
+.leaflet-marker-icon,
+.leaflet-marker-shadow,
+.leaflet-image-layer,
+.leaflet-pane > svg path,
+.leaflet-tile-container {
+    pointer-events: none;
+}
+
+.leaflet-marker-icon.leaflet-interactive,
+.leaflet-image-layer.leaflet-interactive,
+.leaflet-pane > svg path.leaflet-interactive,
+svg.leaflet-image-layer.leaflet-interactive path {
+    pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
+    pointer-events: auto;
+}
+
+/* visual tweaks */
+
+.leaflet-container {
+    background: #ddd;
+    outline-offset: 1px;
+}
+.leaflet-container a {
+    color: #0078A8;
+}
+.leaflet-zoom-box {
+    border: 2px dotted #38f;
+    background: rgba(255,255,255,0.5);
+}
+
+
+/* general typography */
+.leaflet-container {
+    font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+    font-size: 12px;
+    font-size: 0.75rem;
+    line-height: 1.5;
+}
+
+
+/* general toolbar styles */
+
+.leaflet-bar {
+    box-shadow: 0 1px 5px rgba(0,0,0,0.65);
+    border-radius: 4px;
+}
+.leaflet-bar a {
+    background-color: #fff;
+    border-bottom: 1px solid #ccc;
+    width: 26px;
+    height: 26px;
+    line-height: 26px;
+    display: block;
+    text-align: center;
+    text-decoration: none;
+    color: black;
+}
+.leaflet-bar a,
+.leaflet-control-layers-toggle {
+    background-position: 50% 50%;
+    background-repeat: no-repeat;
+    display: block;
+}
+.leaflet-bar a:hover,
+.leaflet-bar a:focus {
+    background-color: #f4f4f4;
+}
+.leaflet-bar a:first-child {
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+}
+.leaflet-bar a:last-child {
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-bottom: none;
+}
+.leaflet-bar a.leaflet-disabled {
+    cursor: default;
+    background-color: #f4f4f4;
+    color: #bbb;
+}
+
+.leaflet-touch .leaflet-bar a {
+    width: 30px;
+    height: 30px;
+    line-height: 30px;
+}
+.leaflet-touch .leaflet-bar a:first-child {
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px;
+}
+.leaflet-touch .leaflet-bar a:last-child {
+    border-bottom-left-radius: 2px;
+    border-bottom-right-radius: 2px;
+}
+
+/* zoom control */
+
+.leaflet-control-zoom-in,
+.leaflet-control-zoom-out {
+    font: bold 18px 'Lucida Console', Monaco, monospace;
+    text-indent: 1px;
+}
+
+.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out  {
+    font-size: 22px;
+}
+
+
+/* layers control */
+
+.leaflet-control-layers {
+    box-shadow: 0 1px 5px rgba(0,0,0,0.4);
+    background: #fff;
+    border-radius: 5px;
+}
+.leaflet-control-layers-toggle {
+    background-image: url(images/layers.png);
+    width: 36px;
+    height: 36px;
+}
+.leaflet-retina .leaflet-control-layers-toggle {
+    background-image: url(images/layers-2x.png);
+    background-size: 26px 26px;
+}
+.leaflet-touch .leaflet-control-layers-toggle {
+    width: 44px;
+    height: 44px;
+}
+.leaflet-control-layers .leaflet-control-layers-list,
+.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
+    display: none;
+}
+.leaflet-control-layers-expanded .leaflet-control-layers-list {
+    display: block;
+    position: relative;
+}
+.leaflet-control-layers-expanded {
+    padding: 6px 10px 6px 6px;
+    color: #333;
+    background: #fff;
+}
+.leaflet-control-layers-scrollbar {
+    overflow-y: scroll;
+    overflow-x: hidden;
+    padding-right: 5px;
+}
+.leaflet-control-layers-selector {
+    margin-top: 2px;
+    position: relative;
+    top: 1px;
+}
+.leaflet-control-layers label {
+    display: block;
+    font-size: 13px;
+    font-size: 1.08333em;
+}
+.leaflet-control-layers-separator {
+    height: 0;
+    border-top: 1px solid #ddd;
+    margin: 5px -10px 5px -6px;
+}
+
+/* Default icon URLs */
+.leaflet-default-icon-path { /* used only in path-guessing heuristic, see L.Icon.Default */
+    background-image: url(images/marker-icon.png);
+}
+
+
+/* attribution and scale controls */
+
+.leaflet-container .leaflet-control-attribution {
+    background: #fff;
+    background: rgba(255, 255, 255, 0.8);
+    margin: 0;
+}
+.leaflet-control-attribution,
+.leaflet-control-scale-line {
+    padding: 0 5px;
+    color: #333;
+    line-height: 1.4;
+}
+.leaflet-control-attribution a {
+    text-decoration: none;
+}
+.leaflet-control-attribution a:hover,
+.leaflet-control-attribution a:focus {
+    text-decoration: underline;
+}
+.leaflet-attribution-flag {
+    display: inline !important;
+    vertical-align: baseline !important;
+    width: 1em;
+    height: 0.6669em;
+}
+.leaflet-left .leaflet-control-scale {
+    margin-left: 5px;
+}
+.leaflet-bottom .leaflet-control-scale {
+    margin-bottom: 5px;
+}
+.leaflet-control-scale-line {
+    border: 2px solid #777;
+    border-top: none;
+    line-height: 1.1;
+    padding: 2px 5px 1px;
+    white-space: nowrap;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    background: rgba(255, 255, 255, 0.8);
+    text-shadow: 1px 1px #fff;
+}
+.leaflet-control-scale-line:not(:first-child) {
+    border-top: 2px solid #777;
+    border-bottom: none;
+    margin-top: -2px;
+}
+.leaflet-control-scale-line:not(:first-child):not(:last-child) {
+    border-bottom: 2px solid #777;
+}
+
+.leaflet-touch .leaflet-control-attribution,
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-bar {
+    box-shadow: none;
+}
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-bar {
+    border: 2px solid rgba(0,0,0,0.2);
+    background-clip: padding-box;
+}
+
+
+/* popup */
+
+.leaflet-popup {
+    position: absolute;
+    text-align: center;
+    margin-bottom: 20px;
+}
+.leaflet-popup-content-wrapper {
+    padding: 1px;
+    text-align: left;
+    border-radius: 12px;
+}
+.leaflet-popup-content {
+    margin: 13px 24px 13px 20px;
+    line-height: 1.3;
+    font-size: 13px;
+    font-size: 1.08333em;
+    min-height: 1px;
+}
+.leaflet-popup-content p {
+    margin: 17px 0;
+    margin: 1.3em 0;
+}
+.leaflet-popup-tip-container {
+    width: 40px;
+    height: 20px;
+    position: absolute;
+    left: 50%;
+    margin-top: -1px;
+    margin-left: -20px;
+    overflow: hidden;
+    pointer-events: none;
+}
+.leaflet-popup-tip {
+    width: 17px;
+    height: 17px;
+    padding: 1px;
+
+    margin: -10px auto 0;
+    pointer-events: auto;
+
+    -webkit-transform: rotate(45deg);
+    -moz-transform: rotate(45deg);
+    -ms-transform: rotate(45deg);
+    transform: rotate(45deg);
+}
+.leaflet-popup-content-wrapper,
+.leaflet-popup-tip {
+    background: white;
+    color: #333;
+    box-shadow: 0 3px 14px rgba(0,0,0,0.4);
+}
+.leaflet-container a.leaflet-popup-close-button {
+    position: absolute;
+    top: 0;
+    right: 0;
+    border: none;
+    text-align: center;
+    width: 24px;
+    height: 24px;
+    font: 16px/24px Tahoma, Verdana, sans-serif;
+    color: #757575;
+    text-decoration: none;
+    background: transparent;
+}
+.leaflet-container a.leaflet-popup-close-button:hover,
+.leaflet-container a.leaflet-popup-close-button:focus {
+    color: #585858;
+}
+.leaflet-popup-scrolled {
+    overflow: auto;
+}
+
+.leaflet-oldie .leaflet-popup-content-wrapper {
+    -ms-zoom: 1;
+}
+.leaflet-oldie .leaflet-popup-tip {
+    width: 24px;
+    margin: 0 auto;
+
+    -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
+    filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
+}
+
+.leaflet-oldie .leaflet-control-zoom,
+.leaflet-oldie .leaflet-control-layers,
+.leaflet-oldie .leaflet-popup-content-wrapper,
+.leaflet-oldie .leaflet-popup-tip {
+    border: 1px solid #999;
+}
+
+
+/* div icon */
+
+.leaflet-div-icon {
+    background: #fff;
+    border: 1px solid #666;
+}
+
+
+/* Tooltip */
+/* Base styles for the element that has a tooltip */
+.leaflet-tooltip {
+    position: absolute;
+    padding: 6px;
+    background-color: #fff;
+    border: 1px solid #fff;
+    border-radius: 3px;
+    color: #222;
+    white-space: nowrap;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    pointer-events: none;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.4);
+}
+.leaflet-tooltip.leaflet-interactive {
+    cursor: pointer;
+    pointer-events: auto;
+}
+.leaflet-tooltip-top:before,
+.leaflet-tooltip-bottom:before,
+.leaflet-tooltip-left:before,
+.leaflet-tooltip-right:before {
+    position: absolute;
+    pointer-events: none;
+    border: 6px solid transparent;
+    background: transparent;
+    content: "";
+}
+
+/* Directions */
+
+.leaflet-tooltip-bottom {
+    margin-top: 6px;
+}
+.leaflet-tooltip-top {
+    margin-top: -6px;
+}
+.leaflet-tooltip-bottom:before,
+.leaflet-tooltip-top:before {
+    left: 50%;
+    margin-left: -6px;
+}
+.leaflet-tooltip-top:before {
+    bottom: 0;
+    margin-bottom: -12px;
+    border-top-color: #fff;
+}
+.leaflet-tooltip-bottom:before {
+    top: 0;
+    margin-top: -12px;
+    margin-left: -6px;
+    border-bottom-color: #fff;
+}
+.leaflet-tooltip-left {
+    margin-left: -6px;
+}
+.leaflet-tooltip-right {
+    margin-left: 6px;
+}
+.leaflet-tooltip-left:before,
+.leaflet-tooltip-right:before {
+    top: 50%;
+    margin-top: -6px;
+}
+.leaflet-tooltip-left:before {
+    right: 0;
+    margin-right: -12px;
+    border-left-color: #fff;
+}
+.leaflet-tooltip-right:before {
+    left: 0;
+    margin-left: -12px;
+    border-right-color: #fff;
+}
+
+/* Printing */
+
+@media print {
+    /* Prevent printers from removing background-images of controls. */
+    .leaflet-control {
+        -webkit-print-color-adjust: exact;
+        print-color-adjust: exact;
+    }
+}

frontend/web/sass/screen.scss

@@ -45,13 +45,7 @@ $orange: darken(#FDB64B, 20%);
 $gris1: #e0e0e0;
 $gris2: #e0e0e0;
 $courant: #323232;
-$color2: lighten($jaune, 30%);
-$color2: #fff2c7;
-$color2: #fff6d5;
-$color1: #BB8757;
-$color2: #F8F1DD;
-
-$color1: #FF7F00;
+$color1: #F39C12;
 $color2: white;
 
 @import "_fonts.scss";
@@ -715,6 +709,81 @@ ul {
   }
 }
 
+.site-producers {
+
+  $height-producers-list-map: 650px;
+
+  #producers-list {
+    max-height: $height-producers-list-map;
+
+    .panel {
+
+      .panel-body {
+        h2 {
+          font-family: 'capsuularegular';
+          font-weight: bold;
+          font-size: 27px;
+          text-transform: none;
+          margin-top: 0px;
+          margin-bottom: 5px;
+          padding-bottom: 0px;
+        }
+
+        p {
+          padding-bottom: 0px;
+        }
+
+        .producer-type {
+          //color: gray;
+          text-transform: uppercase;
+          margin-bottom: 10px;
+          font-size: 14px;
+        }
+
+        .producer-location {
+
+        }
+      }
+
+      .panel-footer {
+        //text-align: right;
+      }
+
+      .logo {
+        float: right;
+        position: relative;
+        background-color: white;
+        width: 110px;
+        height: 110px;
+        @include border-radius(110px);
+        border: solid 1px #e0e0e0;
+        text-align: right;
+        overflow: hidden;
+
+        .img-logo {
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          transform: translate(-50%, -50%);
+          max-width: 90px;
+          max-height: 90px;
+        }
+      }
+    }
+  }
+  #producers-map {
+    height: $height-producers-list-map;
+    
+    /*position: fixed;
+    height: 100%;
+    width: 100%;*/
+
+    a {
+      text-decoration: none;
+    }
+  }
+}
+
 #content #mentions {
   padding-top: 20px;