From b648e9d856889cb8ab9baba7598457a048b7cc5e Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Mon, 23 Jan 2023 23:42:50 +0100
Subject: [PATCH] refacto partners block partial
---
assets/sass/_theme/blocks/partners.sass | 2 +
.../sass/_theme/sections/organizations.sass | 12 ++-
.../partials/blocks/templates/partners.html | 79 ++++++++++---------
3 files changed, 55 insertions(+), 38 deletions(-)
diff --git a/assets/sass/_theme/blocks/partners.sass b/assets/sass/_theme/blocks/partners.sass
index 692a80b4..347f1427 100644
--- a/assets/sass/_theme/blocks/partners.sass
+++ b/assets/sass/_theme/blocks/partners.sass
@@ -5,5 +5,7 @@
max-width: col(8)
@include in-page-with-sidebar
.organizations
+ @include grid(2, md)
+ @include grid(3, lg)
@include grid(4, xl)
grid-column-gap: half($grid-gutter) !important
diff --git a/assets/sass/_theme/sections/organizations.sass b/assets/sass/_theme/sections/organizations.sass
index 19b8db69..c732d67c 100644
--- a/assets/sass/_theme/sections/organizations.sass
+++ b/assets/sass/_theme/sections/organizations.sass
@@ -1,23 +1,31 @@
.organization
@include article
position: relative
- h2
+ h2, h3
@include meta
a
@include stretched-link
text-decoration: none
+ display: block
.media
background: $color-background-alt
padding: $spacing1
margin-bottom: half($spacing0)
picture
- aspect-ratio: 1/1
+ aspect-ratio: 1
display: block
img
width: 100%
height: 100%
object-fit: contain
object-position: center
+ &:empty
+ position: relative
+ &::after
+ content: ''
+ display: block
+ padding-bottom: 100%
+
.organizations
max-width: 100%
diff --git a/layouts/partials/blocks/templates/partners.html b/layouts/partials/blocks/templates/partners.html
index 20ce1f6c..a0e497fa 100644
--- a/layouts/partials/blocks/templates/partners.html
+++ b/layouts/partials/blocks/templates/partners.html
@@ -22,45 +22,52 @@
<div class="organizations">
{{- range .partners }}
- <div>
- {{- if .slug }}
- {{ with (site.GetPage (printf "/organizations/%s" .slug )) }}
- {{- partial "organizations/organization.html" . -}}
- {{ end }}
- {{- else -}}
- <article class="organization">
- {{- $title := "" -}}
- {{ if .name }}
- <div>
- {{ $title = partial "PrepareHTML" .name -}}
- <h3>
- {{- if .url }}
- <a href="{{ .url }}" title="{{ safeHTML (i18n "commons.link.blank_aria" (dict "Title" $title)) }}">
- {{ end }}
- {{- $title -}}
- {{ if .url }}
- </a>
- {{ end -}}
- </h3>
- </div>
- {{ end -}}
- <div class="media">
- {{- if .logo -}}
- {{- partial "commons/image.html"
- (dict
- "image" .logo
- "alt" $title
- "sizes" site.Params.image_sizes.blocks.partners
- ) -}}
- {{- end -}}
- </div>
- </article>
- {{ end -}}
-
- </div>
+ {{ if .slug }}
+ {{ with (site.GetPage (printf "/organizations/%s" .slug )) }}
+ {{ template "partner" (dict
+ "title" .Title
+ "url" .Permalink
+ "logo" .Params.logo
+ )}}
+ {{ end }}
+ {{ else }}
+ {{ template "partner" (dict
+ "title" .name
+ "url" .url
+ "logo" .logo
+ )}}
+ {{ end }}
{{ end -}}
</div>
</div>
</div>
</section>
{{- end -}}
+
+{{- define "partner" -}}
+<article class="organization">
+ {{ $title := "" }}
+ {{ if .title }}
+ {{ $title = partial "PrepareHTML" .title -}}
+ <h3>
+ {{- if .url }}
+ <a href="{{ .url }}" title="{{ safeHTML (i18n "commons.link.blank_aria" (dict "Title" $title)) }}">
+ {{ end -}}
+ {{- $title -}}
+ {{- if .url }}
+ </a>
+ {{ end -}}
+ </h3>
+ {{ end -}}
+ <div class="media">
+ {{- if .logo -}}
+ {{- partial "commons/image.html"
+ (dict
+ "image" .logo
+ "alt" $title
+ "sizes" site.Params.image_sizes.blocks.partners
+ ) -}}
+ {{- end -}}
+ </div>
+</article>
+{{- end -}}
\ No newline at end of file
--
GitLab