From 9ae7a9f0808a18214911506cb1e18215828bd44c Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Thu, 4 Apr 2024 09:46:48 +0200
Subject: [PATCH] show diplomas and programs in campus term
---
layouts/diplomas/list.html | 2 +-
layouts/locations/term.html | 27 +++++++++++--------------
layouts/partials/H2Extract | 2 --
layouts/partials/diplomas/diplomas.html | 5 ++++-
layouts/partials/pages/body.html | 13 ------------
layouts/partials/posts/body.html | 8 --------
6 files changed, 17 insertions(+), 40 deletions(-)
delete mode 100644 layouts/partials/H2Extract
delete mode 100644 layouts/partials/pages/body.html
delete mode 100644 layouts/partials/posts/body.html
diff --git a/layouts/diplomas/list.html b/layouts/diplomas/list.html
index 549c0d59..242efe4d 100644
--- a/layouts/diplomas/list.html
+++ b/layouts/diplomas/list.html
@@ -11,7 +11,7 @@
{{ partial "contents/list.html" . }}
<div class="container">
- {{ partial "diplomas/diplomas.html" . }}
+ {{ partial "diplomas/diplomas.html" ( dict "diplomas" .Paginator.Pages ) }}
</div>
</div>
diff --git a/layouts/locations/term.html b/layouts/locations/term.html
index 6282a36d..647b1bff 100644
--- a/layouts/locations/term.html
+++ b/layouts/locations/term.html
@@ -14,22 +14,19 @@
{{ partial "contents/list.html" . }}
<div class="container">
- <ol class="programs">
- {{- range .Pages -}}
- <li>
- {{- $title := partial "PrepareHTML" .Title -}}
- <a href="{{ .Permalink }}" class="title" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">
- {{- $title -}}
- </a>
- {{ if .Params.summary }}
- <p class="description">
- {{- partial "PrepareHTML" .Params.summary -}}
- </p>
- {{ end }}
- </li>
- {{- end -}}
- </ol>
+ {{ with .Params.diplomas }}
+
+ {{/* Get diplomas collection from diploma's paths */}}
+ {{ $diplomas := slice }}
+ {{ range . }}
+ {{ with site.GetPage (printf "/diplomas/%s" .path) }}
+ {{ $diplomas = $diplomas | append . }}
+ {{ end }}
+ {{ end }}
+
+ {{ partial "diplomas/diplomas.html" ( dict "diplomas" $diplomas ) }}
+ {{ end }}
{{ partial "commons/pagination.html" . }}
</div>
</div>
diff --git a/layouts/partials/H2Extract b/layouts/partials/H2Extract
deleted file mode 100644
index fdf28d8e..00000000
--- a/layouts/partials/H2Extract
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ $list := findRE "<h2.*?>(.|\n)*?</h2>" . }}
-{{ return $list }}
diff --git a/layouts/partials/diplomas/diplomas.html b/layouts/partials/diplomas/diplomas.html
index 0c15a8d0..e15146e4 100644
--- a/layouts/partials/diplomas/diplomas.html
+++ b/layouts/partials/diplomas/diplomas.html
@@ -1,5 +1,7 @@
+{{ $diplomas := .diplomas }}
+
<ul class="diplomas">
- {{ range .Paginator.Pages }}
+ {{ range $diplomas }}
<li>
<a href="{{ .Permalink }}" aria-label="{{ i18n "commons.more_aria" (dict "Title" .Title) }}">
{{- partial "PrepareHTML" .Title -}}
@@ -21,6 +23,7 @@
</ol>
</div>
</li>
+
{{ end }}
</ul>
diff --git a/layouts/partials/pages/body.html b/layouts/partials/pages/body.html
deleted file mode 100644
index b0cd31be..00000000
--- a/layouts/partials/pages/body.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ if (partial "GetTextFromHTML" .) }}
- <section>
- <div class="container">
- <div itemprop="articleBody" id="page-informations">
- {{
- partial "PrepareHTML" (
- partial "H2AddId" .
- )
- }}
- </div>
- </div>
- </section>
-{{ end }}
diff --git a/layouts/partials/posts/body.html b/layouts/partials/posts/body.html
deleted file mode 100644
index 081e75e3..00000000
--- a/layouts/partials/posts/body.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div itemprop="articleBody">
- {{
- partial "PrepareHTML" (
- partial "H2AddId" .Content
- )
- }}
- {{ partial "PrepareHTML" .Params.text }}
-</div>
--
GitLab