Tessier 4 lat temu
rodzic
commit
fd8cd36704
34 zmienionych plików z 910 dodań i 109 usunięć
  1. 5 5
      composer.json
  2. 28 12
      composer.lock
  3. 3 0
      package-lock.json
  4. 20 1
      web/app/themes/la_mine/accueil.php
  5. 8 8
      web/app/themes/la_mine/dist/assets/css/index.css
  6. 0 0
      web/app/themes/la_mine/dist/assets/css/index.min.css
  7. 7 7
      web/app/themes/la_mine/functions.php
  8. 7 9
      web/app/themes/la_mine/src/assets/js/scripts.js
  9. 7 7
      web/app/themes/la_mine/src/assets/scss/components/_footer.scss
  10. 1 1
      web/app/themes/la_mine/src/assets/scss/components/_thumbnails.scss
  11. 3 1
      web/app/themes/la_mine/src/assets/scss/index.scss
  12. 10 3
      web/app/themes/la_mine/src/assets/scss/pages/_association.scss
  13. 5 1
      web/app/themes/la_mine/src/assets/scss/pages/_benevole-zone.scss
  14. 31 2
      web/app/themes/la_mine/src/assets/scss/pages/_home.scss
  15. 4 1
      web/app/themes/la_mine/src/assets/scss/pages/_la-collecte.scss
  16. 7 4
      web/app/themes/la_mine/src/assets/scss/pages/_les-projets.scss
  17. 3 3
      web/app/themes/la_mine/src/assets/scss/pages/_les-temps-forts.scss
  18. 4 0
      web/app/themes/la_mine/src/assets/scss/pages/_privatiser-lespace.scss
  19. 76 0
      web/app/themes/la_mine/static/objet_drag_1.svg
  20. 75 0
      web/app/themes/la_mine/static/objet_drag_2.svg
  21. 57 0
      web/app/themes/la_mine/static/objet_drag_3.svg
  22. 97 0
      web/app/themes/la_mine/static/objet_drag_4.svg
  23. 84 0
      web/app/themes/la_mine/static/objet_drag_5.svg
  24. 72 0
      web/app/themes/la_mine/static/objet_drag_6.svg
  25. 91 0
      web/app/themes/la_mine/static/objet_drag_7.svg
  26. 65 0
      web/app/themes/la_mine/static/objet_drag_8.svg
  27. 82 0
      web/app/themes/la_mine/static/objet_drag_9.svg
  28. 12 0
      web/app/themes/la_mine/templates/accueil.twig
  29. 1 1
      web/app/themes/la_mine/templates/archive.twig
  30. 1 1
      web/app/themes/la_mine/templates/components/footer.twig
  31. 7 2
      web/app/themes/la_mine/templates/components/thumbnails/thumbnails.twig
  32. 19 17
      web/app/themes/la_mine/templates/les_temps_forts.twig
  33. 17 23
      web/app/themes/la_mine/templates/privatiser_lespace.twig
  34. 1 0
      web/wp-config.php

+ 5 - 5
composer.json

