From 78df220adc8b22557396d99865dbef122090adae Mon Sep 17 00:00:00 2001
From: Olivia Simonet <91660674+Olivia206@users.noreply.github.com>
Date: Fri, 27 Sep 2024 11:04:35 +0200
Subject: [PATCH] =?UTF-8?q?Ajustement=20des=20r=C3=B4les=20administratifs,?=
=?UTF-8?q?=20d'enseignement,=20etc=20dans=20la=20page=20d'une=20personne?=
=?UTF-8?q?=20(#614)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/sass/_theme/sections/persons.sass | 10 +++---
layouts/persons/single.html | 42 +++++++++++++-----------
2 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass
index 4b0bca9e..d58fce2d 100644
--- a/assets/sass/_theme/sections/persons.sass
+++ b/assets/sass/_theme/sections/persons.sass
@@ -211,11 +211,13 @@ ol.persons--list
.informations
@include grid
margin-bottom: $spacing-4
- > div:first-of-type
- grid-column: 1 / 9
.roles
- grid-column: 9 / 13
- text-align: right
+ grid-column: 1 / -1
+ .biography
+ grid-column: 1 / 9
+ + .roles
+ grid-column: 9 / 13
+ text-align: right
.lead + div
margin-top: $spacing-4
.contacts-details ul
diff --git a/layouts/persons/single.html b/layouts/persons/single.html
index a7e24cb1..b00e04dc 100644
--- a/layouts/persons/single.html
+++ b/layouts/persons/single.html
@@ -42,26 +42,30 @@
{{ end }}
<div class="informations">
- <div>
- {{ partial "persons/summary.html" (dict
- "context" .
- ) }}
- {{ if (partial "GetTextFromHTML" .Content) }}
- <div class="rich-text">
- {{ partial "PrepareHTML" .Content }}
- </div>
- {{ end }}
- </div>
- {{ range $programsForAdministrator }}
- {{ $program := . }}
+ {{ if .Content }}
+ <div class="biography">
+ {{ partial "persons/summary.html" (dict
+ "context" .
+ ) }}
+ {{ if (partial "GetTextFromHTML" .Content) }}
+ <div class="rich-text">
+ {{ partial "PrepareHTML" .Content }}
+ </div>
+ {{ end }}
+ </div>
+ {{ end }}
+ {{ if $programsForAdministrator }}
<div class="roles">
- {{ range .Params.roles }}
- {{ $role := .title }}
- {{ if in .persons $slug }}
- <p>
- {{ safeHTML $role }}<br>
- <a href="{{ $program.Permalink }}" class="link">{{ safeHTML $program.Title }}</a>
- </p>
+ {{ range $programsForAdministrator }}
+ {{ $program := . }}
+ {{ range .Params.roles }}
+ {{ $role := .title }}
+ {{ if in .persons $slug }}
+ <p>
+ {{ safeHTML $role }}<br>
+ <a href="{{ $program.Permalink }}" class="link">{{ safeHTML $program.Title }}</a>
+ </p>
+ {{ end }}
{{ end }}
{{ end }}
</div>
--
GitLab