Kevin преди 5 години
родител
ревизия
737534f612

+ 0 - 1
web/app/themes/la_mine/agenda.php

@@ -12,6 +12,5 @@ $args = array(
 
 $context['post'] = Timber::get_post();
 $context['posts'] = Timber::get_posts( $args );
-$context['terms'] = Timber::get_terms(array( 'taxonomy'=> 'category',  'hide_empty' => true, 'parent' => 0));
 
 Timber::render('agenda.twig', $context );

+ 0 - 1
web/app/themes/la_mine/archive.php

@@ -12,6 +12,5 @@ $args = array(
 
 $context['post'] = Timber::get_post();
 $context['posts'] = Timber::get_posts( $args );
-$context['terms'] = Timber::get_terms(array( 'taxonomy'=> 'category',  'hide_empty' => true, 'parent' => 0));
 
 Timber::render('archive.twig', $context );

+ 1 - 1
web/app/themes/la_mine/asset/dist/style.css

@@ -1003,7 +1003,7 @@ body.la-collecte .__header h3{
   .thumbnails .atelier_bois{
     background-image: url("../images/atelier_couture.png");
   }
-  .thumbnails .atelier_couture{
+  .thumbnails .atelier_couture_avec_saroj{
     background-image: url("../images/atelier_couture.png");
   }
   .thumbnails .atelier_tricot_solidaire{

+ 126 - 1
web/app/themes/la_mine/asset/images/objet_drag_5.svg

@@ -1 +1,126 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="1008.842" width="1116.005" enable-background="new"><defs><filter id="a" color-interpolation-filters="sRGB"><feBlend mode="darken" in2="BackgroundImage"/></filter></defs><path d="M395.06-611.636l-8.08 14.825 6.958 3.884-1.767 3.244 9.717 5.423 1.768-3.243 4.2 2.345-1.767 3.243 9.718 5.424 1.767-3.243 4.201 2.344-1.767 3.243 9.717 5.424 1.768-3.243 6.959 3.884 8.08-14.825-9.718-5.424-1.767 3.243-4.201-2.345 1.767-3.243-9.717-5.423-1.768 3.243-4.2-2.345 1.767-3.243-9.718-5.424-1.767 3.243-4.2-2.345 1.767-3.243z" fill="#fff" stroke="red" stroke-width="1.216" paint-order="fill markers stroke" filter="url(#a)" transform="matrix(18.09183 0 0 18.09183 -6978.834 11151.482)"/><text transform="scale(18.09183) rotate(28.397 -1410.987 -454.13)" y="-713.217" x="57.896" style="line-height:1.25;-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" font-weight="400" font-size="8.134" font-family="Universalis ADF Std" letter-spacing="0" word-spacing="0" stroke-width=".436"><tspan style="-inkscape-font-specification:'Millimetre, Ultra-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start" y="-713.217" x="57.896" font-weight="800" font-size="8.133" font-family="Millimetre">RESSOURCERIE</tspan></text></svg>
+<?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_5.svg"
+   id="svg109"
+   version="1.1"
+   enable-background="new"
+   width="1292.8856"
+   height="945.56592">
+  <metadata
+     id="metadata113">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:current-layer="svg109"
+     inkscape:window-maximized="1"
+     inkscape:window-y="22"
+     inkscape:window-x="0"
+     inkscape:cy="842.28055"
+     inkscape:cx="1382.4556"
+     inkscape:zoom="0.42771813"
+     showgrid="false"
+     id="namedview111"
+     inkscape:window-height="1029"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <defs
+     id="defs101">
+    <filter
+       color-interpolation-filters="sRGB"
+       id="a">
+      <feBlend
+         id="feBlend98"
+         in2="BackgroundImage"
+         mode="darken" />
+    </filter>
+  </defs>
+  <path
+     style="stroke-width:1.21602;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path103"
+     transform="matrix(18.09183,0,0,18.09183,-6901.1683,11156.156)"
+     filter="url(#a)"
+     paint-order="fill markers stroke"
+     stroke-width="1.216"
+     stroke="#ff0000"
+     fill="#ffffff"
+     d="m 395.06,-611.636 -8.08,14.825 6.958,3.884 -1.767,3.244 9.717,5.423 1.768,-3.243 4.2,2.345 -1.767,3.243 9.718,5.424 1.767,-3.243 4.201,2.344 -1.767,3.243 9.717,5.424 1.768,-3.243 6.959,3.884 8.08,-14.825 -9.718,-5.424 -1.767,3.243 -4.201,-2.345 1.767,-3.243 -9.717,-5.423 -1.768,3.243 -4.2,-2.345 1.767,-3.243 -9.718,-5.424 -1.767,3.243 -4.2,-2.345 1.767,-3.243 z" />
+  <g
+     style="font-weight:400;font-size:147.159px;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:0;word-spacing:0;stroke-width:7.88804"
+     id="text107"
+     transform="rotate(28.397,690.82373,176.83253)"
+     aria-label="RESSOURCERIE">
+    <g
+       id="g2658">
+      <path
+         d="m 331.36618,461.26435 c 12.507,0 14.7141,2.94282 14.7141,10.29987 v 2.94282 c 0,6.62135 -2.2071,10.29987 -14.7141,10.29987 h -14.7141 v -23.54256 z m -1.4714,42.67089 c 11.7713,0 11.7713,1.47141 13.9784,16.18551 l 2.9428,22.07116 h 22.8069 l -2.9428,-22.07116 c -1.3243,-10.29987 -2.9429,-19.86403 -11.7713,-24.27826 8.8284,-2.20712 13.2427,-10.29987 13.2427,-19.12833 v -8.82846 c 0,-19.12833 -11.7713,-28.6925 -32.3711,-28.6925 h -41.1994 v 102.99871 h 22.0711 v -38.25667 z"
+         style="font-weight:800;font-size:147.141px;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:start;stroke-width:142.709"
+         id="path2621" />
+      <path
+         d="m 382.86528,542.19191 h 73.5705 v -22.07116 h -51.4993 v -14.7141 h 44.1423 V 483.3355 h -44.1423 v -22.07115 h 51.4993 V 439.1932 h -73.5705 z"
+         style="font-weight:800;font-size:147.141px;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:start;stroke-width:142.709"
+         id="path2623" />
+      <path
+         d="m 523.38478,512.7637 c 0,3.67853 -2.2071,7.35705 -15.4498,7.35705 -11.0356,0 -14.7141,-1.47141 -14.7141,-11.77128 v -2.94282 h -22.0712 v 4.41423 c 0,22.07115 11.7713,32.37103 32.371,32.37103 h 4.4143 c 27.2211,0 37.5209,-10.29988 37.5209,-30.89962 0,-38.25666 -52.235,-25.01397 -52.235,-42.67089 0,-3.67852 2.2071,-7.35705 14.7141,-7.35705 11.0355,0 14.7141,1.47141 14.7141,11.77128 v 2.94282 h 22.0711 v -4.41423 c 0,-22.07115 -11.7713,-32.37102 -32.371,-32.37102 h -4.4142 c -26.4854,0 -36.7853,10.29987 -36.7853,30.89961 0,38.25666 52.2351,25.01397 52.2351,42.67089 z"
+         style="font-weight:800;font-size:147.141px;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:start;stroke-width:142.709"
+         id="path2625" />
+      <path
+         d="m 611.66918,512.7637 c 0,3.67853 -2.2071,7.35705 -15.4498,7.35705 -11.0356,0 -14.7141,-1.47141 -14.7141,-11.77128 v -2.94282 h -22.0712 v 4.41423 c 0,22.07115 11.7713,32.37103 32.371,32.37103 h 4.4143 c 27.221,0 37.5209,-10.29988 37.5209,-30.89962 0,-38.25666 -52.235,-25.01397 -52.235,-42.67089 0,-3.67852 2.2071,-7.35705 14.7141,-7.35705 11.0355,0 14.7141,1.47141 14.7141,11.77128 v 2.94282 h 22.0711 v -4.41423 c 0,-22.07115 -11.7713,-32.37102 -32.371,-32.37102 h -4.4142 c -26.4854,0 -36.7853,10.29987 -36.7853,30.89961 0,38.25666 52.2351,25.01397 52.2351,42.67089 z"
+         style="font-weight:800;font-size:147.141px;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:start;stroke-width:142.709"
+         id="path2627" />
+      <path
+         d="m 684.50368,520.12075 c -11.7713,0 -14.7141,-2.94282 -14.7141,-13.24269 v -32.37102 c 0,-10.29987 2.9428,-13.24269 14.7141,-13.24269 11.7713,0 14.7141,2.94282 14.7141,13.24269 v 32.37102 c 0,10.29987 -2.9428,13.24269 -14.7141,13.24269 z m -4.4142,22.07116 h 8.8285 c 20.5997,0 32.371,-10.29988 32.371,-36.04955 v -30.89961 c 0,-25.74968 -11.7713,-36.04955 -32.371,-36.04955 h -8.8285 c -20.5997,0 -32.371,10.29987 -32.371,36.04955 v 30.89961 c 0,25.74967 11.7713,36.04955 32.371,36.04955 z"
+         style="font-weight:800;font-size:147.141px;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:start;stroke-width:142.709"
+         id="path2629" />
+      <path
+         d="m 772.78808,520.12075 c -11.7713,0 -14.7141,-2.94282 -14.7141,-13.24269 V 439.1932 h -22.0712 v 66.94916 c 0,25.74967 11.7713,36.04955 32.3711,36.04955 h 8.8284 c 20.5998,0 32.371,-10.29988 32.371,-36.04955 V 439.1932 h -22.0711 v 67.68486 c 0,10.29987 -2.9428,13.24269 -14.7141,13.24269 z"
+         style="font-weight:800;font-size:147.141px;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:start;stroke-width:142.709"
+         id="path2631" />
+      <path
+         d="m 861.07248,461.26435 c 12.507,0 14.7141,2.94282 14.7141,10.29987 v 2.94282 c 0,6.62135 -2.2071,10.29987 -14.7141,10.29987 h -14.7141 v -23.54256 z m -1.4714,42.67089 c 11.7713,0 11.7713,1.47141 13.9784,16.18551 l 2.9428,22.07116 h 22.8069 l -2.9428,-22.07116 c -1.3243,-10.29987 -2.9429,-19.86403 -11.7713,-24.27826 8.8284,-2.20712 13.2427,-10.29987 13.2427,-19.12833 v -8.82846 c 0,-19.12833 -11.7713,-28.6925 -32.3711,-28.6925 h -41.1994 v 102.99871 h 22.0711 v -38.25667 z"
+         style="font-weight:800;font-size:147.141px;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:start;stroke-width:142.709"
+         id="path2633" />
+      <path
+         d="m 949.35688,520.12075 c -11.7713,0 -14.7141,-2.94282 -14.7141,-13.24269 v -32.37102 c 0,-10.29987 2.9428,-13.24269 14.7141,-13.24269 10.2998,0 14.7141,2.94282 14.7141,13.24269 v 8.82846 h 22.0711 v -11.77128 c 0,-22.07115 -11.7713,-32.37102 -32.371,-32.37102 h -8.8285 c -20.5997,0 -32.371,10.29987 -32.371,36.04955 v 30.89961 c 0,25.74967 11.7713,36.04955 32.371,36.04955 h 8.8285 c 20.5997,0 32.371,-10.29988 32.371,-32.37103 V 498.0496 h -22.0711 v 8.82846 c 0,10.29987 -4.4143,13.24269 -14.7141,13.24269 z"
+         style="font-weight:800;font-size:147.141px;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:start;stroke-width:142.709"
+         id="path2635" />
+      <path
+         d="m 1000.856,542.19191 h 73.5705 v -22.07116 h -51.4994 v -14.7141 h 44.1423 V 483.3355 h -44.1423 v -22.07115 h 51.4994 V 439.1932 h -73.5705 z"
+         style="font-weight:800;font-size:147.141px;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:start;stroke-width:142.709"
+         id="path2637" />
+      <path
+         d="m 1125.9256,461.26435 c 12.507,0 14.7141,2.94282 14.7141,10.29987 v 2.94282 c 0,6.62135 -2.2071,10.29987 -14.7141,10.29987 h -14.7141 v -23.54256 z m -1.4714,42.67089 c 11.7713,0 11.7713,1.47141 13.9784,16.18551 l 2.9428,22.07116 h 22.8069 l -2.9429,-22.07116 c -1.3242,-10.29987 -2.9428,-19.86403 -11.7712,-24.27826 8.8284,-2.20712 13.2426,-10.29987 13.2426,-19.12833 v -8.82846 c 0,-19.12833 -11.7712,-28.6925 -32.371,-28.6925 h -41.1995 v 102.99871 h 22.0712 v -38.25667 z"
+         style="font-weight:800;font-size:147.141px;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:start;stroke-width:142.709"
+         id="path2639" />
+      <path
+         d="m 1177.4247,542.19191 h 22.0712 V 439.1932 h -22.0712 z"
+         style="font-weight:800;font-size:147.141px;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:start;stroke-width:142.709"
+         id="path2641" />
+      <path
+         d="m 1214.2097,542.19191 h 73.5705 v -22.07116 h -51.4994 v -14.7141 h 44.1423 V 483.3355 h -44.1423 v -22.07115 h 51.4994 V 439.1932 h -73.5705 z"
+         style="font-weight:800;font-size:147.141px;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:start;stroke-width:142.709"
+         id="path2643" />
+    </g>
+  </g>
+</svg>

+ 17 - 6
web/app/themes/la_mine/templates/agenda.twig

@@ -1,21 +1,32 @@
 {% extends "base.twig" %}
 {% block content %}
 {% include 'components/title_page.twig'  %}
+{% set now = 'now'|date('Ydj') %}
 	<section>
 		<ul class="cat-list d-flex flex-wrap button-group filter-button-group">
 			<li data-filter="*" >
 				Tous
 			</li>
-		  {% for cat in terms %}
-				<li data-filter=".{{cat.slug}}" >
-					{{cat.name}}
-				</li>
-		  {% endfor %}
+			{% set newArray = [] %}
+			{% for cat in posts %}
+			{% set end = cat.informations_fin_event|date("Ydj") %}
+
+				{% set term = cat.categories|last.slug %}
+				{% if term not in newArray and now <= end %}
+					<li data-filter=".{{cat.categories|last.slug}}" >
+						{{cat.categories|last.name}}
+					</li>
+					{% set newArray = newArray|merge([term]) %}
+				{% endif %}
+			{% endfor %}
 		</ul>
 
 		<div class="grid">
 			{% for item in posts %}
-				{% include 'components/thumbnails/thumbnails.twig'%}
+				{% set end = item.informations_fin_event|date("Ydj") %}
+				{% if now <= end %}
+					{% include 'components/thumbnails/thumbnails.twig'%}
+				{% endif %}
 			{% endfor %}
 		</div>
 		<div class="paralax" data-rellax-speed="-5">

+ 24 - 11
web/app/themes/la_mine/templates/archive.twig

@@ -1,21 +1,34 @@
 {% extends "base.twig" %}
 {% block content %}
 {% include 'components/title_page.twig'  %}
+{% set now = 'now'|date('Ydj') %}
 	<section>
-		<ul class="cat-list d-flex flex-wrap button-group filter-button-group">
-			<li data-filter="*" >
-				Tous
-			</li>
-		  {% for cat in terms %}
-				<li data-filter=".{{cat.slug}}" >
-					{{cat.name}}
-				</li>
-		  {% endfor %}
-		</ul>
+      <ul class="cat-list d-flex flex-wrap button-group filter-button-group">
+        <li data-filter="*" >
+          Tous
+        </li>
+        {% set newArray = [] %}
+        {% for cat in posts %}
+          {% set term = cat.categories|last.slug %}
+          {% set end = cat.informations_fin_event|date("Ydj") %}
 
+          {% if term not in newArray and now >= end %}
+            <li data-filter=".{{cat.categories|last.slug}}" >
+              {{cat.categories|last.name}}
+            </li>
+            {% set newArray = newArray|merge([term]) %}
+          {% endif %}
+        {% endfor %}
+      </ul>
 		<div class="grid">
 			{% for item in posts %}
-				{% include 'components/thumbnails/thumbnails.twig'%}
+        {% set end = item.informations_fin_event|date("Ydj") %}
+        {% if now >= end %}
+
+          {% include 'components/thumbnails/thumbnails.twig'%}
+
+        {% endif %}
+
 			{% endfor %}
 		</div>
 		<div class="paralax" data-rellax-speed="-5">

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

@@ -5,7 +5,7 @@
   <a href="{{site.url}}/{{item.post_name}}">
 
     <div class="__images">
-    <div class="icone_cat {{term.slug}}">
+    <div class="icone_cat {{term.slug}} {{cat.slug}}">
 
     </div>
       <div class="__img">
@@ -44,7 +44,8 @@
             {% endif %}
           </div>
         </div>
-        <div class="lieu">{{item.lieu}}</div>
+
+        <div class="lieu">{{item.informations_lieu}}</div>
       </div>
     </div>
   </a>