@@ -31,19 +31,19 @@
     }
   ],
   "require": {
-    "php": ">=7.1",
+    "php": ">=7.3",
     "composer/installers": "^1.8",
     "vlucas/phpdotenv": "^4.1.3",
     "oscarotero/env": "^1.2.0",
-    "roots/wordpress": "5.4.1",
+    "roots/wordpress": "5.5.1",
     "roots/wp-config": "1.0.0",
     "roots/wp-password-bcrypt": "1.0.0",
-    "wpackagist-plugin/advanced-custom-fields": "^5.8",
+    "wpackagist-plugin/advanced-custom-fields": "^5.9.1",
     "wpackagist-plugin/classic-editor": "^1.5",
-    "wpackagist-plugin/timber-library": "^1.15",
+    "wpackagist-plugin/timber-library": "^1.18",
     "twbs/bootstrap": "4.5.0",
     "twig/extensions": "^1.5",
-    "wpackagist-plugin/advanced-forms": "^1.6",
+    "wpackagist-plugin/advanced-forms": "^1.7",
     "wpackagist-plugin/wp-mail-smtp": "^2.4"
   },
   "require-dev": {

+ 28 - 12
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "01e1678ee520805eb78030d161e383b5",
+    "content-hash": "df4174eeaca5350cba29729b00378961",
     "packages": [
         {
             "name": "composer/installers",
@@ -243,16 +243,16 @@
         },
         {
             "name": "roots/wordpress",
-            "version": "5.4.1",
+            "version": "5.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/WordPress/WordPress.git",
-                "reference": "5.4.1"
+                "reference": "5.5.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/WordPress/WordPress/zipball/5.4.1",
-                "reference": "5.4.1"
+                "url": "https://api.github.com/repos/WordPress/WordPress/zipball/5.5.1",
+                "reference": "5.5.1"
             },
             "require": {
                 "php": ">=5.3.2",
@@ -276,7 +276,17 @@
                 "cms",
                 "wordpress"
             ],
-            "time": "2020-04-29T18:50:02+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/roots",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/rootsdev",
+                    "type": "patreon"
+                }
+            ],
+            "time": "2020-09-01T18:56:09+00:00"
         },
         {
             "name": "roots/wordpress-core-installer",
@@ -696,6 +706,7 @@
                 "i18n",
                 "text"
             ],
+            "abandoned": true,
             "time": "2018-12-05T18:34:18+00:00"
         },
         {
@@ -945,12 +956,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "81cb95735a719403eddb77fc78e21362b56d9ea9"
+                "reference": "e859317fce42b1ec2d42b204285beaba541e8dbf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/81cb95735a719403eddb77fc78e21362b56d9ea9",
-                "reference": "81cb95735a719403eddb77fc78e21362b56d9ea9",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/e859317fce42b1ec2d42b204285beaba541e8dbf",
+                "reference": "e859317fce42b1ec2d42b204285beaba541e8dbf",
                 "shasum": ""
             },
             "conflict": {
@@ -980,7 +991,7 @@
                 "composer/composer": "<=1-alpha.11",
                 "contao-components/mediaelement": ">=2.14.2,<2.21.1",
                 "contao/core": ">=2,<3.5.39",
-                "contao/core-bundle": ">=4,<4.4.46|>=4.5,<4.8.6",
+                "contao/core-bundle": ">=4,<4.4.52|>=4.5,<4.9.6|= 4.10.0",
                 "contao/listing-bundle": ">=4,<4.4.8",
                 "datadog/dd-trace": ">=0.30,<0.30.2",
                 "david-garcia/phpwhois": "<=4.3.1",
@@ -1044,6 +1055,7 @@
                 "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10",
                 "league/commonmark": "<0.18.3",
                 "librenms/librenms": "<1.53",
+                "livewire/livewire": ">2.2.4,<2.2.6",
                 "magento/community-edition": ">=2,<2.2.10|>=2.3,<2.3.3",
                 "magento/magento1ce": "<1.9.4.3",
                 "magento/magento1ee": ">=1,<1.14.4.3",
@@ -1052,6 +1064,8 @@
                 "mittwald/typo3_forum": "<1.2.1",
                 "monolog/monolog": ">=1.8,<1.12",
                 "namshi/jose": "<2.2",
+                "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6",
+                "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13",
                 "nystudio107/craft-seomatic": "<3.3",
                 "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1",
                 "october/backend": ">=1.0.319,<1.0.467",
@@ -1095,6 +1109,8 @@
                 "scheb/two-factor-bundle": ">=0,<3.26|>=4,<4.11",
                 "sensiolabs/connect": "<4.2.3",
                 "serluck/phpwhois": "<=4.2.6",
+                "shopware/core": "<=6.3.1",
+                "shopware/platform": "<=6.3.1",
                 "shopware/shopware": "<5.3.7",
                 "silverstripe/admin": ">=1.0.3,<1.0.4|>=1.1,<1.1.1",
                 "silverstripe/assets": ">=1,<1.4.7|>=1.5,<1.5.2",
@@ -1239,7 +1255,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-09-18T13:01:53+00:00"
+            "time": "2020-10-02T17:02:13+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -1301,7 +1317,7 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.1"
+        "php": ">=7.3"
     },
     "platform-dev": [],
     "plugin-api-version": "1.1.0"

