small modif before mobile

assets/app/frontend/js/script.js

@@ -13,6 +13,7 @@ function initialisePopovers() {
         html: true,
         container: '.map',
         placement: 'top',
+        trigger: 'focus',
     });
 }
 

assets/app/frontend/scss/about.scss

@@ -228,7 +228,7 @@
       }
     }
   }
-  
+
   .bloc-coop-cit {
     background-color: $green;
     color: #FFF;
@@ -298,7 +298,11 @@
     }
 
     img {
-      max-width: 80%;
+      max-width: 300px;
+    }
+
+    .logo-hericourt {
+      max-width: 200px;
     }
   }
 }

assets/app/frontend/scss/header.scss

@@ -127,6 +127,10 @@
     .toggle {
       border: 0;
       background-color: #FFF;
+
+      img {
+        max-width: 140px;
+      }
     }
   }
 }

assets/app/frontend/scss/home.scss

@@ -77,7 +77,7 @@
       display: inline-block;
       margin-top: 20px;
       margin-bottom: 30px;
-      color: $green;
+      color: $orange;
       font-weight: bold;
       text-decoration: none;
     }

public/build/entrypoints.json

@@ -2,7 +2,7 @@
   "entrypoints": {
     "adminlte-plugins": {
       "js": [
-        "/build/runtime.01c101e5.js",
+        "/build/runtime.56247ca7.js",
         "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
         "/build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js",
         "/build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js",
@@ -17,7 +17,7 @@
     },
     "adminlte-index": {
       "js": [
-        "/build/runtime.01c101e5.js",
+        "/build/runtime.56247ca7.js",
         "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
         "/build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js",
         "/build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js",
@@ -30,7 +30,7 @@
     },
     "adminlte-form": {
       "js": [
-        "/build/runtime.01c101e5.js",
+        "/build/runtime.56247ca7.js",
         "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
         "/build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js",
         "/build/adminlte-form.4079807b.js"
@@ -41,7 +41,7 @@
     },
     "adminlte-sort": {
       "js": [
-        "/build/runtime.01c101e5.js",
+        "/build/runtime.56247ca7.js",
         "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
         "/build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js",
         "/build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js",
@@ -55,7 +55,7 @@
     },
     "adminlte-field-filemanager": {
       "js": [
-        "/build/runtime.01c101e5.js",
+        "/build/runtime.56247ca7.js",
         "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
         "/build/adminlte-field-filemanager.d8302fb7.js"
       ],
@@ -65,7 +65,7 @@
     },
     "adminlte-field-collection": {
       "js": [
-        "/build/runtime.01c101e5.js",
+        "/build/runtime.56247ca7.js",
         "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
         "/build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js",
         "/build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js",
@@ -79,7 +79,7 @@
     },
     "adminlte-main": {
       "js": [
-        "/build/runtime.01c101e5.js",
+        "/build/runtime.56247ca7.js",
         "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
         "/build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js",
         "/build/adminlte-main.e8feeffc.js"
@@ -90,7 +90,7 @@
     },
     "sov-reminder": {
       "js": [
-        "/build/runtime.01c101e5.js",
+        "/build/runtime.56247ca7.js",
         "/build/sov-reminder.27580486.js"
       ],
       "css": [
@@ -99,13 +99,13 @@
     },
     "sov-ticket": {
       "js": [
-        "/build/runtime.01c101e5.js",
+        "/build/runtime.56247ca7.js",
         "/build/sov-ticket.df76c7a0.js"
       ]
     },
     "app-backend": {
       "js": [
-        "/build/runtime.01c101e5.js",
+        "/build/runtime.56247ca7.js",
         "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
         "/build/vendors-node_modules_core-js_modules_es_array_find_js.5b9cb885.js",
         "/build/app-backend.9246973d.js"
@@ -116,21 +116,21 @@
     },
     "app-frontend": {
       "js": [
-        "/build/runtime.01c101e5.js",
+        "/build/runtime.56247ca7.js",
         "/build/vendors-node_modules_core-js_internals_export_js.a0c0cb57.js",
         "/build/vendors-node_modules_core-js_modules_es_string_replace_js.06749256.js",
         "/build/vendors-node_modules_jquery_src_jquery_js.2a8ff255.js",
         "/build/vendors-node_modules_core-js_modules_es_string_split_js-node_modules_popper_js_dist_esm_popper_js.22d0763b.js",
         "/build/vendors-node_modules_bootstrap_dist_js_bootstrap_js-node_modules_core-js_internals_object-def-7fa577.a4fc2b12.js",
-        "/build/app-frontend.212543dd.js"
+        "/build/app-frontend.32a560b0.js"
       ],
       "css": [
-        "/build/app-frontend.a126fd2d.css"
+        "/build/app-frontend.ec892e82.css"
       ]
     },
     "app-bulle": {
       "js": [
-        "/build/runtime.01c101e5.js",
+        "/build/runtime.56247ca7.js",
         "/build/vendors-node_modules_amcharts_amcharts4_charts_js-node_modules_amcharts_amcharts4_core_js-nod-e7c189.7a170faa.js",
         "/build/app-bulle.08404383.js"
       ]

public/build/manifest.json

@@ -17,10 +17,10 @@
   "build/sov-ticket.js": "/build/sov-ticket.df76c7a0.js",
   "build/app-backend.css": "/build/app-backend.3d882954.css",
   "build/app-backend.js": "/build/app-backend.9246973d.js",
-  "build/app-frontend.css": "/build/app-frontend.a126fd2d.css",
-  "build/app-frontend.js": "/build/app-frontend.212543dd.js",
+  "build/app-frontend.css": "/build/app-frontend.ec892e82.css",
+  "build/app-frontend.js": "/build/app-frontend.32a560b0.js",
   "build/app-bulle.js": "/build/app-bulle.08404383.js",
-  "build/runtime.js": "/build/runtime.01c101e5.js",
+  "build/runtime.js": "/build/runtime.56247ca7.js",
   "build/pdfmake.js": "/build/pdfmake.fbf70324.js",
   "build/canvg.js": "/build/canvg.5e04b23d.js",
   "build/xlsx.js": "/build/xlsx.05855660.js",

src/Controller/Frontend/CartoController.php

@@ -103,6 +103,13 @@ class CartoController extends DefaultController
                     10
                 );
             }
+        } else {
+            $resultArray = $this->generateResultArray();
+            $resultArrayPagination = $this->paginator->paginate(
+                $resultArray,
+                1,
+                10
+            );
         }
 
         return $this->render(
@@ -206,20 +213,22 @@ class CartoController extends DefaultController
                 }
             }
         }
-//        dump($data);
-//        die;
 
         return new JsonResponse($data);
     }
 
-    private function generateResultArray($data): array
-    {
+    private function generateResultArray(
+        $data = array(
+            'search' => '',
+            'category' => array()
+        )
+    ): array {
         $dreamArray = $revoltArray = $projectBoostArray = $projectInspiringArray = array();
 
         $subthematic = $data['search'];
         $categoryArray = $data['category'];
-        $territoryArray = $data['territory'];
-        $thematicArray = $data['thematic'];
+        $territoryArray = isset($data['territory']) ? $data['territory'] : new ArrayCollection();
+        $thematicArray = isset($data['thematic']) ? $data['thematic'] : new ArrayCollection();
 
         if (in_array(AbstractData::CATEGORY_DREAM, $categoryArray) || empty($categoryArray)) {
             $dreamArray = $this->dreamStore->filterSearch($subthematic, $territoryArray, $thematicArray);

templates/frontend/about.html.twig

@@ -225,13 +225,13 @@
         <h2>Financé par :</h2>
         <div class="row">
             <div class="col">
-                <img src="{{ 'assets/img/Bourgogne-Franche-Comté_2016.png' }}" alt="coeur">
+                <img src="{{ 'assets/img/Bourgogne-Franche-Comté_2016.png' }}" alt="bourgogne franche comté">
             </div>
             <div class="col">
-                <img src="{{ 'assets/img/pma-pays-de-montbeliard-agg.jpg' }}" alt="coeur">
+                <img src="{{ 'assets/img/pma-pays-de-montbeliard-agg.jpg' }}" alt="pays de montbéliard">
             </div>
             <div class="col">
-                <img src="{{ 'assets/img/Logo_Héricourt_70.png' }}" alt="coeur">
+                <img class="logo-hericourt" src="{{ 'assets/img/Logo_Héricourt_70.png' }}" alt="héricourt">
             </div>
         </div>
     </div>

templates/frontend/carto-carte.html.twig

@@ -56,19 +56,19 @@
                 <div class="img-map img-{{ key }}">
                     {% set url = '<a href="'~ path('app_carto_liste', {search_list_form:{category:{'':constant('App\\Entity\\AbstractData::CATEGORY_REVOLT')}, territory:{'':result.Territory}}}) ~'">Consulter la liste</a>' %}
                     <img src="{{ 'assets/img/Picto-Revoltes.png' }}" alt="" data-toggle="popover"
-                         data-content='<span>Nombre de Révoltes : {{ result.Revolt }} </span> {{ url }}'>
+                        tabindex="0" data-trigger="focus" data-content='<span>Nombre de Révoltes : {{ result.Revolt }} </span> {{ url }}'>
 
                     {% set url = '<a href="'~ path('app_carto_liste', {search_list_form:{category:{'':constant('App\\Entity\\AbstractData::CATEGORY_DREAM')}, territory:{'':result.Territory}}}) ~'">Consulter la liste</a>' %}
                     <img src="{{ 'assets/img/Picto-Reve.png' }}" alt="" data-toggle="popover"
-                         data-content='<span>Nombre de Rêves : {{ result.Dream }} </span> {{ url }}'>
+                         tabindex="0" data-trigger="focus" data-content='<span>Nombre de Rêves : {{ result.Dream }} </span> {{ url }}'>
 
                     {% set url = '<a href="'~ path('app_carto_liste', {search_list_form:{category:{'':constant('App\\Entity\\AbstractData::CATEGORY_PROJECTBOOST')}, territory:{'':result.Territory}}}) ~'">Consulter la liste</a>' %}
                     <img src="{{ 'assets/img/Picto-Actions-Booster.png' }}" alt="" data-toggle="popover"
-                         data-content='<span>Nombre de projets à booster : {{ result.ProjectBoost }} </span> {{ url }}'>
+                         tabindex="0" data-trigger="focus" data-content='<span>Nombre de projets à booster : {{ result.ProjectBoost }} </span> {{ url }}'>
 
                     {% set url = '<a href="'~ path('app_carto_liste', {search_list_form:{category:{'':constant('App\\Entity\\AbstractData::CATEGORY_PROJECTINSPIRING')}, territory:{'':result.Territory}}}) ~'">Consulter la liste</a>' %}
                     <img src="{{ 'assets/img/Picto-Actions-Inspirantes.png' }}" alt="" data-toggle="popover"
-                         data-content='<span>Nombre de projets inspirants : {{ result.ProjectInspiring }} </span> {{ url }}'>
+                         tabindex="0" data-trigger="focus" data-content='<span>Nombre de projets inspirants : {{ result.ProjectInspiring }} </span> {{ url }}'>
                 </div>
             {% endfor %}
         </div>

templates/frontend/footer.html.twig

@@ -6,7 +6,9 @@
                 <ul>
                     <li class="title-list">Aux Actes Citoyens</li>
                     <li><a href="{{ path('app_about') }}" title="A propos">A propos</a></li>
-                    <li><a href="" title="Devenez partenaire">Devenez partenaire</a></li>
+                    <li>
+                        {{ macro.email_contact("Devenez partenaire", "Devenir partenaire") }}
+                    </li>
                     <li><a href="{{ path('app_about') }}#team-coeur" title="L’équipe coeur">L’équipe coeur</a></li>
                 </ul>
             </div>
@@ -64,13 +66,13 @@
             </div>
             <div class="col-4 col-network">
                 <p class="stay-connect">Restez connecté :</p>
-                <a href="" title="Facebook">
+                <a href="https://www.facebook.com/laCoopCitoyens/?ref=pages_you_manage" title="Facebook" target="_blank">
                     <img src="{{ 'assets/img/Picto-Facebook.png' }}" alt="facebook">
                 </a>
-                <a href="" title="Linkedin">
+                <a href="https://www.linkedin.com/company/69372918/admin/" title="Linkedin" target="_blank">
                     <img src="{{ 'assets/img/Picto-Linkedin.png' }}" alt="Linkedin">
                 </a>
-                <a href="" title="GooglePlus">
+                <a href="https://www.lacooperativedescitoyens.fr" title="GooglePlus" target="_blank">
                     <img src="{{ 'assets/img/Picto-GooglePlus.png' }}" alt="GooglePlus">
                 </a>
             </div>