From 76a479c158366ac2153f62010ed7d343de06e131 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Fri, 18 Nov 2022 17:30:14 +0100
Subject: [PATCH] standardise page structure
---
assets/sass/_theme/_configuration.sass | 1 +
assets/sass/_theme/blocks/video.sass | 2 +-
assets/sass/_theme/design-system/layout.sass | 22 +++---
.../sass/_theme/sections/organizations.sass | 2 +
assets/sass/_theme/sections/posts.sass | 9 ++-
layouts/_default/list.html | 2 +-
layouts/_default/single.html | 2 +-
layouts/administrators/list.html | 20 +++---
layouts/administrators/term.html | 2 +-
layouts/authors/list.html | 16 +++--
layouts/authors/term.html | 2 +-
layouts/categories/list.html | 2 +-
layouts/categories/term.html | 2 +-
layouts/diplomas/list.html | 20 +++---
layouts/diplomas/term.html | 8 ++-
layouts/index.html | 60 ++++++++--------
layouts/organizations/list.html | 12 ++--
layouts/organizations/single.html | 2 +-
layouts/pages/list.html | 44 ++++++------
layouts/papers/list.html | 12 ++--
layouts/papers/single.html | 1 -
layouts/partials/IsTocNeeded | 11 +++
layouts/partials/posts/aside.html | 3 +
layouts/partials/posts/document-nav.html | 5 --
layouts/partials/posts/post-infos.html | 72 +++++++++----------
layouts/partials/programs/document-nav.html | 5 --
layouts/partials/programs/index.html | 11 ---
layouts/partials/programs/list.html | 13 ++++
layouts/partials/programs/single.html | 12 ++--
layouts/partials/toc/container.html | 20 +++---
layouts/persons/list.html | 20 +++---
layouts/persons/single.html | 5 +-
layouts/posts/list.html | 26 +++----
layouts/posts/single.html | 6 +-
layouts/programs/list.html | 2 +-
layouts/researchers/list.html | 21 +++---
layouts/researchers/term.html | 2 +-
layouts/sitemap/list.html | 2 +-
layouts/teachers/list.html | 21 +++---
layouts/teachers/term.html | 2 +-
layouts/volumes/list.html | 15 ++--
layouts/volumes/term.html | 31 ++++----
42 files changed, 294 insertions(+), 254 deletions(-)
create mode 100644 layouts/partials/IsTocNeeded
create mode 100644 layouts/partials/posts/aside.html
delete mode 100644 layouts/partials/posts/document-nav.html
delete mode 100644 layouts/partials/programs/document-nav.html
delete mode 100644 layouts/partials/programs/index.html
create mode 100644 layouts/partials/programs/list.html
diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index c2de79af..e3412d69 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -86,6 +86,7 @@ $zindex-header: 52 !default
$zindex-body-overlay: 51 !default
$zindex-toc: 60 !default
$zindex-toc-cta: 49 !default
+$zindex-aside: 48 !default
// Header
$header-color: $main-color !default
diff --git a/assets/sass/_theme/blocks/video.sass b/assets/sass/_theme/blocks/video.sass
index c0fb2e22..c80c1da2 100644
--- a/assets/sass/_theme/blocks/video.sass
+++ b/assets/sass/_theme/blocks/video.sass
@@ -2,7 +2,7 @@
.block-video
.video
- @include aspect-ratio(16, 9, 'iframe')
+ @include aspect-ratio(16/9, 'iframe')
// @include media-breakpoint-up(md)
// @include in-page-without-sidebar
diff --git a/assets/sass/_theme/design-system/layout.sass b/assets/sass/_theme/design-system/layout.sass
index 015a009c..07849094 100644
--- a/assets/sass/_theme/design-system/layout.sass
+++ b/assets/sass/_theme/design-system/layout.sass
@@ -46,22 +46,22 @@ main
ul
padding-left: px2rem(15)
-.blocks
+.document-content
+ > * + *
+ margin-top: $spacing3
// > *
// margin-top: $spacing3
// padding-bottom: $spacing3
// &:last-child
// padding-bottom: $spacing4
- > * + *
- margin-top: $spacing3
- > *:not(:last-child)
- padding-bottom: $spacing3
- > *:last-child
- padding-bottom: $spacing4
- section
- * + p
- margin-bottom: 0 // TODO : vérifier les cas particuliers
- margin-top: $spacing1
+ // > *:not(:last-child)
+ // padding-bottom: $spacing3
+ // > *:last-child
+ // padding-bottom: $spacing4
+ // section
+ // * + p
+ // margin-bottom: 0 // TODO : vérifier les cas particuliers
+ // margin-top: $spacing1
details
diff --git a/assets/sass/_theme/sections/organizations.sass b/assets/sass/_theme/sections/organizations.sass
index ee312a12..b2f0d68f 100644
--- a/assets/sass/_theme/sections/organizations.sass
+++ b/assets/sass/_theme/sections/organizations.sass
@@ -1,5 +1,7 @@
.organization
@include article
+ h1
+ @extend .h4
.media
aspect-ratio: 1/1
img
diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass
index fd77174c..9d6de9c2 100644
--- a/assets/sass/_theme/sections/posts.sass
+++ b/assets/sass/_theme/sections/posts.sass
@@ -65,7 +65,14 @@
.posts__page
aside
- @include container
+ @include container-margin-left
+ top: 0
+ left: 0
+ height: 100%
+ position: absolute
+ width: col-outside-container(4)
+ .table-infos
+ @include sticky($spacing1)
.post-categories
@include list-reset
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index adf4751c..55fb1319 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -5,7 +5,7 @@
"image" .Params.image
"context" .
) -}}
- <div class="container">
+ <div class="document-content container">
<div class="pages">
{{ range .Paginator.Pages }}
<div>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index efbf0567..507a8e87 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -5,7 +5,7 @@
"image" .Params.image
"context" .
) -}}
- <div class="container">
+ <div class="document-content container">
{{ partial "PrepareHTML" .Content }}
</div>
{{ end }}
diff --git a/layouts/administrators/list.html b/layouts/administrators/list.html
index 5a3eb132..3a3d9f11 100644
--- a/layouts/administrators/list.html
+++ b/layouts/administrators/list.html
@@ -2,14 +2,16 @@
{{ partial "persons/hero.html" . }}
- <div class="container">
- {{ partial "persons/image.html" .Params.image }}
- {{ partial "persons/chapo.html" .Params.description_short }}
- </div>
-
- {{ partial "blocks/list.html" . }}
-
- <div class="container">
- {{ partial "persons/list-specific.html" . }}
+ <div class="document-content">
+ <div class="container">
+ {{ partial "persons/image.html" .Params.image }}
+ {{ partial "persons/chapo.html" .Params.description_short }}
+ </div>
+
+ {{ partial "blocks/list.html" . }}
+
+ <div class="container">
+ {{ partial "persons/list-specific.html" . }}
+ </div>
</div>
{{ end }}
diff --git a/layouts/administrators/term.html b/layouts/administrators/term.html
index 83e72081..8c677945 100644
--- a/layouts/administrators/term.html
+++ b/layouts/administrators/term.html
@@ -4,7 +4,7 @@
"title" .Title
"context" .
) -}}
- <div class="container">
+ <div class="document-content container">
{{ partial "pages/pages.html" . }}
{{ partial "commons/pagination.html" . }}
</div>
diff --git a/layouts/authors/list.html b/layouts/authors/list.html
index 5a3eb132..47427e7d 100644
--- a/layouts/authors/list.html
+++ b/layouts/authors/list.html
@@ -2,14 +2,16 @@
{{ partial "persons/hero.html" . }}
- <div class="container">
- {{ partial "persons/image.html" .Params.image }}
- {{ partial "persons/chapo.html" .Params.description_short }}
- </div>
+ <div class="document-content">
+ <div class="container">
+ {{ partial "persons/image.html" .Params.image }}
+ {{ partial "persons/chapo.html" .Params.description_short }}
+ </div>
- {{ partial "blocks/list.html" . }}
+ {{ partial "blocks/list.html" . }}
- <div class="container">
- {{ partial "persons/list-specific.html" . }}
+ <div class="container">
+ {{ partial "persons/list-specific.html" . }}
+ </div>
</div>
{{ end }}
diff --git a/layouts/authors/term.html b/layouts/authors/term.html
index c16b6a37..5e4fdd89 100644
--- a/layouts/authors/term.html
+++ b/layouts/authors/term.html
@@ -4,7 +4,7 @@
"title" .Title
"context" .
) -}}
- <div class="container">
+ <div class="document-content container">
{{ partial "posts/posts.html" . }}
{{ partial "commons/pagination.html" . }}
</div>
diff --git a/layouts/categories/list.html b/layouts/categories/list.html
index d5bddb1e..391cccf5 100644
--- a/layouts/categories/list.html
+++ b/layouts/categories/list.html
@@ -1,7 +1,7 @@
{{ define "main" }}
{{ partial "categories/hero-list.html" . }}
- <div class="container">
+ <div class="document-content container">
{{ partial "categories/categories.html" . }}
{{ partial "commons/pagination.html" . }}
</div>
diff --git a/layouts/categories/term.html b/layouts/categories/term.html
index c97b7782..e62d2c22 100644
--- a/layouts/categories/term.html
+++ b/layouts/categories/term.html
@@ -1,7 +1,7 @@
{{ define "main" }}
{{ partial "categories/hero-term.html" . }}
- <div class="container">
+ <div class=" document-content container">
{{ partial "categories/chapo.html" .Params.description_short }}
{{ partial "posts/posts.html" . }}
{{ partial "commons/pagination.html" . }}
diff --git a/layouts/diplomas/list.html b/layouts/diplomas/list.html
index 1a864029..10585d3e 100644
--- a/layouts/diplomas/list.html
+++ b/layouts/diplomas/list.html
@@ -1,15 +1,17 @@
{{ define "main" }}
{{ partial "diplomas/hero-list.html" . }}
- <div class="container">
- {{ partial "diplomas/image.html" .Params.image }}
- {{ partial "diplomas/chapo.html" .Params.description_short }}
- </div>
- {{ partial "blocks/list.html" . }}
- <div class="container">
- {{ .Scratch.Set "show_programs" true }}
- {{ partial "diplomas/diplomas.html" . }}
- {{ .Scratch.Delete "show_programs" }}
+ <div class="document-content">
+ <div class="container">
+ {{ partial "diplomas/image.html" .Params.image }}
+ {{ partial "diplomas/chapo.html" .Params.description_short }}
+ </div>
+ {{ partial "blocks/list.html" . }}
+ <div class="container">
+ {{ .Scratch.Set "show_programs" true }}
+ {{ partial "diplomas/diplomas.html" . }}
+ {{ .Scratch.Delete "show_programs" }}
+ </div>
</div>
{{ end }}
diff --git a/layouts/diplomas/term.html b/layouts/diplomas/term.html
index c36411a1..6177d2ad 100644
--- a/layouts/diplomas/term.html
+++ b/layouts/diplomas/term.html
@@ -1,8 +1,10 @@
{{ define "main" }}
{{ partial "diplomas/hero-single.html" . }}
- {{ partial "blocks/list.html" . }}
- <div class="container">
- {{ partial "programs/programs-list.html" .Pages }}
+ <div class="document-content">
+ {{ partial "blocks/list.html" . }}
+ <div class="container">
+ {{ partial "programs/programs-list.html" .Pages }}
+ </div>
</div>
{{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index 442b07f9..06c83700 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,36 +1,38 @@
{{ define "main" }}
{{ partial "home/hero.html" . }}
- {{- if .Params.blocks }}
-
- {{- partial "blocks/list.html" . -}}
-
- {{ else }}
-
- <div class="container">
- {{ if (partial "GetTextFromHTML" .Content) }}
- <section>
- {{- partial "PrepareHTML" .Content -}}
- </section>
- {{ end }}
-
- {{- range site.Data.menus.primary -}}
+ <div class="document-content">
+ {{- if .Params.blocks }}
+
+ {{- partial "blocks/list.html" . -}}
+
+ {{ else }}
+
+ <div class="container">
+ {{ if (partial "GetTextFromHTML" .Content) }}
<section>
- {{ partial "home/top.html" . }}
-
- {{ if eq .kind "news" }}
- {{ partial "home/posts.html" . }}
- {{ else }}
- {{ if .children }}
- {{ partial "home/pages.html" . }}
- {{ end }}
- {{ end }}
+ {{- partial "PrepareHTML" .Content -}}
</section>
- {{ end }}
-
- {{ partial "home/volumes.html" . }}
- </div>
-
- {{ end -}}
+ {{ end }}
+
+ {{- range site.Data.menus.primary -}}
+ <section>
+ {{ partial "home/top.html" . }}
+
+ {{ if eq .kind "news" }}
+ {{ partial "home/posts.html" . }}
+ {{ else }}
+ {{ if .children }}
+ {{ partial "home/pages.html" . }}
+ {{ end }}
+ {{ end }}
+ </section>
+ {{ end }}
+
+ {{ partial "home/volumes.html" . }}
+ </div>
+
+ {{ end -}}
+ </div>
{{ end }}
diff --git a/layouts/organizations/list.html b/layouts/organizations/list.html
index 03c9914c..c56beb57 100644
--- a/layouts/organizations/list.html
+++ b/layouts/organizations/list.html
@@ -1,10 +1,12 @@
{{ define "main" }}
{{ partial "organizations/hero.html" . }}
- <div class="container">
- {{ partial "organizations/organizations.html" . }}
- {{ partial "commons/pagination.html" . }}
+ <div class="document-content">
+ <div class="container">
+ {{ partial "organizations/organizations.html" . }}
+ {{ partial "commons/pagination.html" . }}
+ </div>
+
+ {{ partial "blocks/list.html" . }}
</div>
-
- {{ partial "blocks/list.html" . }}
{{ end }}
diff --git a/layouts/organizations/single.html b/layouts/organizations/single.html
index fbc63a3b..9037b15d 100644
--- a/layouts/organizations/single.html
+++ b/layouts/organizations/single.html
@@ -1,7 +1,7 @@
{{ define "main" }}
{{ partial "organizations/hero.html" . }}
- <div class="container">
+ <div class="document-content container">
<div class="content">
<div>
{{ partial "organizations/logo.html" . }}
diff --git a/layouts/pages/list.html b/layouts/pages/list.html
index b13f326d..22f293f8 100644
--- a/layouts/pages/list.html
+++ b/layouts/pages/list.html
@@ -1,28 +1,30 @@
{{ define "main" }}
{{ partial "pages/hero.html" . }}
- {{- $category := site.GetPage (printf "/categories%s" .Params.category) -}}
- {{- if .Params.blocks }}
- {{ $need_aside := false }}
- {{ range .Params.blocks }}
- {{ if .title }}
- {{ $need_aside = true }}
+ <div class="document-content">
+ {{- $category := site.GetPage (printf "/categories%s" .Params.category) -}}
+ {{- if .Params.blocks }}
+ {{ $need_aside := false }}
+ {{ range .Params.blocks }}
+ {{ if .title }}
+ {{ $need_aside = true }}
+ {{ end }}
{{ end }}
+
+ <div class="content-blocks">
+ {{ partial "toc/container.html"
+ (dict
+ "category" $category
+ "toc" "pages/toc.html"
+ "context" .
+ )
+ }}
+ {{ partial "blocks/list.html" . }}
+ </div>
+ {{ else }}
+ {{ partial "pages/image.html" .Params.image }}
+ {{ partial "pages/children.html" .Params.children }}
{{ end }}
-
- <div class="content-blocks">
- {{ partial "toc/container.html"
- (dict
- "category" $category
- "toc" "pages/toc.html"
- "context" .
- )
- }}
- {{ partial "blocks/list.html" . }}
- </div>
- {{ else }}
- {{ partial "pages/image.html" .Params.image }}
- {{ partial "pages/children.html" .Params.children }}
- {{ end }}
+ </div>
{{ end }}
diff --git a/layouts/papers/list.html b/layouts/papers/list.html
index 033ee638..741e7745 100644
--- a/layouts/papers/list.html
+++ b/layouts/papers/list.html
@@ -5,10 +5,12 @@
"image" .Params.image
"context" .
) -}}
- <div class="container">
- {{ partial "papers/papers.html" . }}
- {{ partial "commons/pagination.html" . }}
+ <div class="document-content">
+ <div class="container">
+ {{ partial "papers/papers.html" . }}
+ {{ partial "commons/pagination.html" . }}
+ </div>
+
+ {{ partial "blocks/list.html" . }}
</div>
-
- {{ partial "blocks/list.html" . }}
{{ end }}
diff --git a/layouts/papers/single.html b/layouts/papers/single.html
index 52c462c2..de90ce80 100644
--- a/layouts/papers/single.html
+++ b/layouts/papers/single.html
@@ -19,7 +19,6 @@
{{ partial "papers/aside.html" . }}
</div>
</div>
-
</div>
{{ end }}
diff --git a/layouts/partials/IsTocNeeded b/layouts/partials/IsTocNeeded
new file mode 100644
index 00000000..70c307fe
--- /dev/null
+++ b/layouts/partials/IsTocNeeded
@@ -0,0 +1,11 @@
+{{ $isNeeded := false }}
+
+{{ if eq .context.Kind "programs" }}
+ {{ $isNeeded = true }}
+{{ end }}
+
+{{ if gt (len .context.Params.blocks) 1 }}
+ {{ $isNeeded = true }}
+{{ end }}
+
+{{ return $isNeeded }}
\ No newline at end of file
diff --git a/layouts/partials/posts/aside.html b/layouts/partials/posts/aside.html
new file mode 100644
index 00000000..064fdac8
--- /dev/null
+++ b/layouts/partials/posts/aside.html
@@ -0,0 +1,3 @@
+<aside>
+ {{- partial "posts/post-infos.html" . -}}
+</aside>
diff --git a/layouts/partials/posts/document-nav.html b/layouts/partials/posts/document-nav.html
deleted file mode 100644
index 33479a0c..00000000
--- a/layouts/partials/posts/document-nav.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="document-nav">
- <div>
- {{- partial "posts/post-infos.html" . -}}
- </div>
-</div>
diff --git a/layouts/partials/posts/post-infos.html b/layouts/partials/posts/post-infos.html
index 0de8dc6c..7ea7ac72 100644
--- a/layouts/partials/posts/post-infos.html
+++ b/layouts/partials/posts/post-infos.html
@@ -1,43 +1,41 @@
-<div>
- <table class="table-infos">
- <caption>{{ i18n "posts.informations" }}</caption>
- <tbody>
+<table class="table-infos">
+ <caption>{{ i18n "posts.informations" }}</caption>
+ <tbody>
+ <tr>
+ <th scope="row">{{ i18n "posts.date" }}</th>
+ <td>
+ <time datetime="{{ .Date.Format "2006-01-02T15:04" }}">{{ .Date | time.Format ":date_long" }}</time>
+ </td>
+ </tr>
+ {{ range .GetTerms "authors" }}
<tr>
- <th scope="row">{{ i18n "posts.date" }}</th>
- <td>
- <time datetime="{{ .Date.Format "2006-01-02T15:04" }}">{{ .Date | time.Format ":date_long" }}</time>
+ <th scope="row">{{ i18n "posts.author" }}</th>
+ <td itemscope itemtype="https://schema.org/Person" itemprop="author">
+ <a href="{{ .Permalink }}" itemprop="url">
+ <span itemprop="name">{{ safeHTML .Params.person }}</span>
+ </a>
</td>
</tr>
- {{ range .GetTerms "authors" }}
- <tr>
- <th scope="row">{{ i18n "posts.author" }}</th>
- <td itemscope itemtype="https://schema.org/Person" itemprop="author">
- <a href="{{ .Permalink }}" itemprop="url">
- <span itemprop="name">{{ safeHTML .Params.person }}</span>
- </a>
- </td>
- </tr>
- {{ end }}
- {{ if .Params.Categories }}
- <tr>
- <th scope="row">
- {{- if gt (len .Params.Categories) 1 -}}
- {{ i18n "posts.categories" }}
- {{- else -}}
- {{ i18n "posts.category" }}
- {{- end -}}
- </th>
- <td itemprop="articleSection">
- {{ partial "posts/categories.html" . }}
- </td>
- </tr>
- {{ end }}
+ {{ end }}
+ {{ if .Params.Categories }}
<tr>
- <th scope="row">{{ i18n "posts.share" }}</th>
- <td>
- {{ partial "commons/share.html" }}
+ <th scope="row">
+ {{- if gt (len .Params.Categories) 1 -}}
+ {{ i18n "posts.categories" }}
+ {{- else -}}
+ {{ i18n "posts.category" }}
+ {{- end -}}
+ </th>
+ <td itemprop="articleSection">
+ {{ partial "posts/categories.html" . }}
</td>
</tr>
- </tbody>
- </table>
-</div>
+ {{ end }}
+ <tr>
+ <th scope="row">{{ i18n "posts.share" }}</th>
+ <td>
+ {{ partial "commons/share.html" }}
+ </td>
+ </tr>
+ </tbody>
+</table>
diff --git a/layouts/partials/programs/document-nav.html b/layouts/partials/programs/document-nav.html
deleted file mode 100644
index 135c4666..00000000
--- a/layouts/partials/programs/document-nav.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="document-nav">
- <div>
- {{- partial "programs/toc.html" . -}}
- </div>
-</div>
diff --git a/layouts/partials/programs/index.html b/layouts/partials/programs/index.html
deleted file mode 100644
index c431afc0..00000000
--- a/layouts/partials/programs/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="container">
- {{ partial "programs/image.html" .Params.image }}
- {{ partial "programs/chapo.html" .Params.description_short }}
-</div>
-{{ partial "blocks/list.html" . }}
-<div class="container">
- {{ partial "diplomas/diplomas-select.html" . }}
- {{ $programs := where .Site.Pages "Section" "programs" }}
- {{ $programs = where $programs "Permalink" "!=" .FirstSection.Permalink }}
- {{ partial "programs/programs-list.html" $programs }}
-</div>
diff --git a/layouts/partials/programs/list.html b/layouts/partials/programs/list.html
new file mode 100644
index 00000000..c45261d7
--- /dev/null
+++ b/layouts/partials/programs/list.html
@@ -0,0 +1,13 @@
+<div class="document-content">
+ <div class="container">
+ {{ partial "programs/image.html" .Params.image }}
+ {{ partial "programs/chapo.html" .Params.description_short }}
+ </div>
+ {{ partial "blocks/list.html" . }}
+ <div class="container">
+ {{ partial "diplomas/diplomas-select.html" . }}
+ {{ $programs := where .Site.Pages "Section" "programs" }}
+ {{ $programs = where $programs "Permalink" "!=" .FirstSection.Permalink }}
+ {{ partial "programs/programs-list.html" $programs }}
+ </div>
+</div>
diff --git a/layouts/partials/programs/single.html b/layouts/partials/programs/single.html
index 027cc43f..fcc508c9 100644
--- a/layouts/partials/programs/single.html
+++ b/layouts/partials/programs/single.html
@@ -1,10 +1,10 @@
-{{ partial "toc/container.html"
- (dict
- "toc" "programs/toc.html"
- "context" .
- )
-}}
<div class="document-content" itemscope itemtype="https://schema.org/EducationalOccupationalCredential">
+ {{ partial "toc/container.html"
+ (dict
+ "toc" "programs/toc.html"
+ "context" .
+ )
+ }}
<meta itemprop="name" content="{{ partial "PrepareHTML" .Title }}">
<meta itemprop="url" content="{{ .Permalink }}">
{{- if .Params.image -}}
diff --git a/layouts/partials/toc/container.html b/layouts/partials/toc/container.html
index 7aecfb94..55a9448f 100644
--- a/layouts/partials/toc/container.html
+++ b/layouts/partials/toc/container.html
@@ -1,10 +1,14 @@
-{{- partial "toc/cta" -}}
+{{- $isTocNeeded := partial "IsTocNeeded" . -}}
-<div class="toc-container" aria-hidden="true">
- <div class="toc-content">
- {{/* TODO : quelle balise pour le titre du toc ? */}}
- <div id="toc-title" class="toc-title">{{ i18n "commons.toc" }}</div>
- {{- partial (printf .toc) . -}}
- <button name="{{ i18n "commons.close" }}">{{ i18n "commons.close" }}</button>
+{{- if $isTocNeeded -}}
+ {{- partial "toc/cta" -}}
+
+ <div class="toc-container" aria-hidden="true">
+ <div class="toc-content">
+ {{/* TODO : quelle balise pour le titre du toc ? */}}
+ <div id="toc-title" class="toc-title">{{ i18n "commons.toc" }}</div>
+ {{- partial (printf .toc) . -}}
+ <button name="{{ i18n "commons.close" }}">{{ i18n "commons.close" }}</button>
+ </div>
</div>
-</div>
\ No newline at end of file
+{{- end -}}
\ No newline at end of file
diff --git a/layouts/persons/list.html b/layouts/persons/list.html
index 543a5047..12aa359f 100644
--- a/layouts/persons/list.html
+++ b/layouts/persons/list.html
@@ -9,15 +9,17 @@
{{ partial "persons/hero.html" . }}
- <div class="container">
- {{ partial "persons/image.html" .Params.image }}
- {{ partial "persons/chapo.html" .Params.description_short }}
- {{- if not $is_organigram_present -}}
- {{ partial "persons/taxonomies.html" . }}
- {{ partial "persons/list.html" . }}
- {{- end -}}
+ <div class="document-content">
+ <div class="container">
+ {{ partial "persons/image.html" .Params.image }}
+ {{ partial "persons/chapo.html" .Params.description_short }}
+ {{- if not $is_organigram_present -}}
+ {{ partial "persons/taxonomies.html" . }}
+ {{ partial "persons/list.html" . }}
+ {{- end -}}
+ </div>
+
+ {{ partial "blocks/list.html" . }}
</div>
- {{ partial "blocks/list.html" . }}
-
{{ end }}
diff --git a/layouts/persons/single.html b/layouts/persons/single.html
index 8c0b89cd..68ab530e 100644
--- a/layouts/persons/single.html
+++ b/layouts/persons/single.html
@@ -16,8 +16,8 @@
{{ partial "persons/hero-single.html" . }}
- <div class="container">
- <div class="document-content" itemscope itemtype="https://schema.org/Person">
+ <div class="document-content container">
+ <div itemscope itemtype="https://schema.org/Person">
<meta itemprop="name" content="{{ partial "PrepareHTML" .Title }}">
<meta itemprop="url" content="{{ .Permalink }}">
{{- if .Params.image -}}
@@ -68,6 +68,5 @@
{{ if $papersForResearcher }}
{{ partial "persons/papers.html" (dict "papers" $papersForResearcher "slug" $slug) }}
{{ end }}
-
</div>
{{ end }}
diff --git a/layouts/posts/list.html b/layouts/posts/list.html
index 428fa21c..7faea74d 100644
--- a/layouts/posts/list.html
+++ b/layouts/posts/list.html
@@ -1,17 +1,19 @@
{{ define "main" }}
{{ partial "posts/hero-list.html" . }}
- {{ partial "commons/list-content.html" . }}
-
- <div class="container">
- {{ partial "posts/image.html" .Params.image }}
- {{ partial "posts/chapo.html" .Params.description_short }}
- </div>
-
- {{ partial "blocks/list.html" . }}
-
- <div class="container">
- {{ partial "posts/posts.html" . }}
- {{ partial "commons/pagination.html" . }}
+ <div class="document-content">
+ {{ partial "commons/list-content.html" . }}
+
+ <div class="container">
+ {{ partial "posts/image.html" .Params.image }}
+ {{ partial "posts/chapo.html" .Params.description_short }}
+ </div>
+
+ {{ partial "blocks/list.html" . }}
+
+ <div class="container">
+ {{ partial "posts/posts.html" . }}
+ {{ partial "commons/pagination.html" . }}
+ </div>
</div>
{{ end }}
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 3766091d..aa864e4e 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -1,7 +1,7 @@
{{ define "main" }}
{{ partial "posts/hero-single.html" . }}
- <section itemscope itemtype="https://schema.org/NewsArticle">
+ <div class="document-content" itemscope itemtype="https://schema.org/NewsArticle">
<meta itemprop="headline" content="{{ partial "PrepareHTML" .Title }}">
<meta itemprop="url" content="{{ .Permalink }}">
{{ if .Date }}<meta itemprop="datePublished" content="{{ .Date.Format "2006-01-02T15:04" }}">{{ end }}
@@ -9,7 +9,7 @@
{{ if .Summary }}<meta itemprop="description" content="{{ partial "PrepareHTML" .Summary }}">{{ end }}
<div class="content-blocks">
- {{ partial "posts/document-nav.html" . }}
+ {{ partial "posts/aside.html" . }}
<div class="blocks blocks-chapo">
<div class="container">
<div class="block-content">
@@ -28,5 +28,5 @@
</div>
</div>
</div>
- </section>
+ </div>
{{ end }}
diff --git a/layouts/programs/list.html b/layouts/programs/list.html
index e511e744..db2c2b6b 100644
--- a/layouts/programs/list.html
+++ b/layouts/programs/list.html
@@ -4,6 +4,6 @@
{{ partial "programs/single.html" . }}
{{ else }}
{{ partial "programs/hero.html" . }}
- {{ partial "programs/index.html" . }}
+ {{ partial "programs/list.html" . }}
{{ end }}
{{ end }}
diff --git a/layouts/researchers/list.html b/layouts/researchers/list.html
index 45063450..3a3d9f11 100644
--- a/layouts/researchers/list.html
+++ b/layouts/researchers/list.html
@@ -2,15 +2,16 @@
{{ partial "persons/hero.html" . }}
- <div class="container">
- {{ partial "persons/image.html" .Params.image }}
- {{ partial "persons/chapo.html" .Params.description_short }}
- </div>
-
-
- {{ partial "blocks/list.html" . }}
-
- <div class="container">
- {{ partial "persons/list-specific.html" . }}
+ <div class="document-content">
+ <div class="container">
+ {{ partial "persons/image.html" .Params.image }}
+ {{ partial "persons/chapo.html" .Params.description_short }}
+ </div>
+
+ {{ partial "blocks/list.html" . }}
+
+ <div class="container">
+ {{ partial "persons/list-specific.html" . }}
+ </div>
</div>
{{ end }}
diff --git a/layouts/researchers/term.html b/layouts/researchers/term.html
index 9f306a87..cff40c27 100644
--- a/layouts/researchers/term.html
+++ b/layouts/researchers/term.html
@@ -4,7 +4,7 @@
"title" .Title
"context" .
) -}}
- <div class="container">
+ <div class="document-content container">
{{ partial "papers/papers.html" . }}
{{ partial "commons/pagination.html" . }}
</div>
diff --git a/layouts/sitemap/list.html b/layouts/sitemap/list.html
index 0f3afcc0..fe90eda7 100644
--- a/layouts/sitemap/list.html
+++ b/layouts/sitemap/list.html
@@ -5,7 +5,7 @@
"image" .Params.image
"context" .
) -}}
- <div class="container">
+ <div class="document-content container">
<div class="content">
{{- partial "sitemap/document-nav" . -}}
<div>
diff --git a/layouts/teachers/list.html b/layouts/teachers/list.html
index 45063450..3a3d9f11 100644
--- a/layouts/teachers/list.html
+++ b/layouts/teachers/list.html
@@ -2,15 +2,16 @@
{{ partial "persons/hero.html" . }}
- <div class="container">
- {{ partial "persons/image.html" .Params.image }}
- {{ partial "persons/chapo.html" .Params.description_short }}
- </div>
-
-
- {{ partial "blocks/list.html" . }}
-
- <div class="container">
- {{ partial "persons/list-specific.html" . }}
+ <div class="document-content">
+ <div class="container">
+ {{ partial "persons/image.html" .Params.image }}
+ {{ partial "persons/chapo.html" .Params.description_short }}
+ </div>
+
+ {{ partial "blocks/list.html" . }}
+
+ <div class="container">
+ {{ partial "persons/list-specific.html" . }}
+ </div>
</div>
{{ end }}
diff --git a/layouts/teachers/term.html b/layouts/teachers/term.html
index 0f212cd9..81bbe470 100644
--- a/layouts/teachers/term.html
+++ b/layouts/teachers/term.html
@@ -4,7 +4,7 @@
"title" .Title
"context" .
) -}}
- <div class="container">
+ <div class="document-content container">
{{ partial "programs/programs.html" .Paginator.Pages }}
{{ partial "commons/pagination.html" . }}
</div>
diff --git a/layouts/volumes/list.html b/layouts/volumes/list.html
index e896be83..bd6792cb 100644
--- a/layouts/volumes/list.html
+++ b/layouts/volumes/list.html
@@ -1,9 +1,12 @@
{{ define "main" }}
{{ partial "volumes/hero.html" . }}
- <div class="container">
- {{ partial "volumes/volumes.html" . }}
- {{ partial "commons/pagination.html" . }}
- </div>
- {{ partial "blocks/list.html" . }}
-{{ end }}
+ <div class="document-content">
+ <div class="container">
+ {{ partial "volumes/volumes.html" . }}
+ {{ partial "commons/pagination.html" . }}
+ </div>
+
+ {{ partial "blocks/list.html" . }}
+ </div>
+ {{ end }}
diff --git a/layouts/volumes/term.html b/layouts/volumes/term.html
index dffffc52..e81b3016 100644
--- a/layouts/volumes/term.html
+++ b/layouts/volumes/term.html
@@ -1,24 +1,23 @@
{{ define "main" }}
{{ partial "volumes/hero.html" . }}
-<div class="document-content" itemscope itemtype="https://schema.org/PublicationVolume">
- <meta itemprop="name" content="{{ partial "PrepareHTML" .Title }}">
- {{- if .Params.image -}}
- {{- $image := partial "GetMedia" .Params.image.id -}}
- {{- if $image -}}
- {{- $url := $image.url -}}
- <meta itemprop="image" content="{{ $url }}">
+ <div class="document-content" itemscope itemtype="https://schema.org/PublicationVolume">
+ <meta itemprop="name" content="{{ partial "PrepareHTML" .Title }}">
+ {{- if .Params.image -}}
+ {{- $image := partial "GetMedia" .Params.image.id -}}
+ {{- if $image -}}
+ {{- $url := $image.url -}}
+ <meta itemprop="image" content="{{ $url }}">
+ {{- end -}}
{{- end -}}
- {{- end -}}
- <div class="container">
- <div class="content">
- {{ partial "volumes/image.html" . }}
- {{ partial "volumes/description.html" . }}
- {{ partial "volumes/document-aside.html" . }}
- {{ partial "volumes/table-contents.html" . }}
+ <div class="container">
+ <div class="content">
+ {{ partial "volumes/image.html" . }}
+ {{ partial "volumes/description.html" . }}
+ {{ partial "volumes/document-aside.html" . }}
+ {{ partial "volumes/table-contents.html" . }}
+ </div>
</div>
</div>
-</div>
-
{{ end }}
--
GitLab