Kevin 3 年之前
父節點
當前提交
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{

文件差異過大導致無法顯示
+ 0 - 0
web/app/themes/la_mine/asset/images/objet_drag_5.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>

部分文件因文件數量過多而無法顯示