+ 3 - 0
package-lock.json

@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}

+ 20 - 1
web/app/themes/la_mine/accueil.php

@@ -40,9 +40,28 @@ $args = array (
 
 $context['video_url'] = get_field('video_la_mine', FALSE, FALSE);
 
-
 $context['projet'] = Timber::get_posts( $projet );
 $context['posts'] = Timber::get_posts( $args );
+$count_events = count($context['posts']);
+
+$args = array (
+    'post_type' => 'post',
+    'orderby' => 'informations_fin_event',
+    'order' => 'ASC',
+    'meta_query' => array(
+        array(
+            'key'  => 'informations_fin_event',
+            'compare'   => '>=',
+            'value'     => $today,
+        ),
+      ),
+    'numberposts' => 3
+);
+
+if ($count_events == 0) {
+  $context['posts_now'] = Timber::get_posts( $args );
+}
+
 $context['tpsF'] = Timber::get_posts( $tpsF );
 
 Timber::render('accueil.twig', $context);

Plik diff jest za duży
+ 8 - 8
web/app/themes/la_mine/dist/assets/css/index.css


Plik diff jest za duży
+ 0 - 0
web/app/themes/la_mine/dist/assets/css/index.min.css


+ 7 - 7
web/app/themes/la_mine/functions.php

@@ -40,19 +40,19 @@
 	}
 	add_action( 'wp_footer', 'rellax' );
 
+	function jquery_ui(){
+		wp_enqueue_script( 'jquery-ui',
+		get_template_directory_uri() . '/src/assets/js/jquery-ui.js', array() );
+	}
+	add_action( 'wp_footer', 'jquery_ui' );
+
+
 	function customJs(){
 		wp_enqueue_script( 'script',
 		get_template_directory_uri() . '/src/assets/js/scripts.js', array() );
 	}
 	add_action( 'wp_footer', 'customJs' );
 
