From 5acb4bfb14483c5ee91e4cd94903a86caf721719 Mon Sep 17 00:00:00 2001
From: sebousan <sebousan@gmail.com>
Date: Thu, 28 Jul 2022 18:20:27 +0200
Subject: [PATCH] diplomas + programs wip
---
assets/sass/_theme/sections/diplomas.sass | 17 +++++++++++
assets/sass/_theme/sections/programs.sass | 30 +++++++++++++++++++-
layouts/diplomas/list.html | 4 ++-
layouts/diplomas/term.html | 2 +-
layouts/partials/diplomas/diplomas.html | 13 +++++++++
layouts/partials/programs/index.html | 26 ++++-------------
layouts/partials/programs/program.html | 2 +-
layouts/partials/programs/programs-list.html | 2 +-
8 files changed, 71 insertions(+), 25 deletions(-)
diff --git a/assets/sass/_theme/sections/diplomas.sass b/assets/sass/_theme/sections/diplomas.sass
index e69de29b..956e6c7b 100644
--- a/assets/sass/_theme/sections/diplomas.sass
+++ b/assets/sass/_theme/sections/diplomas.sass
@@ -0,0 +1,17 @@
+ul.diplomas
+ @include list-reset
+ > li
+ margin-bottom: $spacing3
+ > a
+ @extend .h3
+ .programs
+ li
+ display: block
+ .program
+ div
+ @include media-breakpoint-up(md)
+ display: flex
+ > p
+ width: col(6)
+ .title
+ @extend .h4
diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass
index d05453f7..a0d8dbc9 100644
--- a/assets/sass/_theme/sections/programs.sass
+++ b/assets/sass/_theme/sections/programs.sass
@@ -1,4 +1,4 @@
-// .programs__section
+//.programs__section
// .page-with-blocks
// .hero
// margin-bottom: 3rem
@@ -46,6 +46,34 @@
// margin-top: -2rem
// @include grid(2, lg)
+
+.program
+ @include widget
+
+section.programs
+ @include grid(2, md)
+ @include grid(3, xl)
+
+ol.programs
+ @include list-reset
+ > li
+ border-bottom: 1px solid $main-border-color
+ padding-bottom: $spacing1
+ padding-top: $spacing1
+ > .title
+ @extend .h3
+
+ @include media-breakpoint-up(md)
+ align-items: baseline
+ display: flex
+ > a,
+ > p
+ width: col(6)
+ > .title
+ & + a
+ text-align: right
+
+
.programs__section
.lead
padding-top: $spacing4
diff --git a/layouts/diplomas/list.html b/layouts/diplomas/list.html
index 8115cfd4..66ab3db6 100644
--- a/layouts/diplomas/list.html
+++ b/layouts/diplomas/list.html
@@ -2,12 +2,14 @@
{{ partial "diplomas/hero-list.html" . }}
<div class="container">
- {{ partial "programs/image.html" .Params.image }}
+ {{ partial "diplomas/image.html" .Params.image }}
{{ partial "diplomas/chapo.html" .Params.description_short }}
</div>
{{ partial "blocks/list.html" .Params.blocks }}
<div class="container">
+ {{ .Scratch.Set "show_programs" true }}
{{ partial "diplomas/diplomas.html" . }}
+ {{ .Scratch.Delete "show_programs" }}
</div>
{{ end }}
diff --git a/layouts/diplomas/term.html b/layouts/diplomas/term.html
index 46ca90d8..8d248e7c 100644
--- a/layouts/diplomas/term.html
+++ b/layouts/diplomas/term.html
@@ -3,6 +3,6 @@
{{ partial "blocks/list.html" .Params.blocks }}
<div class="container">
- {{ partial "programs/programs.html" .Pages }}
+ {{ partial "programs/programs-list.html" .Pages }}
</div>
{{ end }}
diff --git a/layouts/partials/diplomas/diplomas.html b/layouts/partials/diplomas/diplomas.html
index 274aebe0..e4f78898 100644
--- a/layouts/partials/diplomas/diplomas.html
+++ b/layouts/partials/diplomas/diplomas.html
@@ -1,3 +1,7 @@
+{{ $show_programs := false }}
+{{- if .Scratch.Get "show_programs" }}
+ {{ $show_programs = true }}
+{{ end -}}
<ul class="diplomas">
{{ range .Paginator.Pages }}
<li>
@@ -7,6 +11,15 @@
({{ partial "PrepareHTML" . }})
{{ end }}
</a>
+ {{- if $show_programs }}
+ <ol class="programs">
+ {{- range .Pages -}}
+ <li>
+ {{ partial "programs/program.html" . }}
+ </li>
+ {{- end -}}
+ </ol>
+ {{ end -}}
</li>
{{ end }}
</ul>
diff --git a/layouts/partials/programs/index.html b/layouts/partials/programs/index.html
index 2f20bd90..fa6ae824 100644
--- a/layouts/partials/programs/index.html
+++ b/layouts/partials/programs/index.html
@@ -2,24 +2,10 @@
{{ partial "programs/image.html" .Params.image }}
{{ partial "programs/chapo.html" .Params.description_short }}
</div>
-
{{ partial "blocks/list.html" .Params.blocks }}
-
-{{ $len := (len .Pages) }}
-{{ range $index, $programs := sort .Pages ".Params.position" }}
- <div class="container">
- <div class="programs">
- <div class="highlighted">
- {{ partial "programs/program.html" . }}
- </div>
- {{ range sort .Pages ".Params.position" }}
- <div>
- {{ .Scratch.Set "with_image" true }}
- {{ partial "programs/program.html" . }}
- {{ .Scratch.Delete "with_image" }}
- </div>
- {{ end }}
- </div>
- {{ if ne (add $index 1) $len }}<hr>{{ end }}
- </div>
-{{ end }}
+<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/program.html b/layouts/partials/programs/program.html
index 7a469d39..dc14770f 100644
--- a/layouts/partials/programs/program.html
+++ b/layouts/partials/programs/program.html
@@ -11,7 +11,7 @@
</a>
</p>
{{ if (partial "GetTextFromHTML" .Params.presentation) }}
- {{- partial "PrepareHTML" .Params.presentation -}}
+ <p>{{- partial "PrepareHTML" .Params.presentation -}}</p>
{{ end }}
</div>
{{- if $with_image }}
diff --git a/layouts/partials/programs/programs-list.html b/layouts/partials/programs/programs-list.html
index 478142e4..c718510e 100644
--- a/layouts/partials/programs/programs-list.html
+++ b/layouts/partials/programs/programs-list.html
@@ -3,7 +3,7 @@
{{- range . -}}
<li>
{{- $title := partial "PrepareHTML" .Title -}}
- <a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">
+ <a href="{{ .Permalink }}" class="title" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">
{{- $title -}}
</a>
{{- with .Params.diplomas -}}
--
GitLab