modifs couleurs etc

user/themes/figureslibres-v2/templates/partials/relatedpages.html.twig

@@ -1,50 +1,50 @@
+{% macro recursivePages(amount, page, page1, page2) %}
+  {% import _self as self %}
+  {% set index = amount - 1 %}
+  {% if index >= 0 %}
+    {% set random_utilite = random(page.find('/projets').children) %}
+    {% set p = random(random_utilite.children) %}
+
+    {% if not page1 %}
+      {% if p == page %}
+        {% set index = amount + 1 %}
+        {{ self.recursivePages(index, page) }}
+      {% else %}
+        {% include 'partials/projet_card.html.twig' with { p } %}
+        {{ self.recursivePages(index, page, p) }}
+      {% endif %}
+
+    {% elseif not page2 %}
+      {% if p == page or p == page1 %}
+        {% set index = amount + 1 %}
+        {{ self.recursivePages(index, page, page1) }}
+      {% else %}
+        {% include 'partials/projet_card.html.twig' with { p } %}
+        {{ self.recursivePages(index, page, page1, p) }}
+      {% endif %}
+
+    {% elseif not page3 %}
+      {% if p == page or p == page1 or p == page2 %}
+        {% set index = amount + 1 %}
+        {{ self.recursivePages(index, page, page1, page2) }}
+      {% else %}
+        {% include 'partials/projet_card.html.twig' with { p } %}
+      {% endif %}
+
+    {% endif %}
+
+  {% endif %}
+{% endmacro %}
+
+{% import _self as self %}
+
 <div id="related-pages">
   <hr>
   <h3>Voir aussi</h3>
 
   <div id="related-grid">
-  {% set category = random(page.taxonomy.category) %}
-  {% set p = random(taxonomy.findTaxonomy({'category': category}))%}
-  {% if p == page %}
-    {% set category = random(page.taxonomy.category) %}
-    {% set p = random(taxonomy.findTaxonomy({'category': category}))%}
-    {% if p == page %}
-      {% set category = random(page.taxonomy.category) %}
-      {% set p = random(taxonomy.findTaxonomy({'category': category}))%}
-      {% if p == page %}
-        {% set category = random(page.taxonomy.category) %}
-        {% set p = random(taxonomy.findTaxonomy({'category': category}))%}
-      {% endif %}
-    {% endif %}
-  {% endif %}
-  {% include 'partials/projet_card.html.twig' %}
-
-  {% set p = random(page.parent.children) %}
-  {% if p == page or p == related_category_page %}
-    {% set p = random(page.parent.children) %}
-    {% if p == page or p == related_category_page %}
-      {% set p = random(page.parent.children) %}
-      {% if p == page or p == related_category_page %}
-        {% set p = random(page.parent.children) %}
-      {% endif %}
-    {% endif %}
-  {% endif %}
-  {% include 'partials/projet_card.html.twig' %}
-
-  {% set random_utilite = random(page.find('/projets').children) %}
-  {% set p = random(random_utilite.children) %}
-  {% if p == page or p == related_utilite_page or p == related_category_page %}
-    {% set random_utilite = random(page.find('/projets').children) %}
-    {% set p = random(random_utilite.children) %}
-    {% if p == page or p == related_utilite_page or p == related_category_page %}
-      {% set random_utilite = random(page.find('/projets').children) %}
-      {% set p = random(random_utilite.children) %}
-      {% if p == page or p == related_utilite_page or p == related_category_page %}
-        {% set random_utilite = random(page.find('/projets').children) %}
-        {% set p = random(random_utilite.children) %}
-      {% endif %}
-    {% endif %}
-  {% endif %}
-  {% include 'partials/projet_card.html.twig' %}
+    {% set relatedAmount = 3 %}
+    {{ self.recursivePages(relatedAmount, page) }}
   </div>
+  <p><a href="{{ page.parent.parent.url }}">Retour à la liste des projets</a></p>
 </div>

user/themes/figureslibres-v2/templates/projets-index.html.twig

@@ -6,8 +6,8 @@
     <div id="filter-index">
       <p>Consulter les projets d'utilité</p>
       <p>
-        <span id="publique-filter" class="filter-button" onClick="filterCards('publique')">publique</span>,
-        <span id="sociale-filter" class="filter-button" onClick="filterCards('sociale')">sociale</span>,
+        <span id="publique-filter" class="filter-button" onClick="filterCards('publique')">publique</span>
+        <span id="sociale-filter" class="filter-button" onClick="filterCards('sociale')">sociale</span>
         <span id="culturelle-filter" class="filter-button" onClick="filterCards('culturelle')">culturelle</span>
       </p>
     </div>

user/themes/figureslibres-v2/templates/reader.html.twig