-	// function includedrag() {
-	// 	wp_deregister_script('drag-ui');
-	// 	wp_enqueue_script( 'drag-ui',
-	// 	get_template_directory_uri() . '/asset/dist/js/jquery-ui.js',
-	// 	array() );
-	// }
-	// add_action('wp_enqueue_scripts', 'includedrag');
 
 	// ADD OPTION PAGES
 	if( function_exists('acf_add_options_page') ) {

+ 7 - 9
web/app/themes/la_mine/src/assets/js/scripts.js

@@ -67,11 +67,10 @@ function paralax() {
   var rellax = new Rellax(".paralax", {
     center:true
   });
-
-  $paralax.each( function(){
-    var random = Math.floor((Math.random() * 80) + 20);
-    $(this).css( "left", random +'vw' );
-  })
+  // $paralax.each( function(){
+  //   var random = Math.floor((Math.random() * 80) + 20);
+  //   $(this).css( "left", random +'vw' );
+  // })
 }
 
 function isotope() {
@@ -102,10 +101,11 @@ function isotope() {
 }
 
 function drag(){
-  $( '.group_drag' ).draggable({
+  $( '#section_projets .draggable img' ).draggable({
     containment: "html",
     scroll: false
   });
+
 }
 
 function click_nav() {
@@ -126,14 +126,12 @@ function scrollto(){
 }
 
 $( document ).ready(function() {
+  drag();
   burger();
   click_nav();
   slides();
   isotope();
-  // custom_player();
-  // masonry();
   paralax();
-  // drag();
   if (window.width >= 578) {
     scrollto();
   }

+ 7 - 7
web/app/themes/la_mine/src/assets/scss/components/_footer.scss

@@ -58,10 +58,10 @@ body{
                 flex-wrap: wrap;
                 @media screen and (min-width: 568px) {
                     flex-direction: row;
-                    justify-content: center;
+                    justify-content: flex-start;
                 }
                 & > div{
-                    border: 1px solid black;
+                    border: 2px solid black;
                     background:white;
                     text-transform: uppercase;
                     width: 100%;
@@ -84,7 +84,7 @@ body{
                 }
                 & > input{
                     width: 100%;
-                    border: 1px solid black;
+                    border: 2px solid black;
                     padding: 0.5rem;
                     border-left: 1px solid black;
                     @media screen and (min-width: 568px) {
@@ -120,16 +120,16 @@ body{
             .add_assos{
                 background: white;
                 color: black;
-                margin: 2rem auto;
-                border: 5px solid black;
+                // margin: 2rem auto;
+                border-radius: 0;
+                border: 2px solid black;
                 display: block;
                 width: max-content;
                 text-transform: uppercase;
                 @media screen and (min-width: 568px) {
-                  margin: 0.5rem auto;
+                  // margin: 0.5rem auto;
                 }
                 &:hover{
-                    border: 5px solid black;
                     background: black;
                     color: white;
                 }

+ 1 - 1
web/app/themes/la_mine/src/assets/scss/components/_thumbnails.scss

@@ -33,7 +33,7 @@
       &.transition_urbaine{
         background-image: url("../../assets/images/svg/picto_transition.svg");
       }
-      &.transition_urbaine{
+      &.autre{
         background-image: url("../../assets/images/svg/picto_autres.svg");
       }
     }

+ 3 - 1
web/app/themes/la_mine/src/assets/scss/index.scss

@@ -17,7 +17,9 @@
 .flickity-prev-next-button.next{
     right: 20px;
 }
-
+.flickity-button{
+  background: none;
+}
 @import "hamburgers/hamburgers.scss";
 
 @import "components/index.scss";

+ 10 - 3
web/app/themes/la_mine/src/assets/scss/pages/_association.scss

@@ -25,6 +25,7 @@
     }
     aside{
         height: 100%;
+
         .__header{
           h3{
             font-family: 'millimetre-bold';
@@ -35,11 +36,17 @@
         & > .wrapper{
           border:5px solid $colorYellow;
           padding: 1rem 2rem;
+          background: white;
         }
         .__content{
           ul{
             li{
               margin: 0.5rem 0;
+              a{
+                &:hover{
+                  text-decoration: underline!important;
+                }
+              }
             }
           }
           a{
@@ -49,14 +56,14 @@
             font-size: 1.2rem;
             line-height: 1;
             text-transform: uppercase;
-            text-decoration: underline;
+
           }
         }
         #bouton_asso{
           margin: 2rem 0;
           text-align: center;
           a{
-            background: none;
+            background: white;
             color: black;
             transition: 0.3s all ease;
             padding: 0.5rem 1rem;
@@ -105,4 +112,4 @@
             }
         }
     }
-}
+}

+ 5 - 1
web/app/themes/la_mine/src/assets/scss/pages/_benevole-zone.scss

@@ -4,6 +4,9 @@
             border: 5px solid $colorPurple;
         }
     }
+    .paralax{
+      right: 10%;
+    }
     main{
         aside{
             margin-bottom: 2rem;
@@ -19,6 +22,7 @@
                 padding: 1rem;
                 border: 5px solid $colorPurple;
                 text-align: center;
+                background: white;
                 @media screen and (min-width: 768px) {
                     text-align: left;
                 }
@@ -51,4 +55,4 @@
             }
         }
     }
-}
+}

+ 31 - 2
web/app/themes/la_mine/src/assets/scss/pages/_home.scss

@@ -121,9 +121,12 @@
                         }
                     }
                 }
-
+                .paralax{
+                  left: -10%;
+                }
             }
             &#section_projets{
+              position: relative;
                 .container-fluid{
                     & > h3{
                         border: 5px solid $colorRed;
@@ -167,6 +170,31 @@
                         }
                     }
                 }
+                figure{
+                  &.icones{
+                    img{
+                      position: absolute;
+                      &#objet_1{
+                        width: 200px;
+                        height: auto;
+                        left: calc(0% - 100px);
+                        top: 50%;
+                      }
+                      &#objet_2{
+                        width: 250px;
+                        height: auto;
+                        left: calc(33% - 125px);
+                        bottom: 10%;
+                      }
+                      &#objet_3{
+                        width: 300px;
+                        height: auto;
+                        right: calc(0% - 150px);
+                        top: 70%;
+                      }
+                    }
+                  }
+                }
             }
             &#section_tpsF{
                 .container-fluid{
@@ -272,8 +300,9 @@
             }
         }
     }
