From 9d26679a3a57773321e69433b71d4923ef3c42fa Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Tue, 27 Jun 2023 18:01:47 +0200
Subject: [PATCH] Simpler list templates, better ordering for sections, updated
 shortcodes

---
 content/posts/rando/index.md                  |  2 +-
 themes/chosto/layouts/_default/list.html      | 21 ++++----------
 themes/chosto/layouts/_default/section.html   | 28 +++++++++++++++++++
 themes/chosto/layouts/_default/taxonomy.html  | 20 -------------
 .../chosto/layouts/shortcodes/question.html   | 10 +++++++
 themes/chosto/layouts/shortcodes/video.html   |  4 +--
 6 files changed, 46 insertions(+), 39 deletions(-)
 create mode 100644 themes/chosto/layouts/_default/section.html
 delete mode 100644 themes/chosto/layouts/_default/taxonomy.html
 create mode 100644 themes/chosto/layouts/shortcodes/question.html

diff --git a/content/posts/rando/index.md b/content/posts/rando/index.md
index 5fdfef3..c7dedac 100644
--- a/content/posts/rando/index.md
+++ b/content/posts/rando/index.md
@@ -130,7 +130,7 @@ Je croise aussi de nombreux lavoirs, mon étonnement faisant état de ma vie cit
 
 Lors d'une nuit à nouveau seul en tente — qui me fera me rappeler pourquoi je n'aime pas ça —, j'entends des explosions très régulières, comme des balles. Je finis par apprendre qu'il s'agit de [canons effaroucheurs d'oiseaux](https://www.lanouvellerepublique.fr/niort/ces-canons-qui-effarouchent-surtout-les-voisins), qui tirent jour et nuit à quelques minutes d'intervalle, parfois moins. J'aimerais entendre l'avis d'un spécialiste, mais je me questionne sur l'effet de ces dispositifs sur la santé des animaux. 
 
-{{<video src="xplo.mp4" type="video/mp4" preload="auto" caption="Un exemple de ces « coups de feu » émis par les canons effaroucheurs d'oiseaux.">}}
+{{<video src="xplo.mp4" caption="Un exemple de ces « coups de feu » émis par les canons effaroucheurs d'oiseaux.">}}
 
 Je croise beaucoup d'annonces qui témoignent d'un sentiment d'insécurité, les plus caricaturaux étant peut-être les suivants.
 
diff --git a/themes/chosto/layouts/_default/list.html b/themes/chosto/layouts/_default/list.html
index ad47f72..b804cfe 100644
--- a/themes/chosto/layouts/_default/list.html
+++ b/themes/chosto/layouts/_default/list.html
@@ -1,24 +1,13 @@
 {{ define "main" }}
+<!-- Default list used for homepage and taxonomy pages (e.g. tags),
+  but not for sections (see section.html template) -->
 <div class="section pt-5">
   <div class="container is-max-widescreen">
     <main>
-      {{ with .Content }}
-      <article class="message mt-5 mb-2">
-        <div class="message-body content">
-          {{ . }}
-        </div>
-      </article>
-      {{ end }}
       <div class="columns is-multiline">
-        <!-- Custom paginator with only blog posts -->
-        <!-- Annoying hackish stuff to only select pages belonging to the current section -->
-        {{ $articlesInSection := slice }}
-        {{ range .Site.RegularPages }}
-          {{ if $.IsAncestor . }}
-            {{ $articlesInSection = $articlesInSection | append . }}
-          {{ end }}
-        {{ end }}
-        {{ $paginator := .Paginate $articlesInSection }}
+        <!-- Custom paginator with only blog posts (e.g. avoid "À propos"),
+          ordered from newest to oldest -->
+        {{ $paginator := .Paginator }}
         {{ range $paginator.Pages }}
         {{ if (eq .FirstSection.Section "posts")}}
         <div class="column is-variable is-one-third">
diff --git a/themes/chosto/layouts/_default/section.html b/themes/chosto/layouts/_default/section.html
new file mode 100644
index 0000000..c577a5b
--- /dev/null
+++ b/themes/chosto/layouts/_default/section.html
@@ -0,0 +1,28 @@
+{{ define "main" }}
+<div class="section">
+  <div class="container is-max-widescreen">
+    <main>
+      <!-- A section _index.md may have a content, describing its theme -->
+      {{ with .Content }}
+      <article class="message mt-5 mb-2">
+        <div class="message-body content">
+          {{ . }}
+        </div>
+      </article>
+      {{ end }}
+      <!-- Then simply show posts belonging to the section,
+        but contrary to index and taxonomy, show oldest to newest,
+        to keep a sense of progression -->
+      <div class="columns is-multiline">
+        {{ $paginator := .Paginate .RegularPagesRecursive.ByDate }}
+        {{ range $paginator.Pages }}
+        <div class="column is-variable is-one-third">
+          {{ .Render "summary" }}
+        </div>
+        {{ end }}
+      </div>
+      {{- partial "pagination.html" $paginator -}}
+    </main>
+  </div>
+</div>
+{{ end }}
diff --git a/themes/chosto/layouts/_default/taxonomy.html b/themes/chosto/layouts/_default/taxonomy.html
deleted file mode 100644
index 023bc25..0000000
--- a/themes/chosto/layouts/_default/taxonomy.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{{ define "main" }}
-<div class="section">
-  <div class="container is-max-widescreen">
-    <main>
-      <div class="columns is-multiline">
-        <!-- Custom paginator with only blog posts -->
-        {{ $paginator := .Paginator }}
-        {{ range $paginator.Pages }}
-        {{ if (eq .FirstSection.Section "posts")}}
-        <div class="column is-variable is-one-third">
-          {{ .Render "summary" }}
-        </div>
-        {{ end }}
-        {{ end }}
-      </div>
-      {{- partial "pagination.html" $paginator -}}
-    </main>
-  </div>
-</div>
-{{ end }}
diff --git a/themes/chosto/layouts/shortcodes/question.html b/themes/chosto/layouts/shortcodes/question.html
new file mode 100644
index 0000000..c3c924d
--- /dev/null
+++ b/themes/chosto/layouts/shortcodes/question.html
@@ -0,0 +1,10 @@
+<div class="message is-success">
+    {{ with .Get "title" }}
+    <div class="message-header">
+        <p>{{ . }}</p>
+    </div>
+    {{ end }}
+    <div class="message-body">
+        {{ .Inner | markdownify }}
+    </div>
+</div>
\ No newline at end of file
diff --git a/themes/chosto/layouts/shortcodes/video.html b/themes/chosto/layouts/shortcodes/video.html
index b39b5a1..7976a57 100644
--- a/themes/chosto/layouts/shortcodes/video.html
+++ b/themes/chosto/layouts/shortcodes/video.html
@@ -1,6 +1,6 @@
 <figure>
-    <video class="video-shortcode" preload='{{ .Get "preload" }}' controls>
-        <source src='{{ .Get "src" }}' type='{{ .Get "type" }}'>
+    <video class="video-shortcode" preload='auto' controls>
+        <source src='{{ .Get "src" }}' type='video/mp4'>
         There should have been a video here but your browser does not seem
         to support it.
     </video>