From c4e512849d10be1ea2049d064e56ad31561921a9 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Mon, 12 Dec 2022 16:49:45 +0100
Subject: [PATCH] fix pages list
---
assets/sass/_theme/design-system/nav.sass | 2 ++
layouts/pages/list.html | 30 ++++---------------
.../partials/blocks/templates/pages/grid.html | 17 ++++++++---
layouts/partials/diplomas/diplomas.html | 4 ++-
4 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/assets/sass/_theme/design-system/nav.sass b/assets/sass/_theme/design-system/nav.sass
index fa00504b..bf354161 100644
--- a/assets/sass/_theme/design-system/nav.sass
+++ b/assets/sass/_theme/design-system/nav.sass
@@ -93,6 +93,8 @@
@if $header-dropdown-full
.dropdown-menu
inset: 100% 0 auto 0
+ padding-left: 0
+ padding-right: 0
.nav-level-2
@include container
@include grid(4, md)
diff --git a/layouts/pages/list.html b/layouts/pages/list.html
index 9488e7b7..9a66396a 100644
--- a/layouts/pages/list.html
+++ b/layouts/pages/list.html
@@ -19,35 +19,15 @@
}}
{{ partial "hooks/after-page-hero.html" . }}
{{ partial "blocks/list.html" . }}
-
{{ else }}
- <!-- FIXME -->
- {{/* {{- partial "blocks/templates/pages/grid.html" (dict
- "pages" .Params.children
- "show_images" true
- "show_descriptions" true
- ) }} */}}
<section class="block block-pages block-pages--grid">
<div class="container">
<div class="block-content">
- <div class="grid">
- {{ range .Params.children }}
- {{- $page := partial "GetPageByUrl" . -}}
- {{ with $page }}
- <article>
- <h1>
- <a href="{{- .Permalink -}}">
- {{- partial "PrepareHTML" .Title -}}
- </a>
- </h1>
- {{ if .Params.description_short }}
- <p>{{ partial "PrepareHTML" .Params.description_short }}</p>
- {{ end }}
- {{- partial "pages/page-media.html" . -}}
- </article>
- {{- end -}}
- {{ end }}
- </div>
+ {{- partial "blocks/templates/pages/grid.html" (dict
+ "pages" .Params.children
+ "show_images" true
+ "show_descriptions" true
+ ) }}
</div>
</div>
</section>
diff --git a/layouts/partials/blocks/templates/pages/grid.html b/layouts/partials/blocks/templates/pages/grid.html
index dc7abbed..49d61003 100644
--- a/layouts/partials/blocks/templates/pages/grid.html
+++ b/layouts/partials/blocks/templates/pages/grid.html
@@ -3,10 +3,19 @@
<div class="grid">
{{ range .pages }}
- {{- $page := partial "GetPageByUrl" .page -}}
- {{- if .slug -}}
- {{- $page = partial "GetPageByUrl" .slug -}}
- {{- end -}}
+ {{- $page := false -}}
+
+ {{/* Check if . is a map or page url */}}
+ {{ if reflect.IsMap . }}
+ {{- if .page -}}
+ {{- $page = partial "GetPageByUrl" .page -}}
+ {{- else if .slug -}}
+ {{- $page = partial "GetPageByUrl" .slug -}}
+ {{ end }}
+ {{ else }}
+ {{- $page = partial "GetPageByUrl" . -}}
+ {{ end }}
+
{{ with $page }}
<article>
<h1>
diff --git a/layouts/partials/diplomas/diplomas.html b/layouts/partials/diplomas/diplomas.html
index e4f78898..16cfa850 100644
--- a/layouts/partials/diplomas/diplomas.html
+++ b/layouts/partials/diplomas/diplomas.html
@@ -8,7 +8,9 @@
<a href="{{ .Permalink }}" aria-label="{{ i18n "commons.more_aria" (dict "Title" .Title) }}">
{{- partial "PrepareHTML" .Title -}}
{{ with .Params.short_name }}
- ({{ partial "PrepareHTML" . }})
+ <span class="meta">
+ {{ partial "PrepareHTML" . }}
+ </span>
{{ end }}
</a>
{{- if $show_programs }}
--
GitLab