-    a.btn{
+    a.btn:not(.add_assos){
         display: block;
         margin: auto;
+        background: white;
     }
 }

+ 4 - 1
web/app/themes/la_mine/src/assets/scss/pages/_la-collecte.scss

@@ -6,6 +6,9 @@
     }
     aside{
         margin-bottom: 3rem;
+        form{
+          background: white;
+        }
         header{
             h3{
                 text-align: center;
@@ -16,4 +19,4 @@
             }
         }
     }
-}
+}

+ 7 - 4
web/app/themes/la_mine/src/assets/scss/pages/_les-projets.scss

@@ -20,7 +20,9 @@
             transform: translateX(-50%) rotate(-15deg);
         }
       }
-
+.paralax{
+  right: 10%;
+}
     article{
         margin: 5rem 0;
         header{
@@ -30,11 +32,12 @@
                 text-transform: uppercase;
                 color: $colorRed;
                 font-family: 'millimetre-regular';
-                font-size: 1.8rem;                
+                font-size: 1.8rem;
             }
             & > div{
-                padding: 2.5rem 3rem;            
+                padding: 2.5rem 3rem;
                 border:5px solid $colorRed;
+                background: white;
                 p{
                     margin: 0;
                 }
@@ -63,4 +66,4 @@
             }
         }
     }
-}
+}

+ 3 - 3
web/app/themes/la_mine/src/assets/scss/pages/_les-temps-forts.scss

@@ -48,13 +48,13 @@
                 left: 0;
                 width: 100%;
                 height: 100%;
-            }        
+            }
         }
     }
     main{
         & > article{
             height: 100%;
-            margin-bottom: 1rem;
+            margin-bottom: 10rem;
             h3{
                 font-size: 1.8rem;
                 line-height: 1.2;
@@ -63,4 +63,4 @@
             }
         }
     }
-}
+}

+ 4 - 0
web/app/themes/la_mine/src/assets/scss/pages/_privatiser-lespace.scss

@@ -25,8 +25,12 @@
             .__item{
                 border: 5px solid $colorGreen;
                 padding: 0.8rem;
+                background: white;
             }
         }
