Migrate to Zola 0.23

templates/base.html

@@ -1,4 +1,4 @@
-{% import "macros.html" as macros %}
+{% set section_or_page = section | default(value = page) -%}
 <!doctype html>
 <html lang="fr">
 	<head>
@@ -6,7 +6,7 @@
 		<title>{% block title %}{% endblock title %}</title>
 		<link type="text/plain" rel="author" href="/humans.txt"/>
 		<link rel="stylesheet" href="/css/base.css"/>
-		{% if page.extra.leaflet or section.extra.leaflet %}<link rel="stylesheet" href="/vendor/leaflet/leaflet.css"/>{% endif %}
+		{% if section_or_page.extra.leaflet %}<link rel="stylesheet" href="/vendor/leaflet/leaflet.css"/>{% endif %}
 		<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico"/>
 		<meta name="viewport" content="width=device-width"/>
 		<meta property="og:title" content="{% if page %}{{ page.title }}{% elif section %}{{ section.title }}{% endif %}"/>
@@ -85,6 +85,6 @@
 				</div>
 			</div>
 		</footer>
-		{% if page.extra.carousel or section.extra.carousel %}<script type="text/javascript" src="/js/carousel.js"></script>{% endif %}
+		{% if section_or_page.extra.carousel %}<script type="text/javascript" src="/js/carousel.js"></script>{% endif %}
 	</body>
 </html>

templates/shortcodes/carousel.html

@@ -1,3 +1,5 @@
+{% component carousel(id) %}
 <div id="{{ id | safe }}" class="carousel">
 	{{ body | markdown | safe }}
 </div>
+{% endcomponent carousel %}

templates/shortcodes/carousel_item.html

@@ -1,3 +1,5 @@
+{% component carousel_item(msg) %}
 <div class="carousel-item">
 	{{ msg | safe }}
 </div>
+{% endcomponent carousel_item %}

templates/shortcodes/client_box.html

@@ -1,3 +1,4 @@
+{% component client_box(href, title, sign, img, img_dark="") %}
 <div class="client_box">
 	<div class="client_box-left">
 		<div class="client_box-left-row">
@@ -21,3 +22,4 @@
 		</p>
 	</div>
 </div>
+{% endcomponent client_box %}

templates/shortcodes/map.html

@@ -1,3 +1,4 @@
+{% component map() %}
 <div id="map" class="nn"></div>
 <script type="text/javascript" src="/vendor/leaflet/leaflet.js"></script>
 <script type="text/javascript">
@@ -19,3 +20,4 @@
 			.bindPopup(popup);
 	}
 </script>
+{% endcomponent map %}

templates/shortcodes/need_box.html

@@ -1 +1,3 @@
+{% component need_box(title) %}
 <div class="need_box"><span class="need_box-title">{{title|safe}}</span></div>
+{% endcomponent need_box %}

templates/shortcodes/partner_box.html

@@ -1 +1,3 @@
+{% component partner_box(url, title, img) %}
 <a class="partner_box-link" href="{{url|safe}}" title="{{title}}"><img class="partner_box-img" src="{{img|safe}}" alt="{{title}}" loading="lazy"/></a>
+{% endcomponent %}

templates/shortcodes/service_box.html

@@ -1,3 +1,4 @@
+{% component service_box(title, href, description="", img="") %}
 <div class="service_box">
 	<a class="service_box-link" href="{{href|safe}}">
 		{% if img %}<div class="service_box-img_wrap"><img class="service_box-img" src="{{img|safe}}" alt="{{title}}" aria-hidden/></div>{% endif %}
@@ -5,3 +6,4 @@
 		<span class="service_box-description">{{description|safe}}</span>{% endif %}
 	</a>
 </div>
+{% endcomponent service_box %}

templates/shortcodes/square_box.html

@@ -1,6 +1,8 @@
+{% component square_box(title) %}
 <div class="square_box">
 	<div class="square_box-inner square_box-inner-bottom" onmouseenter="randomize_square_box(this)">
 		<span class="square_box-title">{{ title | safe }}</span>
-		<p class="square_box-text">{{ text | safe }}</p>
+		<p class="square_box-text">{{ body | safe }}</p>
 	</div>
 </div>
+{% endcomponent square_box %}

templates/shortcodes/team_box.html

@@ -1,3 +1,4 @@
+{% component team_box(title, subtitle, img, place) %}
 <div class="team_box">
 	<div class="team_box-top">
 		<img class="team_box-img" src="/img/team/{{img|safe}}" alt="{{title}}" loading="lazy" aria-hidden/>
@@ -19,3 +20,4 @@
 		</div>
 	{% endif %}
 </div>
+{% endcomponent team_box %}