@@ -1,61 +1,49 @@
 {% extends 'partials/base.html.twig' %}
 
 {% block content %}
-    <div id="reader" class="content" data-barba="container" data-barba-namespace="reader">
-        <div id="header-project">
-        {% switch page.parent.title %}
-          {% case 'Publique' %}
-            <h2 class="info-project-publique">
-          {% case 'Sociale' %}
-            <h2 class="info-project-sociale">
-          {% case 'Culturelle' %}
-            <h2 class="info-project-culturelle">
-        {% endswitch %}
-            <span data-text="{{ page.title }}">{{ page.title }}</span></h2>
-        </div>
-        <a href="{{ page.parent.parent.url }}"><div id="close-project" class="picto" data-src="{{ url('theme://images/pictos/cross.svg') }}" aria-hidden="true"></div></a>
-        <figure id="cover-image-mobile">
-          <img src="{{ url('theme://images/loader/rolling.svg') }}" data-src="{{ page.media.images|first.url }}" alt="{{ page.title }}" class="lazy loader">
-        </figure>
-        {% switch page.parent.title %}
-          {% case 'Publique' %}
-            <div id="info-project" class="info-project-publique">
-          {% case 'Sociale' %}
-            <div id="info-project" class="info-project-sociale">
-          {% case 'Culturelle' %}
-            <div id="info-project" class="info-project-culturelle">
-        {% endswitch %}
-          <h2 id="main-project-title">{{ page.title }}</h2>
-          <div>
-              {% for tag in page.taxonomy.tag %}
-                {{ tag }},
-              {% endfor %}
-              {{ page.date|date("Y") }}
-          </div>
-        </div>
-        <figure id="cover-image">
-          <img src="{{ url('theme://images/loader/rolling.svg') }}" data-src="{{ page.media.images|first.url }}" alt="{{ page.title }}" class="lazy loader">
-        </figure>
-        <hr>
-        <div id="project-description">
-            {{ page.content|raw }}
+  {% set class_suffix = page.parent.title|lower %}
+  <div id="reader" class="content" data-barba="container" data-barba-namespace="reader">
+      <div id="header-project">
+        <h2 class="info-project-{{ class_suffix }}">
+          <span data-text="{{ page.title }}">{{ page.title }}</span>
+        </h2>
+      </div>
+      <a href="{{ page.parent.parent.url }}"><div id="close-project" class="picto" data-src="{{ url('theme://images/pictos/cross.svg') }}" aria-hidden="true"></div></a>
+      <figure id="cover-image-mobile" class="{{ class_suffix }}">
+        <img src="{{ url('theme://images/loader/rolling.svg') }}" data-src="{{ page.media.images|first.url }}" alt="{{ page.title }}" class="lazy loader">
+      </figure>
+      <div id="info-project" class="info-project-{{ class_suffix }}">
+        <h2 id="main-project-title">{{ page.title }}</h2>
+        <div>
+            {% for tag in page.taxonomy.tag %}
+              {{ tag }},
+            {% endfor %}
+            {{ page.date|date("Y") }}
         </div>
+      </div>
+      <figure id="cover-image" class="{{ class_suffix }}">
+        <img src="{{ url('theme://images/loader/rolling.svg') }}" data-src="{{ page.media.images|first.url }}" alt="{{ page.title }}" class="lazy loader">
+      </figure>
+      <hr>
+      <div id="project-description">
+          {{ page.content|raw }}
+      </div>
 
-        <div id="project-images-grid">
-          {% for image in page.media.images %}
-              {% if image != page.media.images | first %}
-                <figure>
-                  <img src="{{ url('theme://images/loader/rolling.svg') }}" data-src="{{ image.url }}" alt="{{ page.title }}" class="lazy loader project-image">
-                </figure>
-              {% endif %}
-          {% endfor %}
+      <div id="project-images-grid">
+        {% for image in page.media.images %}
+            {% if image != page.media.images | first %}
+              <figure class="{{ class_suffix }}">
+                <img src="{{ url('theme://images/loader/rolling.svg') }}" data-src="{{ image.url }}" alt="{{ page.title }}" class="lazy loader project-image">
+              </figure>
+            {% endif %}
+        {% endfor %}
+      </div>
 
-        </div>
-        {% block related_pages %}
-          {% include 'partials/relatedpages.html.twig' %}
-        {% endblock %}
-        {% block carousel %}
-          {% include 'partials/carousel.html.twig' %}
-        {% endblock %}
-    </div>
+      {% block related_pages %}
+        {% include 'partials/relatedpages.html.twig' %}
+      {% endblock %}
+      {% block carousel %}
+        {% include 'partials/carousel.html.twig' %}
+      {% endblock %}
+  </div>
 {% endblock %}