+        .paralax{
+          right: -10%;
+        }
         .btn{
             // margin-top: 2rem;
             border: 5px solid $colorGreen;

Plik diff jest za duży
+ 76 - 0
web/app/themes/la_mine/static/objet_drag_1.svg


+ 75 - 0
web/app/themes/la_mine/static/objet_drag_2.svg

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="objet_drag_2.svg"
+   id="svg6"
+   version="1.1"
+   width="200"
+   height="64.397003">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     inkscape:current-layer="svg6"
+     inkscape:window-maximized="0"
+     inkscape:window-y="22"
+     inkscape:window-x="0"
+     inkscape:cy="80.904051"
+     inkscape:cx="715.0311"
+     inkscape:zoom="0.33082922"
+     showgrid="false"
+     id="namedview8"
+     inkscape:window-height="869"
+     inkscape:window-width="1179"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <g
+     transform="matrix(0.22212895,0,0,0.22212895,-20.592408,-74.15067)"
+     id="g16">
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:19.4964;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="path4684"
+       cx="490.16003"
+       cy="532.63483"
+       rx="442.63651"
+       ry="127.8035"
+       transform="rotate(-5.9692718)" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:45.4916px;line-height:1.25;font-family:'Universalis ADF Std';-inkscape-font-specification:'Universalis ADF Std, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.43705"
+       x="490.15997"
+       y="577.47668"
+       id="text4689"
+       transform="rotate(-5.9692718)"><tspan
+         sodipodi:role="line"
+         id="tspan4687"
+         x="490.15997"
+         y="577.47668"
+         style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:129.976px;font-family:Millimetre;-inkscape-font-specification:'Millimetre, Ultra-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:2.43705">Fab Lab</tspan></text>
+  </g>
+</svg>

Plik diff jest za duży
+ 57 - 0
web/app/themes/la_mine/static/objet_drag_3.svg


Plik diff jest za duży
+ 97 - 0
web/app/themes/la_mine/static/objet_drag_4.svg


Plik diff jest za duży
+ 84 - 0
web/app/themes/la_mine/static/objet_drag_5.svg


Plik diff jest za duży
+ 72 - 0
web/app/themes/la_mine/static/objet_drag_6.svg


Plik diff jest za duży
+ 91 - 0
web/app/themes/la_mine/static/objet_drag_7.svg


Plik diff jest za duży
+ 65 - 0
web/app/themes/la_mine/static/objet_drag_8.svg


Plik diff jest za duży
+ 82 - 0
web/app/themes/la_mine/static/objet_drag_9.svg


+ 12 - 0
web/app/themes/la_mine/templates/accueil.twig

@@ -3,11 +3,18 @@
 {% block content %}
 <section id="section_proch" class="row">
 	<div class="container-fluid">
+{% if posts == true %}
 		<h3>Prochainement</h3>
+	{% elseif posts_now == true %}
+		<h3>En cours</h3>
+{% endif %}
 		<div class="row">
 			{% for item in posts %}
 				{% include 'components/thumbnails/thumbnails.twig'%}
 			{% endfor %}
+			{% for item in posts_now %}
+				{% include 'components/thumbnails/thumbnails.twig'%}
+			{% endfor %}
 		</div>
 		<div class="row wrap-btn">
 			<a class="btn _all" rel="noreferrer" href="/agenda">Tout voir</a>
@@ -34,6 +41,11 @@
 			<img src="{{theme.link}}/dist/assets/images/objet_3.svg" alt="objet 3">
 		</div>
 	</div>
+	<figure class="icones draggable">
+		<img id="objet_1" src="{{theme.link}}/static/objet_drag_1.svg" alt="">
+		<img id="objet_2" src="{{theme.link}}/static/objet_drag_2.svg" alt="">
+		<img id="objet_3" src="{{theme.link}}/static/objet_drag_3.svg" alt="">
+	</figure>
 </section>
 
 <section id="section_tpsF" class="row">

+ 1 - 1
web/app/themes/la_mine/templates/archive.twig

@@ -9,7 +9,7 @@
 		</ul>
 
 	  	<ul class="cat-list col d-flex flex-wrap">
-        <li data-filter="*" >
+        <li data-filter="*">
           Tous
         </li>
         {% set newArray = [] %}

+ 1 - 1
web/app/themes/la_mine/templates/components/footer.twig

@@ -5,11 +5,11 @@
     </figure>
 
     <div class="col-12 col-sm-6 col-md">
-      <strong><a href="https://numerique.ressourcerie-la-mine.com/">La Mine Numérique</a></strong>
       {{options.texte_horaire }}
     </div>
 
     <div class="col-12 col-sm-6 col-md">
+    <strong><a href="https://numerique.ressourcerie-la-mine.com/">Voir le site de La Mine numérique</a></strong>
       {{options.texte_adresse }}
     </div>
 

+ 7 - 2
web/app/themes/la_mine/templates/components/thumbnails/thumbnails.twig

@@ -6,9 +6,14 @@
   {% set title = item.title %}
 {% endif %}
 
+{# {% if loop.index >= 3 %}
+  {% set class = 'col-12 col-md-6 col-lg-4' %}
+  {% elseif loop.length >= 2 %}
+  {% set class = 'col-12 col-md-6 col-lg-6' %}
+{% endif %} #}
+
 <article class="thumbnails col-12 col-md-6 col-lg-4 {{cat}}">
   <a rel="noreferrer" href="{{site.url}}/{{item.post_name}}">
-
     <figure>
       <span class="icone_cat {{cat}}"></span>
       <div class="overflow-hidden">
@@ -26,7 +31,7 @@
             {% set start = item.informations_debut_event|date("Ydj") %}
             {% set end = item.informations_fin_event|date("Ydj") %}
             {% if start == end %}
-            
+
               <span class="start">
                 Le <time datetime="{{item.informations_debut_event|date("j F Y")}}">{{item.informations_debut_event|date("j F Y") }}</time>
                 de <time datetime="{{item.informations_debut_event|date("G:i")}}">{{item.informations_debut_event|date("G:i")}}</time>

+ 19 - 17
web/app/themes/la_mine/templates/les_temps_forts.twig

@@ -19,25 +19,27 @@
 					{{item.meta('text')}}
 				</div>
 			</aside>
-
-			<figure class="main-carousel col-md-8">
-				{% for media in item.meta('slide') %}
-					{% for add in media %}
-						{% if add.acf_fc_layout == 'images' %}
-							<div class="img">
-								<img src="{{ Image(add.image).src }}" alt="{{ Image(add.image).title }}">
-							</div>
-						{% endif %}
-						{% if add.acf_fc_layout == 'video' %}
-							<div class="video">
-								<div class="position-relative">
-									{{ add.video }}
+			{% if item.meta('slide').ajouter_un_media == true %}
+				<figure class="main-carousel col-md-8">
+					{% for media in item.meta('slide') %}
+						{% for add in media %}
+							{% if add.acf_fc_layout == 'images' %}
+								<div class="img">
+									<img src="{{ Image(add.image).src }}" alt="{{ Image(add.image).title }}">
+								</div>
+							{% endif %}
+							{% if add.acf_fc_layout == 'video' %}
+								<div class="video">
+									<div class="position-relative">
+										{{ add.video }}
+									</div>
 								</div>
-							</div>
-						{% endif %}
+							{% endif %}
+						{% endfor %}
 					{% endfor %}
-				{% endfor %}
-			</figure>
+				</figure>
+			{% endif %}
+
 		</article>
 	{% endfor %}
 {% endblock %}

+ 17 - 23
web/app/themes/la_mine/templates/privatiser_lespace.twig

@@ -17,26 +17,25 @@
 			<div class="__body">
 				{{ post.meta('paragraphe_descriptif') }}
 			</div>
-
 		</div>
 
-		<div class="wrap__content privatiser main-carousel">
-			{% for item in post.meta('slide_image') %}
-					<figure>
-						<img src="{{ Image(item.image).src }}" />
-						<div class="container position-relative">
-							<figcaption class="legendes col-10 col-md-6 col-lg-4">
-								<div class="__head">
-									<h6>{{ item.titre_legende}}</h6>
-								</div>
-								<div class="__content">
-									<p>{{ item.texte_legende}}</p>
-								</div>
-							</figcaption>
-						</div>
-					</figure>
-			{% endfor %}
-		</div>
+			<div class="wrap__content privatiser main-carousel">
+				{% for item in post.meta('slide_image') %}
+						<figure>
+							<img src="{{ Image(item.image).src }}" />
+							<div class="container position-relative">
+								<figcaption class="legendes col-10 col-md-6 col-lg-4">
+									<div class="__head">
+										<h6>{{ item.titre_legende}}</h6>
+									</div>
+									<div class="__content">
+										<p>{{ item.texte_legende}}</p>
+									</div>
+								</figcaption>	
+							</div>
+						</figure>
+				{% endfor %}
+			</div>
 
 		<div class="wrap__content __organisation">
 			<div class="__body row justify-content-center">
@@ -60,10 +59,5 @@
 
 	</div>
 
-	<div class="paralax" data-rellax-speed="5">
-		<img src="{{theme.link}}/asset/images/objet_7.svg" alt="objet 7">
-	</div>
-
-
 </article>
 {% endblock %}

+ 1 - 0
web/wp-config.php

@@ -4,6 +4,7 @@
  * This file is required in the root directory so WordPress can find it.
  * WP is hardcoded to look in its own directory or one directory up for wp-config.php.
  */
+ define( 'WP_DEBUG', true );
 require_once dirname(__DIR__) . '/vendor/autoload.php';
 require_once dirname(__DIR__) . '/config/application.php';
 require_once ABSPATH . 'wp-settings.php';

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików