From 9aaa1bf352f7583ed349ce45a35f92872e9f7807 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Sat, 22 May 2021 00:16:10 +0200
Subject: [PATCH] Add case menu

---
 themes/chosto/layouts/partials/header.html   | 11 +++++++++++
 themes/chosto/layouts/partials/listitem.html |  3 +--
 themes/chosto/layouts/partials/navbar.html   | 16 +++++++++++++++-
 themes/chosto/layouts/posts/list.html        |  3 +--
 themes/chosto/layouts/posts/single.html      | 15 ++-------------
 themes/chosto/layouts/taxonomy/list.html     |  9 ---------
 6 files changed, 30 insertions(+), 27 deletions(-)
 delete mode 100644 themes/chosto/layouts/taxonomy/list.html

diff --git a/themes/chosto/layouts/partials/header.html b/themes/chosto/layouts/partials/header.html
index 7e008fb..c14f416 100644
--- a/themes/chosto/layouts/partials/header.html
+++ b/themes/chosto/layouts/partials/header.html
@@ -12,6 +12,17 @@
         {{ end }}
       </div>
       {{ end }}
+      <aside>
+        <div>
+          <section>
+            <time class="post-date" datetime="{{ .Date.Format `2006-01-02T15:04:05Z07:00` | safeHTML }}">
+              Article publié le {{ .Date.Day }} {{ index $.Site.Data.months_fr (printf "%d" .Date.Month) }} {{ .Date.Year }} (dernière modification le {{ .Lastmod.Day }} {{ index $.Site.Data.months_fr (printf "%d" .Lastmod.Month) }}
+              {{ .Lastmod.Year }})
+            </time>
+            <h4>{{ .FuzzyWordCount }} mots </h4>
+          </section>
+        </div>
+      </aside>
     </div>
   </section>
 </header>
diff --git a/themes/chosto/layouts/partials/listitem.html b/themes/chosto/layouts/partials/listitem.html
index 1f0853e..3f5176a 100644
--- a/themes/chosto/layouts/partials/listitem.html
+++ b/themes/chosto/layouts/partials/listitem.html
@@ -17,14 +17,13 @@
       {{ $currentPostIndex := 1 }}
       {{ $posts := (where $.Site.RegularPages "CurrentSection.Params.Code" "==" $.CurrentSection.Params.Code )}}
       {{ $postsSorted := (sort $posts "Date" )}}
-      {{ $postCounts := len $postsSorted }}
       {{ range $index, $element := $postsSorted }}
         {{ if eq $element.Title $currentPost.Title }}
           {{ $currentPostIndex = (add $index 1) }}
         {{ end }}
       {{ end }}
       {{ with .CurrentSection.Params.Code }}
-        [{{ . }} {{ print $currentPostIndex }}/{{ print $postCounts }}]
+        [{{ . }}{{ print $currentPostIndex }}]
       {{ end }}
       {{ .Title }}
     </a>
diff --git a/themes/chosto/layouts/partials/navbar.html b/themes/chosto/layouts/partials/navbar.html
index 2001a77..f3fce88 100644
--- a/themes/chosto/layouts/partials/navbar.html
+++ b/themes/chosto/layouts/partials/navbar.html
@@ -18,13 +18,27 @@
           </a>
           <div class="navbar-dropdown">
             {{ range $key, $value := .Site.Taxonomies.categories }}
-            <a class="navbar-item" href="{{ .Page.Permalink }}">
+            <a class="navbar-item {{ if eq $.Permalink .Page.Permalink }}is-active{{ end }}" href="{{ .Page.Permalink }}">
               {{ $key | humanize }}
               <span class="tag ml-2 is-rounded">{{ len . }}</span>
             </a>
             {{ end }}
           </div>
         </div>
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link">
+            Dossiers
+          </a>
+          <div class="navbar-dropdown">
+            {{ range where .Site.Pages "Params.Code" "!=" nil }}
+            <a class="navbar-item {{ if eq $.Permalink .Page.Permalink }}is-active{{ end }}" href="{{ .Page.Permalink }}">
+              {{ .Title | humanize }}
+              {{ $casePosts := where .Site.RegularPages "CurrentSection.Params.Code" "==" .Params.Code }}
+              <span class="tag ml-2 is-rounded">{{ len $casePosts }}</span>
+            </a>
+            {{ end }}
+          </div>
+        </div>
         {{ $currentPage := . }}
         {{ range .Site.Menus.main }}
         {{ if .HasChildren }}
diff --git a/themes/chosto/layouts/posts/list.html b/themes/chosto/layouts/posts/list.html
index a29c129..e460b3b 100644
--- a/themes/chosto/layouts/posts/list.html
+++ b/themes/chosto/layouts/posts/list.html
@@ -5,8 +5,7 @@
         {{ .Content }}
     </article>
     <ul>
-    <!-- Ranges through content/posts/*.md -->
-    {{ range .Site.RegularPages }}
+    {{ range .Paginator.Pages }}
         {{- partial "listitem.html" . -}}
     {{ end }}
     </ul>
diff --git a/themes/chosto/layouts/posts/single.html b/themes/chosto/layouts/posts/single.html
index 8274782..25f97b6 100644
--- a/themes/chosto/layouts/posts/single.html
+++ b/themes/chosto/layouts/posts/single.html
@@ -4,10 +4,10 @@
   If the current blog post belongs to a case, we will add a side menu
   with all other blog posts belonging to that case, emphasis to the current.
   -->
-  {{ with .CurrentSection.Params.Title }}
+  {{ with .CurrentSection }}
   <aside class="menu box column is-3">
     <p class="menu-label">
-      Dans le dossier « {{ . }} »...
+      Dans le dossier « <a href="{{ .Permalink }}">{{ .Params.Title }} »</a>...
     </p>
     <div class="menu-list">
       {{ $posts := (where $.Site.RegularPages "CurrentSection.Params.Code" "==" $.CurrentSection.Params.Code )}}
@@ -19,17 +19,6 @@
   </aside>
   {{ end }}
   <section class="column is-7">
-    <aside>
-      <div>
-        <section>
-          <time class="post-date" datetime="{{ .Date.Format `2006-01-02T15:04:05Z07:00` | safeHTML }}">
-            Article publié le {{ .Date.Day }} {{ index $.Site.Data.months_fr (printf "%d" .Date.Month) }} {{ .Date.Year }} (dernière modification le {{ .Lastmod.Day }} {{ index $.Site.Data.months_fr (printf "%d" .Lastmod.Month) }}
-            {{ .Lastmod.Year }})
-          </time>
-          <h4>{{ .FuzzyWordCount }} mots </h4>
-        </section>
-      </div>
-    </aside>
     <div>
       <article>
         {{ .Content }}
diff --git a/themes/chosto/layouts/taxonomy/list.html b/themes/chosto/layouts/taxonomy/list.html
deleted file mode 100644
index 7b1722b..0000000
--- a/themes/chosto/layouts/taxonomy/list.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{{ define "main" }}
-<main>
-  <ul>
-      {{ range .Data.Terms.Alphabetical }}
-              <li><a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a> {{ .Count }}</li>
-      {{ end }}
-  </ul>
-</main>
-{{ end }}