From b2c912fbf2bc87f705d8b4683885fe252a2171d4 Mon Sep 17 00:00:00 2001 From: sebousan <sebousan@gmail.com> Date: Fri, 29 Jul 2022 10:05:11 +0200 Subject: [PATCH] persons wip --- assets/sass/_theme/sections/persons.sass | 24 ++++++++++++++++++- assets/sass/_theme/sections/programs.sass | 1 + layouts/partials/persons/list-specific.html | 15 +++++++----- layouts/partials/persons/list.html | 13 ++++++---- .../partials/persons/persons-specific.html | 11 +++++++++ layouts/partials/persons/persons.html | 9 +++++++ 6 files changed, 61 insertions(+), 12 deletions(-) create mode 100644 layouts/partials/persons/persons-specific.html create mode 100644 layouts/partials/persons/persons.html diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass index d8cc8d7f..47d27967 100644 --- a/assets/sass/_theme/sections/persons.sass +++ b/assets/sass/_theme/sections/persons.sass @@ -25,7 +25,8 @@ margin-bottom: 0 -.persons +section.persons, +div.persons @include grid(1) @include grid(2, md) @include grid(3, lg) @@ -33,6 +34,27 @@ @include grid(5, xxl) +ol.persons + @include list-reset + > li + border-bottom: 1px solid $main-border-color + padding-bottom: $spacing1 + padding-top: $spacing1 + position: relative + p + margin-bottom: 0 + a + @include stretched-link + + @include media-breakpoint-up(md) + align-items: baseline + display: flex + > p + width: col(5) + & + p + width: col(7) + + .avatar @include aspect-ratio(50, 50, 'img') background-color: $persons-avatar-background-color diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass index a0d8dbc9..343b0a1d 100644 --- a/assets/sass/_theme/sections/programs.sass +++ b/assets/sass/_theme/sections/programs.sass @@ -50,6 +50,7 @@ .program @include widget +div.programs, section.programs @include grid(2, md) @include grid(3, xl) diff --git a/layouts/partials/persons/list-specific.html b/layouts/partials/persons/list-specific.html index 6bcba593..65a16fe4 100644 --- a/layouts/partials/persons/list-specific.html +++ b/layouts/partials/persons/list-specific.html @@ -1,11 +1,14 @@ -<div class="persons"> +<ol class="persons"> {{ range (.Paginate (.Pages.ByParam "last_name")).Pages }} {{ $person := site.GetPage (printf "/persons/%s" .Slug) }} - {{ if $person }} - <div> - {{ partial "persons/person.html" $person }} - </div> + {{ with $person }} + <li> + <p class="name"><a href="{{ .Permalink }}">{{ partial "PrepareHTML" .Title }}</a></p> + {{- if partial "GetTextFromHTML" .Params.description_short }} + <p>{{- partial "PrepareHTML" .Params.description_short -}}</p> + {{ end -}} + </li> {{ end }} {{ end }} -</div> +</ol> {{ partial "commons/pagination.html" . }} diff --git a/layouts/partials/persons/list.html b/layouts/partials/persons/list.html index 6ac115b1..967bcc45 100644 --- a/layouts/partials/persons/list.html +++ b/layouts/partials/persons/list.html @@ -1,9 +1,12 @@ -<div class="persons"> +<ol class="persons"> {{ $persons := .Pages.ByParam "last_name" }} {{ range (.Paginate $persons).Pages }} - <div> - {{ partial "persons/person.html" . }} - </div> + <li> + <p class="name"><a href="{{ .Permalink }}">{{ partial "PrepareHTML" .Title }}</a></p> + {{- if partial "GetTextFromHTML" .Params.description_short }} + <p>{{- partial "PrepareHTML" .Params.description_short -}}</p> + {{ end -}} + </li> {{ end }} -</div> +</ol> {{ partial "commons/pagination.html" . }} diff --git a/layouts/partials/persons/persons-specific.html b/layouts/partials/persons/persons-specific.html new file mode 100644 index 00000000..6bcba593 --- /dev/null +++ b/layouts/partials/persons/persons-specific.html @@ -0,0 +1,11 @@ +<div class="persons"> + {{ range (.Paginate (.Pages.ByParam "last_name")).Pages }} + {{ $person := site.GetPage (printf "/persons/%s" .Slug) }} + {{ if $person }} + <div> + {{ partial "persons/person.html" $person }} + </div> + {{ end }} + {{ end }} +</div> +{{ partial "commons/pagination.html" . }} diff --git a/layouts/partials/persons/persons.html b/layouts/partials/persons/persons.html new file mode 100644 index 00000000..6ac115b1 --- /dev/null +++ b/layouts/partials/persons/persons.html @@ -0,0 +1,9 @@ +<div class="persons"> + {{ $persons := .Pages.ByParam "last_name" }} + {{ range (.Paginate $persons).Pages }} + <div> + {{ partial "persons/person.html" . }} + </div> + {{ end }} +</div> +{{ partial "commons/pagination.html" . }} -- GitLab