diff --git a/assets/js/theme/design-system/Lightbox.js b/assets/js/theme/design-system/Lightbox.js index bb7e9caf1..f387328f2 100644 --- a/assets/js/theme/design-system/Lightbox.js +++ b/assets/js/theme/design-system/Lightbox.js @@ -1,5 +1,5 @@ import './TouchControl'; -import { setButtonEnability, setDefaultAltToImages } from '../utils/a11y'; +import { a11yClick, setButtonEnability, setDefaultAltToImages } from '../utils/a11y'; /* eslint-disable no-underscore-dangle */ window.osuny = window.osuny || {}; @@ -35,12 +35,12 @@ window.osuny.Lightbox.prototype._setup = function () { this.bindButtons(); }; -window.osuny.Lightbox.prototype.bindButtons = function (key) { +window.osuny.Lightbox.prototype.bindButtons = function () { this.buttons = document.querySelectorAll('[data-lightbox]'); setDefaultAltToImages(this.buttons); this.buttons.forEach(function (button, index) { - button.addEventListener('click', this.open.bind(this, button)); + a11yClick(button, this.open.bind(this, button)); this._setAriaDescribed(button, index); }.bind(this)); }; diff --git a/assets/js/theme/design-system/components/Maps.js b/assets/js/theme/design-system/components/Maps.js index e21582b2b..dc9c7cde6 100644 --- a/assets/js/theme/design-system/components/Maps.js +++ b/assets/js/theme/design-system/components/Maps.js @@ -96,7 +96,7 @@ window.osuny.Map.prototype.filterMarkers = function (filters) { window.osuny.Map.prototype.setMarkers = function () { this.setMarkerIcon(); - this.elements = Array.prototype.slice.call(this.element.children); + this.elements = this.element.querySelectorAll('[data-longitude]'); this.elements.forEach(this.createMarker.bind(this)); if (this.popups.length === 1) { diff --git a/assets/sass/_theme/_utils.sass b/assets/sass/_theme/_utils.sass index 2e008b638..8dc56323a 100644 --- a/assets/sass/_theme/_utils.sass +++ b/assets/sass/_theme/_utils.sass @@ -1,4 +1,5 @@ @import utils/a11y +@import utils/browsers @import utils/fonts @import utils/lists @import utils/colors diff --git a/assets/sass/_theme/blocks/base.sass b/assets/sass/_theme/blocks/base.sass index f548a67e5..607b3ae3f 100644 --- a/assets/sass/_theme/blocks/base.sass +++ b/assets/sass/_theme/blocks/base.sass @@ -10,6 +10,8 @@ margin-top: $spacing-3 .block-title.sr-only + .description margin-top: 0 + .block-content > ul + @include list-reset @include in-page-without-sidebar .top .description @@ -19,13 +21,11 @@ margin-top: var(--heading-margin-bottom) // Specific -$backgrounded_blocks: ".block-call_to_action--accent_background, .block-chapter--accent_background, .block-chapter--alt_background, .block-timeline--horizontal, .block-pages--cards" +$backgrounded_blocks: ".block-call_to_action--accent_background, .block-timeline--horizontal, .block-pages--cards" main .blocks - .block:first-child + .block:first-child:where(#{$backgrounded_blocks}) margin-top: 0 - &:not(#{$backgrounded_blocks}) - padding-top: 0 .block:last-child &:is(#{$backgrounded_blocks}) margin-bottom: 0 diff --git a/assets/sass/_theme/blocks/chapter.sass b/assets/sass/_theme/blocks/chapter.sass index d274d8922..e1ff56f28 100644 --- a/assets/sass/_theme/blocks/chapter.sass +++ b/assets/sass/_theme/blocks/chapter.sass @@ -67,11 +67,13 @@ background: $block-chapter-layout-accent-background @include in-page-without-sidebar - &--alt_background, + &--alt_background, &--accent_background padding-top: var(--grid-gutter) padding-bottom: var(--grid-gutter) margin-bottom: 0 + &:first-child + margin-top: 0 .chapter flex-direction: row justify-content: space-between diff --git a/assets/sass/_theme/blocks/exhibitions.sass b/assets/sass/_theme/blocks/exhibitions.sass new file mode 100644 index 000000000..185376af1 --- /dev/null +++ b/assets/sass/_theme/blocks/exhibitions.sass @@ -0,0 +1,5 @@ +.block-exhibitions + .top + .block-title a + @include icon(arrow-right-line, after, true) + @include hover-translate-icon(after) \ No newline at end of file diff --git a/assets/sass/_theme/blocks/image.sass b/assets/sass/_theme/blocks/image.sass index f716de116..e7e803215 100644 --- a/assets/sass/_theme/blocks/image.sass +++ b/assets/sass/_theme/blocks/image.sass @@ -41,7 +41,7 @@ display: flex align-items: flex-end justify-content: flex-end - > button + > button, > [role="button"] width: columns(8) margin-left: var(--grid-gutter) display: block diff --git a/assets/sass/_theme/blocks/organizations.sass b/assets/sass/_theme/blocks/organizations.sass index 601a5e34f..515f9dac5 100644 --- a/assets/sass/_theme/blocks/organizations.sass +++ b/assets/sass/_theme/blocks/organizations.sass @@ -1,10 +1,4 @@ .block-organizations - .organization - .organization-title - a[target="_blank"] - @include stretched-link(before) - @include icon(links-line, after, true) - position: relative &--carousel @include layout-carousel .slider @@ -75,41 +69,13 @@ z-index: 2 a.leaflet-popup-close-button color: var(--color-text) - &--large - @include layout-large - .organization - .organization-content - display: flex - flex-direction: column - .organization-title - @include h2 - a - @include link - .organization-summary - flex: 1 - + .organization - margin-top: $spacing-4 - @include media-breakpoint-up(md) - margin-top: $spacing-3 - .media--logo - padding: $spacing-5 - @include media-breakpoint-up(md) - padding: $spacing-6 - @include in-page-with-or-without-sidebar - .media - margin-bottom: 0 + @include media-breakpoint-down(md) details ul li + li margin-top: $spacing-3 - @include in-page-with-sidebar - .grid - @include grid(4, lg) - &.with-summaries - @include grid(1, lg) - @include grid(2, xl) @include in-page-without-sidebar .top .description diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass index 4a91902dc..eb4dcb1f4 100644 --- a/assets/sass/_theme/blocks/pages.sass +++ b/assets/sass/_theme/blocks/pages.sass @@ -1,6 +1,8 @@ .block-pages .top a + @include icon(arrow-right-line, after, true) + @include hover-translate-icon text-decoration: none @include media-breakpoint-up(desktop) @@ -11,122 +13,75 @@ .top .block-title @include h5 - .description - @include h2 + .description + @include h2 @include in-page-without-sidebar .top @include top-flex - a - @include icon(arrow-right-line, after, true) - @include hover-translate-icon .description @include h2 - &--grid - .grid - .page-title a - @include icon(arrow-right-line, after, true) - @include hover-translate-icon(after) - &--cards background-color: $block-pages-card-background padding-bottom: var(--grid-gutter) padding-top: var(--grid-gutter) + .pages + @include layout-cards($block-pages-card-page-background, $block-pages-card-page-background-hover, $block-pages-card-page-color, $block-pages-card-page-color-hover) *:not(.heading) + & margin-top: 0 .blocks &:last-of-type margin-bottom: 0 - .cards - @include grid(2, desktop) - @include in-page-without-sidebar - @include grid(3) - // TODO: move this // .block-gallery + &, .block-pages--cards + & margin-top: 0 - // ----------------- // - .card - @include arrow-right-hover(".more") - padding: $spacing-3 - background-color: $block-pages-card-page-background - transition: background $background-duration, color $color-duration - display: flex - flex: auto - flex-direction: column - min-height: 320px - &, - a - color: $block-pages-card-page-color - .media - margin-bottom: 0 - margin-left: -$spacing-3 - margin-right: -$spacing-3 - margin-top: -$spacing-3 - img - min-width: 100% - .page-categories - a - @include link(var(--color-accent)) - .more - @include link($block-pages-card-page-color) - position: relative - margin-top: auto - padding-top: $spacing-3 - a, - .more - transition: text-decoration-color $color-duration ease, color $color-duration ease - &:hover - background-color: $block-pages-card-page-background-hover - &, a, .more - color: $block-pages-card-page-color-hover - .page-categories - a - @include link($block-pages-card-page-color-hover) - .more - text-decoration-color: $block-pages-card-page-color-hover + &--list - .list - @include list-reset - .page + .page-title + a + @include icon(arrow-right-line, after, true) + @include hover-translate-icon(after) + @extend %underline-on-hover + + .list.title-only + li > a @include icon(arrow-right-line, before, true) padding-right: $spacing-2 @include hover-translate-icon(before, 5) @extend %underline-on-hover + + .list:not(.title-only) + @include layout-list + margin-top: var(--grid-gutter) + > li + border-bottom: none + padding: 0 + margin-bottom: var(--grid-gutter) + .page-title + @include h3 + + @include media-breakpoint-down(desktop) article - .page-title - @include h3 - a - @include icon(arrow-right-line, after, true) - @include hover-translate-icon(after) - @extend %underline-on-hover - @include media-breakpoint-down(desktop) - .top - margin-bottom: $spacing-2 - .list - margin-top: $spacing-3 - .page + .page - margin-top: $spacing-2 - @include media-breakpoint-up(desktop) - .list:not(.title-only) - .page + .page - margin-top: var(--grid-gutter) + gap: $spacing-1 + .media + width: auto + + @include media-breakpoint-up(desktop) article - gap: var(--grid-gutter) flex-direction: row .media flex-shrink: 0 margin-bottom: 0 + @include in-page-with-sidebar .block-content .top margin-bottom: $spacing-3 .list.title-only @include grid(2, desktop, $spacing-2) - display: flex li - margin-top: 0 + line-height: 1 a @include meta article @@ -144,12 +99,16 @@ width: auto p @include h2 - article + article.page .media width: columns(2) .page-content width: columns(4) + &:not(.with-description) + .pages + > li + li + margin-top: 0 .list.title-only @include grid(4, desktop, $spacing-1) grid-column: 1 / 13 @@ -157,8 +116,7 @@ margin-top: 0 .list:not(.title-only) @include grid(2, desktop) - .page + .page - margin-top: 0 + &.with-description .block-content @include grid(12, desktop, $spacing-4) @@ -179,74 +137,27 @@ grid-column: 9 / 13 grid-row: 2 display: block - .page + .page - // margin-top: $spacing-2 - article - margin-top: $spacing-5 + margin-top: 0 + .pages:where:not(.title-only) + > li + li + margin-top: var(--grid-gutter) + &.with-images .top grid-column: 1 / 7 - .top + .list - grid-column: 7 / 13 + + .list + grid-column: 7 / 13 &--alternate - .alternate - @include alternate - article - position: relative - display: flex - flex-direction: column - .page-title a - text-decoration: none - &:hover .more::after - padding-left: pxToRem(10) - .media - margin-bottom: $spacing-2 - order: -1 - img - aspect-ratio: unset - @include media-breakpoint-down(desktop) - article + article - margin-top: $spacing-4 - @include in-page-without-sidebar - .top - .description - @include body-text - + .pages + @include layout-alternate + .page-title + + p + margin-top: $spacing-1 &--large - .page - position: relative - + .page - margin-top: $spacing-5 - &:hover .more:after - transform: translateX(#{pxToRem(10)}) - .media - img - aspect-ratio: 1 - @include media-breakpoint-up(desktop) - .page - flex-direction: row - gap: var(--grid-gutter) - - @include in-page-with-sidebar + .pages + @include layout-large .page - &-title - @include h2 - margin-bottom: space(4) - &-content - flex: 1 - .media - flex: 1 - @include in-page-without-sidebar - .top - .description - @include body-text - .page - align-items: center - &-title - @include lead - margin-bottom: space(4) - &-content - width: columns(5) .media - width: columns(6) + img + aspect-ratio: 1 diff --git a/assets/sass/_theme/blocks/persons.sass b/assets/sass/_theme/blocks/persons.sass index 2f604e48b..dd4d11971 100644 --- a/assets/sass/_theme/blocks/persons.sass +++ b/assets/sass/_theme/blocks/persons.sass @@ -13,12 +13,6 @@ @include in-page-without-sidebar .top .description max-width: columns(8) - &.block-with-long-text - &:not(.block-persons--large) - .persons - @include grid(2) - article - @include person-avatar-end @include in-page-with-sidebar article flex-direction: row @@ -49,22 +43,20 @@ .description margin-top: $spacing-3 @include in-page-without-sidebar + &.block-with-long-text + .persons + @include grid(2) + article + @include person-avatar-end .person text-align: center .contacts-details a, address text-align: center &--large + .persons + @include layout-large .person - @include small-arrow-right-hover('.more') - display: flex - flex-direction: column - + .person - margin-top: $spacing-4 - @include media-breakpoint-up(md) - margin-top: $spacing-6 - .description - flex: 1 .person-name @include lead + div @@ -86,7 +78,6 @@ li > span width: offset(1) @include in-page-without-sidebar - align-items: center .avatar width: columns(4) .contacts-details @@ -94,10 +85,6 @@ @include grid(2, false, $spacing-2) li + li margin-top: 0 - @include in-page-with-or-without-sidebar - flex-direction: row - gap: var(--grid-gutter) - text-align: left @include media-breakpoint-down(md) &-name, &-role @@ -108,11 +95,11 @@ &--list .persons-list - @include list-reset > li padding-bottom: $spacing-3 padding-top: $spacing-3 .person-name + @include body-text a @extend %underline-on-hover .person-role @@ -121,39 +108,61 @@ + li border-top: var(--border-width) solid var(--color-border) @include media-breakpoint-up(desktop) + article + align-items: baseline + flex-direction: row .contacts-details margin-top: 0 a, address - width: columns(4) + width: columns(3) text-align: left li align-items: baseline display: flex li > span width: offset(1) - > li + @include in-page-without-sidebar + .description align-items: baseline display: flex gap: var(--grid-gutter) - > div:first-child - align-items: baseline - display: flex - width: columns(8) - gap: var(--grid-gutter) - > * + width: offset(11) + .person-name + width: offset(3) + .person-role + width: columns(3) + .contacts-details + margin-top: 0 + width: columns(5) + a, address width: columns(4) - @include in-page-without-sidebar - > li - > div:first-child - width: columns(7) - .contacts-details - width: columns(5) @include in-page-with-sidebar + .description + @include grid(2) + row-gap: space() + width: offset(7) + .person-name + grid-row: 1 + width: offset(3) + + * + width: columns(4) &.with-contacts - > li - > div:first-child - display: block - width: columns(3) - .contacts-details - width: columns(5) - + .person-role + order: 3 + grid-row: span 2 + width: offset(3) + .contacts-details + grid-row: 1 / span 2 + @include in-page-with-or-without-sidebar + &:where(:not(.without-photo)) + .persons-list + article + gap: unset + .description + align-items: baseline + flex: unset + margin-left: auto + .avatar + width: space(10) + min-width: space(10) + margin-right: $spacing-2 diff --git a/assets/sass/_theme/blocks/posts.sass b/assets/sass/_theme/blocks/posts.sass index 1118c4b0a..17dc993a2 100644 --- a/assets/sass/_theme/blocks/posts.sass +++ b/assets/sass/_theme/blocks/posts.sass @@ -5,225 +5,23 @@ @include icon(arrow-right-line, after, true) @include hover-translate-icon text-decoration: none - .posts - @include grid(1) - @include grid($block-posts-grid-columns, desktop) - article - @include author-and-time-side-to-side - .post-title - a - @include stretched-link - text-decoration: none - .post-content - > * + * - margin-top: $spacing-2 - .media - margin-top: 0 - - &--grid - @include media-breakpoint-down(desktop) - article + article - margin-top: $spacing-5 - @include in-page-with-sidebar - .grid - @include grid(2) - @include in-page-without-sidebar - .grid - @include grid($block-posts-grid-columns) - .media picture img - width: 100% - &--large - .post - @include small-arrow-right-hover('.more') - // Masquer le point entre l'auteur et la date (mixin author-and-time-side-to-side) - .post-author p, - .post-reading-time - &::before - display: none - - // Permet d'aligner correctement les différents line-height des différents composants du post meta - .post-meta - display: block - > * - margin-right: $spacing-3 - time - vertical-align: baseline - .post-author - &, p - display: inline - // Désactiver le ratio forcé de la configuration $article-media-aspect-ratio - .media - &, img - aspect-ratio: auto - @include media-breakpoint-down(desktop) - .post - + .post - margin-top: $spacing-4 - [itemprop="abstract"] - margin-top: 0 - .post-author - margin-right: 0 - + time - display: inline - &::before - content: ' • ' - .post-categories - li - margin-right: space(2) - @include media-breakpoint-up(desktop) - .large - .post - flex-direction: row - gap: var(--grid-gutter) - + .post - margin-top: $spacing-4 - .post-title, - .post-subtitle - @include h2 - [itemprop="abstract"] - margin-top: $spacing-3 - &-categories - display: inline - * - display: inline-block - li - margin-right: $spacing-2 - a - display: inline - - @include in-page-with-sidebar - .large - .post - @include media-breakpoint-down(xl) - flex-direction: column - gap: unset - [itemprop="abstract"] - margin-top: $spacing-2 - @include media-breakpoint-up(xl) - .media, - .post-content - width: columns(4) - @include media-breakpoint-up(xl) - &.without-images - .post - .post-content - width: columns(8) - @include in-page-without-sidebar - .large - .post - gap: var(--grid-gutter) - .media - width: columns(6) - .post-content - width: columns(5) - .post-title, - .post-subtitle - @include lead - &.without-images - .post - @include media-breakpoint-up(xl) - margin-left: offset(4) - .post-content - width: columns(6) - @include media-breakpoint-down(xl) - .post-content - width: columns(8) - &--list - article - &:where(:not(:last-child)) - border-bottom: var(--border-width) solid var(--color-border) - .media - background: none - margin: 0 - &, img - aspect-ratio: auto - - @include media-breakpoint-down(desktop) - article - position: relative - padding-bottom: $spacing-3 - + article - margin-top: $spacing-3 - .post-content - display: flex - flex-direction: column - padding-top: $spacing-2 - .post-title - margin-bottom: 0 - .post-categories - margin-bottom: 0 - [itemprop="abstract"] - margin-top: $spacing-1 - .media - order: -1 - max-width: 33% - - @include media-breakpoint-up(desktop) - article - display: flex - flex-direction: row - - @include in-page-with-sidebar - article - padding-bottom: $spacing-3 - gap: var(--grid-gutter) // gap plutôt que marge pour l'affichage avec ou sans image - + article - margin-top: $spacing-3 - .media - width: columns(2) - .post-content - width: columns(6) - - @include in-page-without-sidebar - article - gap: var(--grid-gutter) - padding-bottom: $spacing-5 - position: relative - .media - width: columns(3) - .post-content - display: flex - flex-direction: column - width: columns(6) - + article - margin-top: $spacing-5 - .post-meta - margin-top: auto - padding-top: $spacing-3 - time - margin-top: 0.3em - position: absolute - right: 0 - top: 0 - .post-reading-time, - display: block - &::before - content: none - .post-author:first-of-type - [itemprop="name"]::before - content: none &--highlight .highlight-post .media - margin-bottom: $spacing-2 background: none img aspect-ratio: auto .list + @include list-reset margin-top: $spacing-3 border-top: var(--border-width) solid var(--color-border) - article + > li position: relative padding-bottom: $spacing-3 margin-top: $spacing-3 &:where(:not(:last-child)) border-bottom: var(--border-width) solid var(--color-border) - article - > * + * - margin-top: $spacing-2 - .media - margin-top: 0 @include media-breakpoint-down(desktop) .list border-top: var(--border-width) solid var(--color-border) @@ -262,8 +60,9 @@ width: columns(2) > * display: block - .post-author p::before - content: none + &::before + content: none + padding: 0 [itemprop="abstract"] grid-column: 1 / 7 order: 3 @@ -274,51 +73,9 @@ .list border-top: 0 margin-top: 0 - article:first-child + > li:first-child margin-top: 0 - &--alternate .alternate - @include alternate - @include media-breakpoint-up(desktop) - &.without-images - .post - margin-top: 0 !important - @include media-breakpoint-down(desktop) - .post - .post-meta - margin-top: $spacing-1 - .media - margin-bottom: $spacing-2 - + .post - margin-top: $spacing-5 - - &--carousel - @include layout-carousel - @include in-page-with-sidebar - .post - .post-title, - .post-subtitle - @include h4 - .slider - .slider-arrows - justify-content: space-between - width: columns(4) - @include media-breakpoint-down(xxxl) - .slider-slide - width: columns(4) - .slider-arrows - width: columns(5) - @include in-page-without-sidebar - .block-content - display: flex - gap: var(--grid-gutter) - .top - flex-shrink: 0 - width: columns(3) - .slider - .slider-arrows - justify-content: space-between - width: columns(9) // Move this part to blocks/categories when categories block is ready .block-posts diff --git a/assets/sass/_theme/configuration/sections.sass b/assets/sass/_theme/configuration/sections.sass index 6ff2349fe..2b363bc26 100644 --- a/assets/sass/_theme/configuration/sections.sass +++ b/assets/sass/_theme/configuration/sections.sass @@ -1,10 +1,9 @@ // Sections -$article-media-aspect-ratio: 2 !default +$article-media-aspect-ratio: 16 / 9 !default // Pages -$page-media-aspect-ratio: 16 / 9 !default +$page-media-aspect-ratio: $article-media-aspect-ratio !default -$post-time-color: var(--color-text-alt) !default // Si layout posts grid (ne concerne pas les blocks posts) $posts-grid-columns: $block-posts-grid-columns !default diff --git a/assets/sass/_theme/design-system/article.sass b/assets/sass/_theme/design-system/article.sass index cf080bda5..943ef633d 100644 --- a/assets/sass/_theme/design-system/article.sass +++ b/assets/sass/_theme/design-system/article.sass @@ -5,7 +5,6 @@ display: flex flex-direction: column .media - @include handle-svg-fit margin-bottom: $spacing-3 order: -1 overflow: hidden @@ -13,18 +12,20 @@ display: none img object-fit: cover - // max-width: max-content width: 100% @if $aspect-ratio aspect-ratio: $aspect-ratio p + time margin-top: $spacing-2 - .post-categories, .project-categories, .job-categories + [class$="-categories"] @include item-categories-list time @include meta color: var(--color-text-alt) display: block + @include media-breakpoint-down(desktop) + .media + margin-bottom: $spacing-2 @mixin article-title @include h3 diff --git a/assets/sass/_theme/design-system/button.sass b/assets/sass/_theme/design-system/button.sass index fbf152c64..6fcf27fae 100644 --- a/assets/sass/_theme/design-system/button.sass +++ b/assets/sass/_theme/design-system/button.sass @@ -14,7 +14,7 @@ @if $icon @include icon($icon, after) -.button, .btn +@mixin button @include button-reset font-family: var(--btn-font-family) font-size: var(--btn-font-size) @@ -42,9 +42,12 @@ border: var(--btn-disabled-border) color: var(--btn-disabled-color) +.button, .btn + @include button + .button--accent, -.button-accent // Legacy - @extend .button +.button-accent + @include button --btn-color: #{$color-background} --btn-background: #{$color-accent} --btn-border: #{$btn-border-width} solid var(--btn-background) @@ -54,7 +57,7 @@ .button--alt, .button-alt // Legacy - @extend .button + @include button --btn-color: #{$color-background} --btn-background: #{$color-text-alt} --btn-border: #{$btn-border-width} solid var(--btn-background) @@ -63,7 +66,7 @@ --btn-hover-border: #{$btn-border-width} solid var(--btn-hover-background) .button--reversed - @extend .button + @include button --btn-color: #{$color-text-alt} --btn-background: #{$color-background} --btn-border: #{$btn-border-width} solid var(--btn-background) diff --git a/assets/sass/_theme/design-system/dropdown.sass b/assets/sass/_theme/design-system/dropdown.sass index 2821356ea..f81828436 100644 --- a/assets/sass/_theme/design-system/dropdown.sass +++ b/assets/sass/_theme/design-system/dropdown.sass @@ -64,9 +64,11 @@ > a color: var(--dropdown-color) display: flex - padding: $spacing-2 var(--grid-gutter) + padding: $spacing-2 text-decoration: none white-space: normal + @include media-breakpoint-down(desktop) + padding: $spacing-2 var(--grid-gutter) @include media-breakpoint-up(desktop) &:hover background-color: var(--dropdown-hover-background) diff --git a/assets/sass/_theme/design-system/hero.sass b/assets/sass/_theme/design-system/hero.sass index 09d24b82e..8ebed73d9 100644 --- a/assets/sass/_theme/design-system/hero.sass +++ b/assets/sass/_theme/design-system/hero.sass @@ -4,13 +4,11 @@ // Fallback color background-color: $hero-background-color color: $hero-color - margin-bottom: $spacing-3 min-height: $hero-height padding-bottom: $spacing-3 padding-top: var(--header-height) position: relative @include media-breakpoint-up(desktop) - margin-bottom: $spacing-5 min-height: $hero-height-desktop padding-bottom: $spacing-5 *:focus-visible @@ -43,7 +41,7 @@ @include lead-hero figure position: relative - img, button + img, button, > [role="button"] width: 100% height: auto @include collapsed-figcaption @@ -52,10 +50,6 @@ padding-top: 0 .content + .breadcrumb-nav margin-top: $spacing-5 - &--no-margin - margin-bottom: 0 - & + .document-content - margin-top: $spacing-5 &--with-image figure position: relative @@ -83,7 +77,7 @@ display: flex flex-direction: column figure - > button + > button, > [role="button"] width: 100% @include media-breakpoint-up(desktop) @@ -112,9 +106,6 @@ width: columns(3) + .breadcrumb-container margin-top: 0 - margin-bottom: var(--grid-gutter) - @include media-breakpoint-down(desktop) - margin-bottom: $spacing-5 // Essential container is used in programs and diplomas .essential-container diff --git a/assets/sass/_theme/design-system/image.sass b/assets/sass/_theme/design-system/image.sass index 2db0d5945..39b21651e 100644 --- a/assets/sass/_theme/design-system/image.sass +++ b/assets/sass/_theme/design-system/image.sass @@ -15,3 +15,6 @@ figcaption &.credit > p:not(.sr-only), .credit > p:not(.sr-only) > span[aria-hidden]:first-child margin-right: $spacing-1 + +.media + @include handle-svg-fit \ No newline at end of file diff --git a/assets/sass/_theme/design-system/layout.sass b/assets/sass/_theme/design-system/layout.sass index 7fc95aa7e..9fd16e738 100644 --- a/assets/sass/_theme/design-system/layout.sass +++ b/assets/sass/_theme/design-system/layout.sass @@ -43,11 +43,6 @@ iframe [id] scroll-margin-top: var(--header-height) -.container - @include container - .hero + & - margin-top: $spacing-5 - .hidden display: none @@ -64,12 +59,22 @@ ol margin-bottom: $spacing-5 margin-top: $spacing-5 -.document-content - .container > .lead - margin-bottom: $spacing-5 + +.container + @include container + .hero + & + margin-top: $spacing-5 + .document-content position: relative + .container > .lead + margin-bottom: $spacing-5 + > div:not(.blocks, .toc-container, .breadcrumb-container, .agenda-exhibitions) + margin-top: var(--grid-gutter) + > .blocks + .block:first-child + margin-top: var(--grid-gutter) @include in-page-with-sidebar .heading h2, .block .block-content padding-left: offset(4) diff --git a/assets/sass/_theme/design-system/layouts/cards.sass b/assets/sass/_theme/design-system/layouts/cards.sass index ed876369a..a34907075 100644 --- a/assets/sass/_theme/design-system/layouts/cards.sass +++ b/assets/sass/_theme/design-system/layouts/cards.sass @@ -1,42 +1,47 @@ -@mixin layout-cards +@mixin layout-cards($background: $layout-cards-item-background, $background-hover: $layout-cards-item-background-hover, $color: $layout-cards-item-color, $color-hover: $layout-cards-item-color-hover, $aspect-ratio: $article-media-aspect-ratio) @include list-reset article - @include article + @include article($aspect-ratio) @include layout-item - background: $layout-cards-item-background - color: $layout-cards-item-color + @include arrow-right-hover(".more") + background: $background + color: $color padding: $spacing-3 position: relative transition: background $background-duration, color $background-duration - @include arrow-right-hover(".more") - height: 100% [class$="-title"] @include h3 - @include media-breakpoint-up(desktop) - height: 100% + [class$="-content"] + display: flex + flex-direction: column + flex: 1 .media + @include handle-svg-fit margin-left: -$spacing-3 margin-right: -$spacing-3 margin-top: -$spacing-3 img min-width: 100% .more - @include link($layout-cards-item-color) - margin-top: $spacing-4 + @include link($color) + padding-top: $spacing-4 + margin-top: auto a, p transition: text-decoration-color .3s ease, color .3s ease &:hover - background-color: $layout-cards-item-background-hover + background-color: $background-hover &, a, p - color: $layout-cards-item-color-hover - .more - text-decoration-color: $layout-cards-item-color-hover + color: $color-hover + .more, [class$="-categories"] a + @include link($color-hover) @include media-breakpoint-down(desktop) > li + li margin-top: $spacing-3 @include media-breakpoint-up(desktop) align-items: stretch min-height: 320px + article + height: 100% @include in-page-with-sidebar @include grid(2) @include in-page-without-sidebar diff --git a/assets/sass/_theme/design-system/layouts/grid.sass b/assets/sass/_theme/design-system/layouts/grid.sass index 2bcfbf9cb..72bd25b32 100644 --- a/assets/sass/_theme/design-system/layouts/grid.sass +++ b/assets/sass/_theme/design-system/layouts/grid.sass @@ -10,7 +10,6 @@ [class$="-title"] a @include icon(arrow-right-line, after, true) - font-size: 0.8em @include hover-translate-icon(after) @include media-breakpoint-down(desktop) > li + li diff --git a/assets/sass/_theme/design-system/layouts/large.sass b/assets/sass/_theme/design-system/layouts/large.sass index 08afaec31..fb8e8f6c8 100644 --- a/assets/sass/_theme/design-system/layouts/large.sass +++ b/assets/sass/_theme/design-system/layouts/large.sass @@ -15,6 +15,8 @@ @include media-breakpoint-up(desktop) flex-direction: row gap: var(--grid-gutter) + .media + margin-bottom: 0 @include in-page-with-sidebar article [class$="-content"] @@ -23,6 +25,7 @@ width: columns(4) @include in-page-without-sidebar article + align-items: center [class$="-title"] @include lead [class$="-content"] diff --git a/assets/sass/_theme/design-system/layouts/list.sass b/assets/sass/_theme/design-system/layouts/list.sass index 9df05121a..048fa00d5 100644 --- a/assets/sass/_theme/design-system/layouts/list.sass +++ b/assets/sass/_theme/design-system/layouts/list.sass @@ -12,12 +12,16 @@ flex-direction: row .media order: -1 + [class$="-categories"] + @include item-categories-list + @include media-breakpoint-down(desktop) article flex-direction: column gap: var(--grid-gutter) .media width: 33.33333% + @include in-page-with-sidebar article display: flex @@ -28,8 +32,11 @@ [class$="-title"], [class$="-subtitle"] @include h4 + [class$="-categories"] + @include item-categories-list .media width: columns(2) + @include in-page-without-sidebar article display: flex diff --git a/assets/sass/_theme/design-system/search.sass b/assets/sass/_theme/design-system/search.sass index 0244548ae..17e783755 100644 --- a/assets/sass/_theme/design-system/search.sass +++ b/assets/sass/_theme/design-system/search.sass @@ -180,7 +180,7 @@ line-height: inherit &--primary, &--upper-menu align-items: baseline - color: $header-color + color: inherit @if not $search-button-header-text span @extend .sr-only diff --git a/assets/sass/_theme/design-system/taxonomies.sass b/assets/sass/_theme/design-system/taxonomies.sass index f330931c1..71475844c 100644 --- a/assets/sass/_theme/design-system/taxonomies.sass +++ b/assets/sass/_theme/design-system/taxonomies.sass @@ -113,7 +113,8 @@ .document-content .taxonomies-container - margin-bottom: $spacing-5 + margin-top: var(--block-space-y) + margin-bottom: var(--block-space-y) .taxonomies-single &.with-label @include grid(3, desktop, $spacing-3) diff --git a/assets/sass/_theme/hugo-osuny.sass b/assets/sass/_theme/hugo-osuny.sass index 061ec75b8..05ee4d83d 100644 --- a/assets/sass/_theme/hugo-osuny.sass +++ b/assets/sass/_theme/hugo-osuny.sass @@ -63,6 +63,7 @@ @import blocks/contact @import blocks/definitions @import blocks/embed +@import blocks/exhibitions @import blocks/features @import blocks/files @import blocks/gallery diff --git a/assets/sass/_theme/sections/events/item.sass b/assets/sass/_theme/sections/events/item.sass index 7cf9a9301..8ff346f28 100644 --- a/assets/sass/_theme/sections/events/item.sass +++ b/assets/sass/_theme/sections/events/item.sass @@ -11,16 +11,15 @@ @include item-categories-list margin-bottom: 0 column-gap: $spacing-1 - li:not(:last-child) - a::after - content: ', ' + + .event-description + margin-top: $spacing-2 &-schedule p + p margin-top: 0 &-dates span + span &::before - content: ' — ' + content: ' • ' &-time @include meta span diff --git a/assets/sass/_theme/sections/events/layouts.sass b/assets/sass/_theme/sections/events/layouts.sass index 4f3b4a9a9..981ca44dc 100644 --- a/assets/sass/_theme/sections/events/layouts.sass +++ b/assets/sass/_theme/sections/events/layouts.sass @@ -1,13 +1,15 @@ .events &--list - .event - display: flex - flex-direction: column + > li margin-bottom: $spacing-3 padding-bottom: $spacing-3 - position: relative &:where(:not(:last-child)) border-bottom: var(--border-width) solid var(--color-border) + + .event + display: flex + flex-direction: column + position: relative &-title @include h3 &-schedule @@ -106,59 +108,25 @@ object-fit: cover width: 100% @include media-breakpoint-down(md) - .event - + .event - margin-top: $spacing-4 + > li + li + margin-top: $spacing-4 @include in-page-without-sidebar @include grid(3, desktop) &--large + @include layout-large .event - display: flex - flex-direction: row - position: relative - gap: var(--grid-gutter) - + .event - margin-top: $spacing-5 - &-content - display: flex - flex-direction: column - .event-description - order: 2 - .event-description + .event-categories - margin-bottom: $spacing-2 - &-dates + &-dates @include h4 margin-top: $spacing-2 - &-content - flex: 1 - .event-title, - .event-subtitle, - hgroup - @include h2 - .more - @include icon(arrow-right, after) - margin-top: $spacing-3 - &::after - margin-left: $spacing-1 - .media - order: -1 - img - aspect-ratio: 1 - object-fit: cover - width: 100% - @include media-breakpoint-up(desktop) - + .event - margin-top: var(--grid-gutter) - .media - width: columns(4) - .event-schedule - margin-bottom: $spacing-4 - @include media-breakpoint-down(desktop) - flex-direction: column - .media - margin-left: var(--grid-gutter-negative) - margin-right: var(--grid-gutter-negative) + + .event-time + margin-top: $spacing-1 + .more + margin-top: $spacing-3 + .media img + aspect-ratio: 1 + object-fit: cover + width: 100% @include in-page-without-sidebar align-items: center .event-dates @@ -167,34 +135,35 @@ .event-subtitle, hgroup @include lead - .media - width: columns(6) &:not(.event--with-image) width: columns(5) margin-left: offset(4) + @include media-breakpoint-up(desktop) + .event + .event-schedule + margin-bottom: $spacing-3 + @include media-breakpoint-up(xxl) + margin-bottom: $spacing-4 &--agenda .events-date padding-bottom: $spacing-4 &:where(:not(:first-child)) border-top: var(--border-width) solid var(--color-border) + > ol, + .event-children + @include list-reset .events-date-title @include h3 color: var(--color-text-alt) - padding-top: $spacing-4 transition: $header-duration &:not(:first-child) margin-top: var(--heading-margin-top) - + .event - margin-top: var(--heading-margin-bottom) + padding-top: $spacing-4 .event display: flex flex-direction: column - margin-top: $spacing-3 - padding-top: $spacing-3 position: relative - + .event - border-top: var(--border-width) solid var(--color-border) &-title @include h3 &-schedule @@ -205,6 +174,15 @@ margin-top: $spacing-2 &-hours @include h3 + .events-date + ol > li + margin-top: $spacing-3 + padding-top: $spacing-3 + .events-scheduled > li + li, + .event-children > li + border-top: var(--border-width) solid var(--color-border) + + .events-date + margin-top: var(--heading-margin-bottom) @include media-breakpoint-down(desktop) .events-date // Set spacing top less title padding-top to get exact same space before and after event-date @@ -274,13 +252,11 @@ position: absolute left: 0 top: 0 - margin-top: $spacing-3 time + time @include meta &--child padding-left: offset(1) .event-hours - margin-top: $spacing-3 time + time display: block &::before @@ -293,10 +269,12 @@ bottom: 0 span @include sticky(var(--title-height)) - .event--parent ~ .event--child - margin-left: offset(3) - .media - width: columns(2) - &:where(:not(.event--with-image)) - .event-content - margin-left: offset(2) + .event--parent ~ .event-children + > li + margin-left: offset(3) + .event + .media + width: columns(2) + &:where(:not(.event--with-image)) + .event-content + margin-left: offset(2) diff --git a/assets/sass/_theme/sections/events/section.sass b/assets/sass/_theme/sections/events/section.sass index 714e15ec8..75be57def 100644 --- a/assets/sass/_theme/sections/events/section.sass +++ b/assets/sass/_theme/sections/events/section.sass @@ -1,7 +1,10 @@ +.events + @include list-reset + .events__section, .events_categories__term .agenda-exhibitions - margin-bottom: var(--grid-gutter) background: var(--color-background-alt) + margin-bottom: var(--grid-gutter) padding-top: var(--grid-gutter) padding-bottom: var(--grid-gutter) h2 @@ -48,6 +51,10 @@ @include media-breakpoint-up(desktop) p flex: 1 + @include media-breakpoint-up(desktop) + .events-archives-latest + h2 + * + margin-top: $spacing-4 .events__section-month .events-calendar diff --git a/assets/sass/_theme/sections/exhibitions/item.sass b/assets/sass/_theme/sections/exhibitions/item.sass index 4f9dd80e9..db845ac0d 100644 --- a/assets/sass/_theme/sections/exhibitions/item.sass +++ b/assets/sass/_theme/sections/exhibitions/item.sass @@ -1,2 +1,6 @@ .exhibition - @extend .event \ No newline at end of file + @extend .event + &-dates + @include meta + &-subtitle + color: var(--color-text-alt) \ No newline at end of file diff --git a/assets/sass/_theme/sections/exhibitions/layouts.sass b/assets/sass/_theme/sections/exhibitions/layouts.sass index d4ff8afc6..281f7f975 100644 --- a/assets/sass/_theme/sections/exhibitions/layouts.sass +++ b/assets/sass/_theme/sections/exhibitions/layouts.sass @@ -5,15 +5,18 @@ &--grid @include layout-grid(2) .exhibition - &-title - @include h3 + &-title, &-subtitle @include h3 - color: var(--color-text-alt) &--cards @include layout-cards &--large @include layout-large + .exhibition + &-subtitle + @include h3 + @include in-page-without-sidebar + @include lead &--alternate @include layout-alternate &--agenda diff --git a/assets/sass/_theme/sections/exhibitions/section.sass b/assets/sass/_theme/sections/exhibitions/section.sass index af2ac80c8..87e4463f7 100644 --- a/assets/sass/_theme/sections/exhibitions/section.sass +++ b/assets/sass/_theme/sections/exhibitions/section.sass @@ -4,4 +4,4 @@ @extend .button--small @include icon(archive-line, after, true) display: table - margin: $spacing-5 auto 0 + margin: $spacing-5 auto 0 \ No newline at end of file diff --git a/assets/sass/_theme/sections/locations.sass b/assets/sass/_theme/sections/locations.sass index f23b13e6d..ab6e9146f 100644 --- a/assets/sass/_theme/sections/locations.sass +++ b/assets/sass/_theme/sections/locations.sass @@ -1,4 +1,5 @@ .locations + @include list-reset .location @include small-arrow-right-hover('.more') display: flex @@ -19,22 +20,17 @@ img aspect-ratio: 3/2 object-fit: cover - @include media-breakpoint-down(desktop) - &-description - margin-top: $spacing-1 - + .location - margin-top: $spacing-4 + @include media-breakpoint-down(desktop) + .location-description + margin-top: $spacing-1 + > li + li + margin-top: $spacing-4 &--list @include media-breakpoint-up(desktop) .location flex-direction: row-reverse gap: var(--grid-gutter) - &:where(:not(:last-child)) - border-bottom: var(--border-width) solid var(--color-border) - padding-bottom: $spacing-3 - + .location - margin-top: $spacing-3 &-content flex: 1 @include in-page-with-sidebar @@ -63,6 +59,12 @@ justify-content: space-between .media width: columns(4) + > li + &:where(:not(:last-child)) + border-bottom: var(--border-width) solid var(--color-border) + padding-bottom: $spacing-3 + + li + margin-top: $spacing-3 &--grid @include in-page-with-sidebar @@ -108,6 +110,7 @@ @extend .sr-only .locations-map .map + @include list-reset height: 300px z-index: 1 @include media-breakpoint-up(desktop) diff --git a/assets/sass/_theme/sections/organizations.sass b/assets/sass/_theme/sections/organizations.sass index b6cada059..af69c8ed1 100644 --- a/assets/sass/_theme/sections/organizations.sass +++ b/assets/sass/_theme/sections/organizations.sass @@ -1,7 +1,4 @@ .organization - display: flex - flex-direction: column - position: relative &-title a @include stretched-link(before) @@ -11,7 +8,6 @@ .organization-title @include meta .media - @include handle-svg-fit background: $organization-background-color margin-bottom: $spacing-2 order: -1 @@ -40,7 +36,12 @@ .organizations - &.grid + @include list-reset + article + display: flex + flex-direction: column + position: relative + &--grid max-width: 100% @include grid(2) @include grid(3, md) @@ -54,7 +55,8 @@ grid-column-gap: $spacing-3 !important &.with-summaries @include grid(1) - @include grid(1, md) + @include in-page-with-sidebar + @include grid(2, xl) @include in-page-without-sidebar @include grid(2, lg) @include grid(3, xl) @@ -83,6 +85,26 @@ .media width: columns(2) + &--large + @include layout-large + .organization + .organization-content + display: flex + flex-direction: column + .organization-summary + flex: 1 + + .organization + margin-top: $spacing-4 + @include media-breakpoint-up(md) + margin-top: $spacing-3 + .media--logo + padding: $spacing-5 + @include media-breakpoint-up(md) + padding: $spacing-6 + @include in-page-with-or-without-sidebar + .media + margin-bottom: 0 + .organizations__section .organizations margin-top: $spacing-4 diff --git a/assets/sass/_theme/sections/pages.sass b/assets/sass/_theme/sections/pages.sass index df0198ea9..24846162a 100644 --- a/assets/sass/_theme/sections/pages.sass +++ b/assets/sass/_theme/sections/pages.sass @@ -1,12 +1,7 @@ .page - @include article + @include article($aspect-ratio: $page-media-aspect-ratio) .page-title - a - @include stretched-link(before) - // exclusion for blocks with "more" link - .block:not(.block-pages--large, .block-pages--alternate) & - @include icon(arrow-right-line, after, true) - @include hover-translate-icon(after) + @include h4 .more @include icon(arrow-right-line, after, true) @include hover-translate-icon(after) @@ -24,47 +19,14 @@ + .more margin-top: $spacing-2 -.block-pages, .pages - .grid, .cards, .list - article - position: relative - display: flex - flex-direction: column + &--grid + @include layout-grid + .page .page-title @include h3 a - @include stretched-link(before) - text-decoration: none + @include icon(arrow-right-line, after, true) + @include hover-translate-icon(after) + p - margin-top: $spacing-2 - .media - @include handle-svg-fit - order: -1 - margin-bottom: $spacing-3 - &:empty - display: none - img - aspect-ratio: $page-media-aspect-ratio - object-fit: cover - width: 100% - @include media-breakpoint-down(desktop) - margin-top: $spacing-3 - .grid, .cards - @include grid(2, desktop) - @include in-page-without-sidebar - @include grid(3) - -.pages - .page - .page-title - @include h4 - -.pages - &--grid - @extend .block-pages--grid - &--list - @extend .block-pages--list - -.page__children - margin-top: $spacing-5 + margin-top: $spacing-1 diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass index a99aca857..78b6ece7b 100644 --- a/assets/sass/_theme/sections/persons.sass +++ b/assets/sass/_theme/sections/persons.sass @@ -1,3 +1,6 @@ +.persons + @include list-reset + .person .contacts-details margin-top: $spacing-2 @@ -151,16 +154,16 @@ ol.persons--list @extend .avatar @include media-breakpoint-down(desktop) margin-bottom: $spacing-4 - > .container:where(:only-child) - margin-bottom: calc(#{columns(2)} + #{$spacing-5}) + &:has(> .container:where(:only-child)) + margin-bottom: calc(#{columns(2)} + var(--grid-gutter)) figure margin-bottom: calc(#{columns(2)} * -1) figure width: columns(4) margin-left: auto @include media-breakpoint-down(md) - > .container:where(:only-child) - margin-bottom: calc(#{columns(3)} + #{$spacing-5}) + &:has(> .container:where(:only-child)) + margin-bottom: calc(#{columns(3)} + var(--grid-gutter)) figure margin-bottom: calc(#{columns(3)} * -1) figure diff --git a/assets/sass/_theme/sections/posts.sass b/assets/sass/_theme/sections/posts.sass index 3f32c147c..3053c845e 100644 --- a/assets/sass/_theme/sections/posts.sass +++ b/assets/sass/_theme/sections/posts.sass @@ -9,80 +9,243 @@ .post-subtitle @include h3 color: var(--color-text-alt) - time - color: $post-time-color + .federated + order: -1 .post-meta, .post-reading-time @include meta color: var(--color-text-alt) - -.posts__section, -.posts_categories__term, -.persons__page, -.administrators__term, -.authors__term, -.researchers__term, -.teachers__term - .posts--list - article - border-bottom: var(--border-width) solid var(--color-border) + .post-meta + * + display: inline + * + * + &::before + content: ' • ' + display: inline-block + vertical-align: middle + padding-left: space() + padding-right: space() + .post-content + > * + * + margin-top: $spacing-2 + &.is-federated + .post-content display: flex - margin-bottom: $spacing-3 - padding-bottom: $spacing-3 - flex-direction: row - .post-title + p:not(.post-subtitle) - margin-top: $spacing-2 - @include media-breakpoint-up(desktop) - @include grid - margin-bottom: $spacing-5 - padding-bottom: $spacing-5 - .post-content - // TODO: replace grid by flex - grid-column: 4/13 + flex-direction: column + .post-federation + order: -1 + margin-top: 0 + +.posts + @include list-reset + + &--alternate + @include alternate("> li") + @include media-breakpoint-up(desktop) + &.without-images + .post + margin-top: 0 !important + @include media-breakpoint-down(desktop) + >li + li + margin-top: $spacing-5 + .post .post-meta - > * - display: block - @include media-breakpoint-down(desktop) - flex: 1 + margin-top: $spacing-1 + + &--carousel + @include layout-carousel + @include in-page-with-sidebar + .post + .post-title, + .post-subtitle + @include h4 + .slider + .slider-arrows + justify-content: space-between + width: columns(4) + @include media-breakpoint-down(xxxl) + .slider-slide + width: columns(4) + .slider-arrows + width: columns(5) + @include in-page-without-sidebar + .block-content + display: flex + gap: var(--grid-gutter) + .top + flex-shrink: 0 + width: columns(3) + .slider + .slider-arrows + justify-content: space-between + width: columns(9) + &--grid + @include media-breakpoint-down(desktop) + > li + li + margin-top: $spacing-5 + @include in-page-without-sidebar + @include grid($block-posts-grid-columns) + .media picture img + width: 100% + @include in-page-with-sidebar + @include grid(2) + + &--large + > li + li + margin-top: $spacing-4 + .post + @include small-arrow-right-hover('.more') + .media + &, img + aspect-ratio: auto + @include media-breakpoint-down(desktop) + .post + [itemprop="abstract"] + margin-top: 0 + .post-author + margin-right: 0 + + time + display: inline + &::before + content: ' • ' + .post-categories + li + margin-right: space(2) + @include media-breakpoint-up(desktop) + .post + flex-direction: row + gap: var(--grid-gutter) + .post-title, + .post-subtitle + @include h2 + [itemprop="abstract"] + margin-top: $spacing-3 + + @include in-page-with-sidebar + .post + @include media-breakpoint-down(xl) + flex-direction: column + gap: unset + [itemprop="abstract"] + margin-top: $spacing-2 + @include media-breakpoint-up(xl) + .media, + .post-content + width: columns(4) + @include media-breakpoint-up(xl) + &.without-images + .post + .post-content + width: columns(8) + @include in-page-without-sidebar + .post + gap: var(--grid-gutter) + .media + width: columns(6) + .post-content + width: columns(5) + .post-title, + .post-subtitle + @include lead + &.without-images + .post + @include media-breakpoint-up(xl) + margin-left: offset(4) + .post-content + width: columns(6) + @include media-breakpoint-down(xl) + .post-content + width: columns(8) + + &--list + > li:where(:not(:last-child)) + border-bottom: var(--border-width) solid var(--color-border) + article .media background: none margin: 0 - @include media-breakpoint-down(desktop) - margin-right: $spacing-2 - width: 33.33333% - @include media-breakpoint-up(desktop) - grid-column: 1/4 - &:empty - background: var(--color-background-alt) - aspect-ratio: 3/2 &, img aspect-ratio: auto - @include media-breakpoint-up(desktop) - .post-meta - max-width: columns(3) - position: absolute - right: 0 - text-align: right - top: 0 - time, - .post-reading-time - font-size: $h5-size + + @include media-breakpoint-down(desktop) + > li + position: relative + padding-bottom: $spacing-3 + + li + margin-top: $spacing-3 + article .post-content - .post-title, + display: flex + flex-direction: column + padding-top: $spacing-2 + .post-title + margin-bottom: 0 + .post-categories + margin-bottom: 0 [itemprop="abstract"] - max-width: columns(6) - &.without-images + margin-top: $spacing-1 + .media + order: -1 + max-width: 33% + + @include media-breakpoint-up(desktop) + article + display: flex + flex-direction: row + + @include in-page-with-sidebar + > li + padding-bottom: $spacing-3 + + li + margin-top: $spacing-3 article + gap: var(--grid-gutter) + .media + width: columns(2) .post-content - grid-column-start: 1 - .posts--grid - @include grid(1) - @include grid(2, desktop) - @include grid($posts-grid-columns, xxl) - .post - @include author-and-time-side-to-side - .post-meta - margin-top: $spacing-2 + width: columns(6) + + @include in-page-without-sidebar + > li + padding-bottom: $spacing-5 + + li + margin-top: $spacing-5 + article + gap: var(--grid-gutter) + position: relative + .media + width: columns(3) + .post-content + display: flex + flex-direction: column + width: columns(7) + .post-meta + margin-top: auto + &:where(:has(*:not(time))) + padding-top: $spacing-3 + time + margin-top: space() + position: absolute + right: 0 + top: 0 + + *::before + content: none + padding: 0 + +// .posts__section, +// .posts_categories__term, +// .persons__page, +// .administrators__term, +// .authors__term, +// .researchers__term, +// .teachers__term +// .posts--grid +// @include grid(1) +// @include grid(2, desktop) +// @include grid($posts-grid-columns, xxl) +// .post +// .post-meta +// margin-top: $spacing-2 .posts__page .lead diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass index 2d80fded8..b98a62a0d 100644 --- a/assets/sass/_theme/sections/programs.sass +++ b/assets/sass/_theme/sections/programs.sass @@ -58,6 +58,8 @@ ol.programs:where(:not(.programs--grid)) transition: color $color-duration &:hover color: var(--color-accent) + .program-categories + width: 100% @include media-breakpoint-down(md) .media display: none @@ -79,16 +81,12 @@ ol.programs:where(:not(.programs--grid)) .program-title, [itemprop="abstract"] min-width: columns(6) - .program-diploma - width: var(--grid-gutter) - text-align: center .media flex-shrink: 0 margin-bottom: 0 width: columns(2) @include in-page-with-sidebar - .program-diploma + [itemprop="abstract"] - padding-right: var(--grid-gutter) + .program-diploma width: 100% @include in-page-without-sidebar .program-title @@ -97,6 +95,11 @@ ol.programs:where(:not(.programs--grid)) width: columns(9) .program-diploma margin-left: offset(1) + text-align: center + width: var(--grid-gutter) + .program-categories + order: 3 + ol.programs--light .program &:first-child @@ -197,6 +200,7 @@ ol.programs--light section:not(.block) > * + * margin-top: 1em .blocks + margin-top: 0 section > * + * // TODO : check that @include h3 margin-top: 0 @@ -318,9 +322,9 @@ ol.programs--light padding-top: 0 .projects--list > li:first-child padding-top: 0 - .events--list article:last-child - margin-bottom: 0 - padding-bottom: 0 + // .events--list article:last-child + // margin-bottom: 0 + // padding-bottom: 0 .programs-index .programs margin-bottom: $spacing-5 diff --git a/assets/sass/_theme/sections/projects.sass b/assets/sass/_theme/sections/projects.sass index 9b6590361..c234aca0e 100644 --- a/assets/sass/_theme/sections/projects.sass +++ b/assets/sass/_theme/sections/projects.sass @@ -17,6 +17,8 @@ width: 100% .projects + > ul + @include list-reset &--grid @include grid(2, md) .project @@ -25,7 +27,7 @@ &-subtitle @include h3 @include media-breakpoint-down(md) - .project + .project + > li + li margin-top: $spacing-4 .project .media @@ -49,33 +51,28 @@ @include hover-translate-icon(after, $fade: true) &:hover color: $color-accent - @include media-breakpoint-down(md) - .project + @include media-breakpoint-down(md) .media margin-bottom: 0 order: -1 - &-meta + .project-meta margin-top: $spacing-1 - @include media-breakpoint-up(md) - .project + @include media-breakpoint-up(md) flex-direction: row .media order: 1 - &-categories + .project-categories display: flex width: fit-content - @include media-breakpoint-between(sm, desktop) - .project + @include media-breakpoint-between(sm, desktop) .media width: columns(4) - article @include in-page-with-sidebar - .project - &-title, - &-subtitle - @include h3 + .project-title, + .project-subtitle + @include h3 @include in-page-without-sidebar - &.project + .project-content .project-title, .project-subtitle @include h2 @@ -83,22 +80,22 @@ .project-subtitle @include h3 @include media-breakpoint-down(desktop) - .project + .project + > li + li margin-top: $spacing-4 @include media-breakpoint-up(desktop) - article - + article + > li + + li margin-top: $spacing-6 &:nth-child(odd) margin-left: auto @include in-page-with-sidebar - article + > li width: columns(5) @include in-page-without-sidebar .top .description @include body-text - article + > li width: columns(7) &--large .project @@ -106,9 +103,6 @@ line-height: $body-size margin-bottom: $spacing-2 margin-top: $spacing-2 - time - + .project-categories::before - content: ' — ' time, ul.project-categories align-self: baseline @@ -120,8 +114,8 @@ margin-top: $spacing-2 * + .more margin-top: $spacing-2 - + .project - margin-top: $spacing-4 + > li + li + margin-top: $spacing-4 @include media-breakpoint-up(desktop) .project align-items: flex-end diff --git a/assets/sass/_theme/sections/publications.sass b/assets/sass/_theme/sections/publications.sass index c7c9ed143..fedd02b06 100644 --- a/assets/sass/_theme/sections/publications.sass +++ b/assets/sass/_theme/sections/publications.sass @@ -52,10 +52,8 @@ padding-right: $spacing-4 .publications - margin-top: $spacing-5 - -.publications-list @include list-reset + margin-top: $spacing-5 .publications__section .publications-year + .publication diff --git a/assets/sass/_theme/sections/volumes.sass b/assets/sass/_theme/sections/volumes.sass index 466941502..7de2663ae 100644 --- a/assets/sass/_theme/sections/volumes.sass +++ b/assets/sass/_theme/sections/volumes.sass @@ -8,10 +8,9 @@ .volumes @include grid(2, md) @include grid(3, lg) + @include list-reset @include media-breakpoint-down(desktop) - // remove that when v8 add lists everywhere - > div + div, - > .volume + .volume + > li + li margin-top: $spacing-4 .volumes__taxonomy diff --git a/assets/sass/_theme/utils/browsers.sass b/assets/sass/_theme/utils/browsers.sass new file mode 100644 index 000000000..817cc2c22 --- /dev/null +++ b/assets/sass/_theme/utils/browsers.sass @@ -0,0 +1,3 @@ +@mixin firefox + @-moz-document url-prefix() + @content \ No newline at end of file diff --git a/assets/sass/_theme/utils/media.sass b/assets/sass/_theme/utils/media.sass index 8be361e9b..0aefa8440 100644 --- a/assets/sass/_theme/utils/media.sass +++ b/assets/sass/_theme/utils/media.sass @@ -11,4 +11,4 @@ @mixin handle-svg-fit picture.is-svg img - object-fit: contain \ No newline at end of file + object-fit: contain !important \ No newline at end of file diff --git a/assets/sass/_theme/utils/shame.sass b/assets/sass/_theme/utils/shame.sass index 9f84bfb60..28c342154 100644 --- a/assets/sass/_theme/utils/shame.sass +++ b/assets/sass/_theme/utils/shame.sass @@ -9,15 +9,6 @@ white-space: nowrap !important width: 1px !important -@mixin author-and-time-side-to-side - .post-meta - * - display: inline - > * + .post-author p, - > * + .post-reading-time - &::before - content: ' • ' - @mixin list-section @include list-reset > li diff --git a/hugo.yaml b/hugo.yaml index efe447c60..132cc60f6 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -129,6 +129,9 @@ params: options: image: true summary: true + single: + taxonomies: + display: false diplomas: single: programs: @@ -369,6 +372,9 @@ params: related_events: layout: list quantity: 4 + related_exhibitions: + layout: list + quantity: 4 related_posts: layout: list quantity: 4 @@ -378,6 +384,7 @@ params: index: options: button: false + categories: false contact: false diploma: true diploma_certification: false @@ -435,6 +442,13 @@ params: volumes: default_image: false + # COMPONENTS + components: + lightbox: + disabled: false + in_gallery: + disabled: false + # BLOCKS blocks: gallery: @@ -443,21 +457,21 @@ params: progression: true key_figures: animated: true + organizations: + slider: + arrows: true + progression: true pages: alternate: more: true posts: slider: arrows: true - organizations: - slider: - arrows: true - progression: true testimonials: slider: - pagination: true autoplay: true interval: 5000 + pagination: true timeline: slider: arrows: true @@ -465,23 +479,41 @@ params: image_sizes: _default: pagefind: "244" - design_system: lightbox: - disabled: false - # TODO mobile et tablet - mobile: 1920x2560 - tablet: 1920x2560 - desktop: 1920x2560 - in_gallery: - disabled: false + desktop: 1920x2560 hero: mobile: 400 tablet: 800 desktop: 750 - item: - mobile: 350 - tablet: 450 - desktop: 450 + layouts: + alternate: + mobile: 360 + tablet: 555 + desktop: 520 + cards: + mobile: 360 + tablet: 555 + desktop: 575 + carousel: + mobile: 360 + tablet: 555 + desktop: 575 + grid: + mobile: 360 + tablet: 555 + desktop: 575 + large: + mobile: 400 + tablet: 555 + desktop: 894 + list: + mobile: 109 + tablet: 555 + desktop: 374 + map: + mobile: 300 + tablet: 300 + desktop: 300 blocks: call_to_action: mobile: 375 @@ -490,133 +522,11 @@ params: chapter: mobile: 350 tablet: 450 - desktop: 800 + desktop: 448 features: mobile: 350 tablet: 400 desktop: 750 - key_figures: - mobile: 100 - tablet: 100 - desktop: 150 - image: - mobile: 480x850 - tablet: 768x1360 - desktop: 1920x1920 - jobs: - alternate: - mobile: 350 - tablet: 709 - desktop: 1019 - grid: - mobile: 327 - tablet: 555 - desktop: 864 - large: - mobile: 350 - tablet: 555 - desktop: 1019 - list: - mobile: 350 - tablet: 709 - desktop: 1019 - links: - mobile: 350 - tablet: 400 - desktop: 750 - organizations: - mobile: 164 - tablet: 216 - desktop: 196 - organization_chart: # LEGACY - mobile: 80 - tablet: 100 - desktop: 255 - pages: - list: - mobile: 400 - tablet: 800 - desktop: 300 - large: - mobile: 400 - tablet: 800 - desktop: 1080 - partners: # LEGACY - mobile: 164 - tablet: 216 - desktop: 196 - persons: - grid: - mobile: 90 - tablet: 220 - desktop: 245 - large: - mobile: 400 - tablet: 360 - desktop: 645 - list: - mobile: 90 - tablet: 360 - desktop: 255 - projects: - alternate: - mobile: 350 - tablet: 709 - desktop: 1019 - grid: - mobile: 327 - tablet: 555 - desktop: 864 - large: - mobile: 350 - tablet: 555 - desktop: 1019 - events: - grid: - mobile: 400 - tablet: 360 - desktop: 690 - large: - mobile: 400 - tablet: 360 - desktop: 1019 - list: - mobile: 90 - tablet: 200 - desktop: 255 - agenda: - mobile: 400 - tablet: 360 - desktop: 645 - parent: - mobile: 400 - tablet: 360 - desktop: 645 - exhibitions: - grid: - mobile: 400 - tablet: 360 - desktop: 555 - large: - mobile: 400 - tablet: 360 - desktop: 645 - list: - mobile: 90 - tablet: 200 - desktop: 255 - agenda: - mobile: 400 - tablet: 360 - desktop: 645 - parent: - mobile: 400 - tablet: 360 - desktop: 645 - testimonials: - mobile: 80 - tablet: 160 - desktop: 260 gallery: carousel: mobile: 400 @@ -630,10 +540,22 @@ params: mobile: 400 tablet: 800 desktop: 1920 - programs: - mobile: 400 - tablet: 800 + image: + mobile: 480x850 + tablet: 768x1360 + desktop: 1920x1920 + key_figures: + mobile: 100 + tablet: 100 + desktop: 150 + links: + mobile: 350 + tablet: 400 desktop: 600 + testimonials: + mobile: 80 + tablet: 160 + desktop: 260 sections: categories: hero: @@ -648,29 +570,29 @@ params: mobile: 350 tablet: 990 desktop: 600 - large: - mobile: 360 - tablet: 555 - desktop: 864 - list: - mobile: 90 - tablet: 360 - desktop: 400 + layouts: + large: + mobile: 360 + tablet: 555 + desktop: 864 + list: + mobile: 90 + tablet: 360 + desktop: 400 diplomas: hero: mobile: 400 tablet: 800 desktop: 750 hero_single: - mobile: 351 - tablet: 456 - desktop: 856 - home: - hero: mobile: 400 tablet: 800 desktop: 750 events: + children_in_agenda: + mobile: 109 + tablet: 240 + desktop: 245 hero: mobile: 400 tablet: 800 @@ -692,6 +614,19 @@ params: mobile: 350 tablet: 450 desktop: 750 + layouts: + agenda: + mobile: 400 + tablet: 768 + desktop: 400 + parent: + mobile: 400 + tablet: 360 + desktop: 1213 + list: + mobile: 90 + tablet: 200 + desktop: 255 exhibitions: hero: mobile: 400 @@ -714,6 +649,20 @@ params: mobile: 350 tablet: 450 desktop: 750 + layouts: + agenda: + mobile: 400 + tablet: 360 + desktop: 645 + grid: + mobile: 350 + tablet: 555 + desktop: 864 + home: + hero: + mobile: 400 + tablet: 800 + desktop: 750 jobs: hero: mobile: 400 @@ -727,19 +676,20 @@ params: hero: mobile: 400 tablet: 800 - desktop: 900 + desktop: 750 hero_single: mobile: 400 tablet: 800 - desktop: 900 + desktop: 750 item: mobile: 350 tablet: 450 desktop: 900 - map: - mobile: 300 - tablet: 300 - desktop: 300 + layouts: + map: + mobile: 200 + tablet: 200 + desktop: 200 organizations: hero: mobile: 400 @@ -753,14 +703,19 @@ params: mobile: 144 tablet: 196 desktop: 246 - grid: - mobile: 144 - tablet: 196 - desktop: 246 - large: - mobile: 350 - tablet: 555 - desktop: 864 + layouts: + grid: + mobile: 144 + tablet: 196 + desktop: 246 + large: + mobile: 350 + tablet: 555 + desktop: 864 + map: + mobile: 144 + tablet: 196 + desktop: 246 pages: hero: mobile: 400 @@ -770,6 +725,11 @@ params: mobile: 350 tablet: 990 desktop: 600 + layouts: + list: + mobile: 400 + tablet: 800 + desktop: 400 papers: hero: mobile: 400 @@ -788,6 +748,19 @@ params: mobile: 80 tablet: 100 desktop: 255 + layouts: + grid: + mobile: 90 + tablet: 220 + desktop: 245 + large: + mobile: 400 + tablet: 360 + desktop: 645 + list: + mobile: 64 + tablet: 64 + desktop: 245 posts: hero: mobile: 400 @@ -801,55 +774,66 @@ params: mobile: 350 tablet: 450 desktop: 600 - projects: + layouts: + highlight: + mobile: 400 + tablet: 555 + desktop: 812 + programs: hero: mobile: 400 tablet: 800 desktop: 750 - hero_single: - mobile: 400 - tablet: 800 - desktop: 750 + image: + mobile: 351x168 + tablet: 456x219 + desktop: 1200 item: mobile: 350 tablet: 450 desktop: 600 - list: - mobile: 90 - tablet: 350 - desktop: 555 - alternate: - mobile: 350 - tablet: 555 - desktop: 1019 - grid: - mobile: 327 - tablet: 555 - desktop: 864 - large: - mobile: 350 - tablet: 555 - desktop: 1019 - programs: + layouts: + list: + mobile: 90 + tablet: 200 + desktop: 255 + projects: hero: mobile: 400 tablet: 800 desktop: 750 - image: - mobile: 351x168 - tablet: 456x219 - desktop: 1200 + hero_single: + mobile: 400 + tablet: 800 + desktop: 750 item: mobile: 350 tablet: 450 desktop: 600 + layouts: + alternate: + mobile: 350 + tablet: 555 + desktop: 1019 + grid: + mobile: 350 + tablet: 555 + desktop: 864 + large: + mobile: 350 + tablet: 555 + desktop: 1019 + list: + mobile: 90 + tablet: 350 + desktop: 415 publications: - hero: + hero: mobile: 400 tablet: 800 desktop: 750 schools: - hero: + hero: mobile: 400 tablet: 800 desktop: 750 @@ -865,4 +849,4 @@ params: item: mobile: 327x388 tablet: 208x247 - desktop: 300x356 + desktop: 555x666 diff --git a/i18n/en.yml b/i18n/en.yml index 9ad39a741..901fdd1fa 100644 --- a/i18n/en.yml +++ b/i18n/en.yml @@ -322,15 +322,17 @@ events: unique_day: Date exhibitions: archives: Previous exhibitions archive - none: No exhibition. current: Now future: Coming soon item: federated: "Exhibition from {{ . }}" + none: No exhibition. + see_all_in_program: See all program's exhibitions status: + archive: Passed current: Now future: Soon - archive: Passed + title: Exhibitions formats: pdf: Adobe Portable Document Format jpg: JPEG image diff --git a/i18n/fr.yml b/i18n/fr.yml index 4ec5fd71a..ac14c0f6f 100644 --- a/i18n/fr.yml +++ b/i18n/fr.yml @@ -324,15 +324,17 @@ events: anchor: Accéder aux événements exhibitions: archives: Expositions passées - none: Aucune exposition. current: En ce moment future: Bientôt item: federated: "Exposition du réseau {{ . }}" + none: Aucune exposition. + see_all_in_program: Voir toutes les expositions de la formation status: + archive: Archive current: En cours future: À venir - archive: Archive + title: Expositions formats: pdf: Adobe Portable Document Format jpg: JPEG image @@ -421,6 +423,8 @@ posts: other: "{{ .Count }} articles" date: Date informations: Informations + item: + federated: "Actualité du réseau {{ . }}" next: Article suivant next_aria: Article suivant “{{ .Title }}” none: Aucun article publié @@ -480,6 +484,7 @@ programs: presentation: Présentation related: events: Événements + exhibitions: Expositions posts: Actualités projects: Projets results: Après la formation diff --git a/i18n/pt.yml b/i18n/pt.yml index d33511de0..278b5bad2 100644 --- a/i18n/pt.yml +++ b/i18n/pt.yml @@ -315,17 +315,16 @@ papers: references: Referências content: Texto completo persons: - posts: Notícias publicadas recentemente - programs: Cursos - papers: Artigos - publications: Publicações recentes - papers: Artigos publicados recentemente backlinks: events: Eventos mencionando exhibitions: Exposições mencionando pages: Páginas mencionando posts: Notícias mencionando projects: Projetos mencionando + papers: Artigos publicados recentemente + posts: Notícias publicadas recentemente + programs: Cursos + publications: Publicações recentes posts: author: Autor/a authors: diff --git a/layouts/partials/AddCreditMention b/layouts/_partials/AddCreditMention.html similarity index 100% rename from layouts/partials/AddCreditMention rename to layouts/_partials/AddCreditMention.html diff --git a/layouts/partials/FilterIframeLazy b/layouts/_partials/FilterIframeLazy.html similarity index 100% rename from layouts/partials/FilterIframeLazy rename to layouts/_partials/FilterIframeLazy.html diff --git a/layouts/partials/FilterPublications b/layouts/_partials/FilterPublications.html similarity index 100% rename from layouts/partials/FilterPublications rename to layouts/_partials/FilterPublications.html diff --git a/layouts/partials/GetBlockClass b/layouts/_partials/GetBlockClass.html similarity index 100% rename from layouts/partials/GetBlockClass rename to layouts/_partials/GetBlockClass.html diff --git a/layouts/partials/GetBodyclass b/layouts/_partials/GetBodyclass.html similarity index 100% rename from layouts/partials/GetBodyclass rename to layouts/_partials/GetBodyclass.html diff --git a/layouts/partials/GetCategoriesSlug b/layouts/_partials/GetCategoriesSlug.html similarity index 100% rename from layouts/partials/GetCategoriesSlug rename to layouts/_partials/GetCategoriesSlug.html diff --git a/layouts/partials/GetDayAnchor b/layouts/_partials/GetDayAnchor.html similarity index 100% rename from layouts/partials/GetDayAnchor rename to layouts/_partials/GetDayAnchor.html diff --git a/layouts/partials/GetExtensionFile b/layouts/_partials/GetExtensionFile.html similarity index 100% rename from layouts/partials/GetExtensionFile rename to layouts/_partials/GetExtensionFile.html diff --git a/layouts/partials/GetFigureAriaLabel b/layouts/_partials/GetFigureAriaLabel.html similarity index 100% rename from layouts/partials/GetFigureAriaLabel rename to layouts/_partials/GetFigureAriaLabel.html diff --git a/layouts/partials/GetFileExtensionWithSize b/layouts/_partials/GetFileExtensionWithSize.html similarity index 100% rename from layouts/partials/GetFileExtensionWithSize rename to layouts/_partials/GetFileExtensionWithSize.html diff --git a/layouts/partials/GetHeadTitle b/layouts/_partials/GetHeadTitle.html similarity index 54% rename from layouts/partials/GetHeadTitle rename to layouts/_partials/GetHeadTitle.html index ce59271f4..84c7406ee 100644 --- a/layouts/partials/GetHeadTitle +++ b/layouts/_partials/GetHeadTitle.html @@ -3,7 +3,6 @@ {{ $separator := htmlUnescape site.Params.seo.title.separator }} {{ $title := printf "%s %s %s" $pageTitle $separator $siteTitle }} -{{/* PAGE OPTION */}} {{ $option := "both" }} {{ if .IsHome }} {{ $option = site.Params.home.head.title }} @@ -15,15 +14,4 @@ {{ $title = $siteTitle }} {{ end }} -{{/* PAGINATION */}} -{{/* {{ if and (not .IsHome) (eq .Kind "section") }} - {{ with .Paginator }} - {{ if or .HasPrev .HasNext }} - {{ $page_label := i18n "commons.pagination.title" }} - {{ $currentPageNumber := .PageNumber }} - {{ $title = printf "%s %s %s %d" $title $separator $page_label $currentPageNumber }} - {{ end }} - {{ end }} -{{ end }} */}} - {{ return $title }} \ No newline at end of file diff --git a/layouts/partials/GetHeadingTag b/layouts/_partials/GetHeadingTag.html similarity index 100% rename from layouts/partials/GetHeadingTag rename to layouts/_partials/GetHeadingTag.html diff --git a/layouts/partials/GetHumanSize b/layouts/_partials/GetHumanSize.html similarity index 100% rename from layouts/partials/GetHumanSize rename to layouts/_partials/GetHumanSize.html diff --git a/layouts/partials/GetImageDimensions b/layouts/_partials/GetImageDimensions.html similarity index 100% rename from layouts/partials/GetImageDimensions rename to layouts/_partials/GetImageDimensions.html diff --git a/layouts/partials/GetImageDirection b/layouts/_partials/GetImageDirection.html similarity index 100% rename from layouts/partials/GetImageDirection rename to layouts/_partials/GetImageDirection.html diff --git a/layouts/partials/GetImageUrl b/layouts/_partials/GetImageUrl.html similarity index 100% rename from layouts/partials/GetImageUrl rename to layouts/_partials/GetImageUrl.html diff --git a/layouts/partials/GetImageUrlKeycdn b/layouts/_partials/GetImageUrlKeycdn.html similarity index 100% rename from layouts/partials/GetImageUrlKeycdn rename to layouts/_partials/GetImageUrlKeycdn.html diff --git a/layouts/partials/GetImageUrlOsuny b/layouts/_partials/GetImageUrlOsuny.html similarity index 100% rename from layouts/partials/GetImageUrlOsuny rename to layouts/_partials/GetImageUrlOsuny.html diff --git a/layouts/partials/GetLayoutAndOptions b/layouts/_partials/GetLayoutAndOptions.html similarity index 100% rename from layouts/partials/GetLayoutAndOptions rename to layouts/_partials/GetLayoutAndOptions.html diff --git a/layouts/partials/GetLightboxUrl b/layouts/_partials/GetLightboxUrl.html similarity index 81% rename from layouts/partials/GetLightboxUrl rename to layouts/_partials/GetLightboxUrl.html index 7ea489ee6..dc81e7ca3 100644 --- a/layouts/partials/GetLightboxUrl +++ b/layouts/_partials/GetLightboxUrl.html @@ -2,7 +2,7 @@ {{ if isset . "id" }} {{ $id = .id }} {{ end }} -{{ $lightbox_sizes := site.Params.image_sizes.design_system.lightbox.desktop }} +{{ $lightbox_sizes := site.Params.image_sizes._default.lightbox.desktop }} {{ $image := partial "GetMedia" $id }} {{ $url := "" }} diff --git a/layouts/partials/GetLogoUrl b/layouts/_partials/GetLogoUrl.html similarity index 100% rename from layouts/partials/GetLogoUrl rename to layouts/_partials/GetLogoUrl.html diff --git a/layouts/partials/GetMainClass b/layouts/_partials/GetMainClass.html similarity index 100% rename from layouts/partials/GetMainClass rename to layouts/_partials/GetMainClass.html diff --git a/layouts/partials/GetMainSearchAttributes b/layouts/_partials/GetMainSearchAttributes.html similarity index 100% rename from layouts/partials/GetMainSearchAttributes rename to layouts/_partials/GetMainSearchAttributes.html diff --git a/layouts/partials/GetMedia b/layouts/_partials/GetMedia.html similarity index 100% rename from layouts/partials/GetMedia rename to layouts/_partials/GetMedia.html diff --git a/layouts/partials/GetMenu b/layouts/_partials/GetMenu.html similarity index 100% rename from layouts/partials/GetMenu rename to layouts/_partials/GetMenu.html diff --git a/layouts/partials/GetMenuSummary b/layouts/_partials/GetMenuSummary.html similarity index 100% rename from layouts/partials/GetMenuSummary rename to layouts/_partials/GetMenuSummary.html diff --git a/layouts/partials/GetMonthFromNow b/layouts/_partials/GetMonthFromNow.html similarity index 100% rename from layouts/partials/GetMonthFromNow rename to layouts/_partials/GetMonthFromNow.html diff --git a/layouts/partials/GetObjectsFromPathSlice b/layouts/_partials/GetObjectsFromPathSlice.html similarity index 100% rename from layouts/partials/GetObjectsFromPathSlice rename to layouts/_partials/GetObjectsFromPathSlice.html diff --git a/layouts/partials/GetPathSliceFromObjects b/layouts/_partials/GetPathSliceFromObjects.html similarity index 100% rename from layouts/partials/GetPathSliceFromObjects rename to layouts/_partials/GetPathSliceFromObjects.html diff --git a/layouts/partials/GetPermalink b/layouts/_partials/GetPermalink.html similarity index 100% rename from layouts/partials/GetPermalink rename to layouts/_partials/GetPermalink.html diff --git a/layouts/partials/GetRichSummary b/layouts/_partials/GetRichSummary.html similarity index 100% rename from layouts/partials/GetRichSummary rename to layouts/_partials/GetRichSummary.html diff --git a/layouts/partials/GetSiteParamWithDefault b/layouts/_partials/GetSiteParamWithDefault.html similarity index 100% rename from layouts/partials/GetSiteParamWithDefault rename to layouts/_partials/GetSiteParamWithDefault.html diff --git a/layouts/partials/GetSummaryPosition b/layouts/_partials/GetSummaryPosition.html similarity index 100% rename from layouts/partials/GetSummaryPosition rename to layouts/_partials/GetSummaryPosition.html diff --git a/layouts/partials/GetTaxonomiesPosition b/layouts/_partials/GetTaxonomiesPosition.html similarity index 100% rename from layouts/partials/GetTaxonomiesPosition rename to layouts/_partials/GetTaxonomiesPosition.html diff --git a/layouts/partials/GetTermsFromTaxonomies b/layouts/_partials/GetTermsFromTaxonomies.html similarity index 100% rename from layouts/partials/GetTermsFromTaxonomies rename to layouts/_partials/GetTermsFromTaxonomies.html diff --git a/layouts/partials/GetTextFromHTML b/layouts/_partials/GetTextFromHTML.html similarity index 100% rename from layouts/partials/GetTextFromHTML rename to layouts/_partials/GetTextFromHTML.html diff --git a/layouts/partials/GetTruncatedText b/layouts/_partials/GetTruncatedText.html similarity index 100% rename from layouts/partials/GetTruncatedText rename to layouts/_partials/GetTruncatedText.html diff --git a/layouts/partials/HasAdministrativeInformation b/layouts/_partials/HasAdministrativeInformation.html similarity index 100% rename from layouts/partials/HasAdministrativeInformation rename to layouts/_partials/HasAdministrativeInformation.html diff --git a/layouts/partials/IsFirstPage b/layouts/_partials/IsFirstPage.html similarity index 100% rename from layouts/partials/IsFirstPage rename to layouts/_partials/IsFirstPage.html diff --git a/layouts/partials/PrepareHTML b/layouts/_partials/PrepareHTML.html similarity index 100% rename from layouts/partials/PrepareHTML rename to layouts/_partials/PrepareHTML.html diff --git a/layouts/partials/PrepareText b/layouts/_partials/PrepareText.html similarity index 100% rename from layouts/partials/PrepareText rename to layouts/_partials/PrepareText.html diff --git a/layouts/partials/RemoveSrOnlyTag b/layouts/_partials/RemoveSrOnlyTag.html similarity index 100% rename from layouts/partials/RemoveSrOnlyTag rename to layouts/_partials/RemoveSrOnlyTag.html diff --git a/layouts/partials/academic_years/partials/academic_year.html b/layouts/_partials/academic_years/partials/academic_year.html similarity index 100% rename from layouts/partials/academic_years/partials/academic_year.html rename to layouts/_partials/academic_years/partials/academic_year.html diff --git a/layouts/partials/academic_years/partials/academic_years.html b/layouts/_partials/academic_years/partials/academic_years.html similarity index 100% rename from layouts/partials/academic_years/partials/academic_years.html rename to layouts/_partials/academic_years/partials/academic_years.html diff --git a/layouts/partials/academic_years/partials/persons.html b/layouts/_partials/academic_years/partials/persons.html similarity index 56% rename from layouts/partials/academic_years/partials/persons.html rename to layouts/_partials/academic_years/partials/persons.html index 4ab881890..79141739e 100644 --- a/layouts/partials/academic_years/partials/persons.html +++ b/layouts/_partials/academic_years/partials/persons.html @@ -4,13 +4,13 @@ {{ range . }}
  • {{ partial "persons/partials/person.html" (dict - "person" . - "options" (dict - "cohorts" true - "image" true - "link" true - ) - ) }} + "person" . + "options" (dict + "cohorts" true + "image" true + "link" true + ) + ) }}
    • {{ end }} diff --git a/layouts/partials/academic_years/section.html b/layouts/_partials/academic_years/section.html similarity index 100% rename from layouts/partials/academic_years/section.html rename to layouts/_partials/academic_years/section.html diff --git a/layouts/_partials/academic_years/section/hero.html b/layouts/_partials/academic_years/section/hero.html new file mode 100644 index 000000000..1f5270dc3 --- /dev/null +++ b/layouts/_partials/academic_years/section/hero.html @@ -0,0 +1,8 @@ +{{ $title := or .Params.header_text .Title }} + +{{ partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.pages.hero + "context" . +) }} diff --git a/layouts/partials/academic_years/single.html b/layouts/_partials/academic_years/single.html similarity index 100% rename from layouts/partials/academic_years/single.html rename to layouts/_partials/academic_years/single.html diff --git a/layouts/_partials/academic_years/single/hero.html b/layouts/_partials/academic_years/single/hero.html new file mode 100644 index 000000000..91a7aae8f --- /dev/null +++ b/layouts/_partials/academic_years/single/hero.html @@ -0,0 +1,4 @@ +{{ partial "header/hero.html" (dict + "title" .Title + "context" . +) }} diff --git a/layouts/partials/administrators/section.html b/layouts/_partials/administrators/section.html similarity index 87% rename from layouts/partials/administrators/section.html rename to layouts/_partials/administrators/section.html index 91c5db831..063108cdf 100644 --- a/layouts/partials/administrators/section.html +++ b/layouts/_partials/administrators/section.html @@ -3,9 +3,9 @@
    {{ partial "persons/section/summary.html" (dict - "with_container" true - "context" . - ) }} + "with_container" true + "context" . + ) }} {{ if (partial "IsFirstPage" .) }} {{ partial "contents/list.html" (dict diff --git a/layouts/_partials/administrators/single.html b/layouts/_partials/administrators/single.html new file mode 100644 index 000000000..3cee546d3 --- /dev/null +++ b/layouts/_partials/administrators/single.html @@ -0,0 +1,9 @@ +{{ $title := or .Params.header_text .Title }} +{{ partial "header/hero.html" (dict + "title" $title + "context" . +) }} +
    + {{ partial "pages/partials/pages.html" . }} + {{ partial "commons/pagination.html" . }} +
    \ No newline at end of file diff --git a/layouts/partials/authors/partials/authors.html b/layouts/_partials/authors/partials/authors.html similarity index 100% rename from layouts/partials/authors/partials/authors.html rename to layouts/_partials/authors/partials/authors.html diff --git a/layouts/partials/authors/section.html b/layouts/_partials/authors/section.html similarity index 85% rename from layouts/partials/authors/section.html rename to layouts/_partials/authors/section.html index a5717404a..df02c05e4 100644 --- a/layouts/partials/authors/section.html +++ b/layouts/_partials/authors/section.html @@ -3,9 +3,9 @@
    {{ partial "persons/section/summary.html" (dict - "with_container" true - "context" . - ) }} + "with_container" true + "context" . + ) }} {{ partial "contents/list.html" (dict "context" . diff --git a/layouts/_partials/authors/single.html b/layouts/_partials/authors/single.html new file mode 100644 index 000000000..b93873817 --- /dev/null +++ b/layouts/_partials/authors/single.html @@ -0,0 +1,9 @@ +{{ $title := or .Params.header_text .Title }} +{{ partial "header/hero.html" (dict + "title" $title + "context" . +) }} +
    + {{ partial "posts/partials/posts.html" . }} + {{ partial "commons/pagination.html" . }} +
    \ No newline at end of file diff --git a/layouts/partials/blocks/templates/agenda.html b/layouts/_partials/blocks/templates/agenda.html similarity index 79% rename from layouts/partials/blocks/templates/agenda.html rename to layouts/_partials/blocks/templates/agenda.html index 69569286d..9a7fb0c2c 100644 --- a/layouts/partials/blocks/templates/agenda.html +++ b/layouts/_partials/blocks/templates/agenda.html @@ -9,19 +9,21 @@
    {{ partial "blocks/top.html" $block.top }} {{ if .events }} -
    +
      {{ range .events }} {{ $event := site.GetPage .path }} {{ with $event }} - {{ partial "events/partials/event.html" (dict +
    • + {{ partial "events/partials/event.html" (dict "event" . "layout" $layout "options" $options "heading_level" $block.ranks.children ) }} +
      • {{ end }} {{ end }} -
    + {{ else if .no_event_message }}

    {{ partial "PrepareHTML" .no_event_message }}

    {{ end }} diff --git a/layouts/partials/blocks/templates/call_to_action.html b/layouts/_partials/blocks/templates/call_to_action.html similarity index 81% rename from layouts/partials/blocks/templates/call_to_action.html rename to layouts/_partials/blocks/templates/call_to_action.html index 76e850db0..933192e5e 100644 --- a/layouts/partials/blocks/templates/call_to_action.html +++ b/layouts/_partials/blocks/templates/call_to_action.html @@ -29,16 +29,11 @@
    {{- end -}}
    - {{ if .image }} + {{ with .image }} {{ partial "commons/image-figure.html" (dict - "image" (dict - "alt" .alt - "id" .image.id - "file" .image.file - "credit" .credit - ) - "sizes" site.Params.image_sizes.blocks.call_to_action - ) }} + "image" . + "sizes" site.Params.image_sizes.blocks.call_to_action + ) }} {{ end }}
    diff --git a/layouts/partials/blocks/templates/categories.html b/layouts/_partials/blocks/templates/categories.html similarity index 60% rename from layouts/partials/blocks/templates/categories.html rename to layouts/_partials/blocks/templates/categories.html index 336664617..ebf53b473 100644 --- a/layouts/partials/blocks/templates/categories.html +++ b/layouts/_partials/blocks/templates/categories.html @@ -3,18 +3,18 @@ {{- $layout := .block.data.layout | default "grid" -}} {{- with .block.data -}} - {{- $options := .options -}} + {{ $options := .options }}
    {{ partial "blocks/top.html" $block.top }} - {{- partial (printf "categories/partials/layouts/%s/%s.html" $layout $layout) (dict - "categories" .categories - "heading_level" $block.ranks.children - "options" .options - ) }} + {{ partial (printf "categories/partials/layouts/%s/%s.html" $layout $layout) (dict + "categories" .categories + "heading_level" $block.ranks.children + "options" .options + ) }}
    diff --git a/layouts/partials/blocks/templates/chapter.html b/layouts/_partials/blocks/templates/chapter.html similarity index 77% rename from layouts/partials/blocks/templates/chapter.html rename to layouts/_partials/blocks/templates/chapter.html index fbabb4ec0..3fe7bb38a 100644 --- a/layouts/partials/blocks/templates/chapter.html +++ b/layouts/_partials/blocks/templates/chapter.html @@ -25,15 +25,9 @@ {{ end -}} - {{ if .image }} - + {{ with .image }} {{ partial "commons/image-figure.html" (dict - "image" (dict - "alt" .alt - "id" .image.id - "file" .image.file - "credit" .credit - ) + "image" . "sizes" site.Params.image_sizes.blocks.chapter ) }} {{ end -}} diff --git a/layouts/partials/blocks/templates/contact.html b/layouts/_partials/blocks/templates/contact.html similarity index 59% rename from layouts/partials/blocks/templates/contact.html rename to layouts/_partials/blocks/templates/contact.html index e5f1c12bb..816a5dff9 100644 --- a/layouts/partials/blocks/templates/contact.html +++ b/layouts/_partials/blocks/templates/contact.html @@ -9,9 +9,9 @@ {{ $heading_rank := $block.ranks.children | default 2 }} {{ $heading_name := partial "GetHeadingTag" ( dict - "level" $heading_rank - "attributes" "itemprop='name'" - ) }} + "level" $heading_rank + "attributes" "itemprop='name'" + ) }} {{ $a11y_name := .name | default (i18n "commons.contact.empty_name") }} {{ if .name }} {{ $heading_rank = $heading_rank | add 1 }} @@ -89,58 +89,58 @@ {{ end }} {{ end }} - {{ if .timetable }} - {{ $time_size := "full-size" }} - {{ $contacts := .contact_details }} - {{ if and (or $contacts.emails.list $contacts.websites.website) $contacts.phone_numbers.list $contacts.social_networks }} - {{ $time_size = "reduced" }} - {{ end}} -
    - {{ $heading_items.open }} - {{- i18n "commons.contact.schedule" -}} - {{ $heading_items.close }} - +
    + {{ end }} diff --git a/layouts/partials/blocks/templates/datatable.html b/layouts/_partials/blocks/templates/datatable.html similarity index 100% rename from layouts/partials/blocks/templates/datatable.html rename to layouts/_partials/blocks/templates/datatable.html diff --git a/layouts/partials/blocks/templates/definitions.html b/layouts/_partials/blocks/templates/definitions.html similarity index 100% rename from layouts/partials/blocks/templates/definitions.html rename to layouts/_partials/blocks/templates/definitions.html diff --git a/layouts/partials/blocks/templates/embed.html b/layouts/_partials/blocks/templates/embed.html similarity index 69% rename from layouts/partials/blocks/templates/embed.html rename to layouts/_partials/blocks/templates/embed.html index a70184c35..20c70b5af 100644 --- a/layouts/partials/blocks/templates/embed.html +++ b/layouts/_partials/blocks/templates/embed.html @@ -12,11 +12,11 @@ {{ partial "PrepareHTML" .code }} {{ end -}} - {{ partial "commons/transcription" ( dict - "block_index" $block_index - "title" .transcription_title - "transcription" .transcription - ) }} + {{ partial "commons/transcription.html" ( dict + "block_index" $block_index + "title" .transcription_title + "transcription" .transcription + ) }} diff --git a/layouts/partials/blocks/templates/exhibitions.html b/layouts/_partials/blocks/templates/exhibitions.html similarity index 100% rename from layouts/partials/blocks/templates/exhibitions.html rename to layouts/_partials/blocks/templates/exhibitions.html diff --git a/layouts/partials/blocks/templates/features.html b/layouts/_partials/blocks/templates/features.html similarity index 100% rename from layouts/partials/blocks/templates/features.html rename to layouts/_partials/blocks/templates/features.html diff --git a/layouts/partials/blocks/templates/files.html b/layouts/_partials/blocks/templates/files.html similarity index 100% rename from layouts/partials/blocks/templates/files.html rename to layouts/_partials/blocks/templates/files.html diff --git a/layouts/partials/blocks/templates/gallery.html b/layouts/_partials/blocks/templates/gallery.html similarity index 88% rename from layouts/partials/blocks/templates/gallery.html rename to layouts/_partials/blocks/templates/gallery.html index 070bc9969..68c79f01d 100644 --- a/layouts/partials/blocks/templates/gallery.html +++ b/layouts/_partials/blocks/templates/gallery.html @@ -20,10 +20,10 @@ > {{- range .images }} {{ partial "commons/image-figure.html" (dict - "image" . - "sizes" $sizes - "gallery" true - )}} + "image" . + "sizes" $sizes + "gallery" true + ) }} {{ end -}} diff --git a/layouts/partials/blocks/templates/image.html b/layouts/_partials/blocks/templates/image.html similarity index 69% rename from layouts/partials/blocks/templates/image.html rename to layouts/_partials/blocks/templates/image.html index 74a351227..d671b2b4e 100644 --- a/layouts/partials/blocks/templates/image.html +++ b/layouts/_partials/blocks/templates/image.html @@ -11,15 +11,14 @@
    {{ partial "blocks/top.html" $block.top }} - {{ partial "commons/image-figure.html" (dict "image" (dict - "alt" .image.alt - "id" .image.id - "file" .image.file - "credit" .image.credit - "text" .text - ) + "alt" .image.alt + "id" .image.id + "file" .image.file + "credit" .image.credit + "text" .text + ) "sizes" site.Params.image_sizes.blocks.image ) }}
    diff --git a/layouts/partials/blocks/templates/jobs.html b/layouts/_partials/blocks/templates/jobs.html similarity index 97% rename from layouts/partials/blocks/templates/jobs.html rename to layouts/_partials/blocks/templates/jobs.html index 929e02875..e86759c91 100644 --- a/layouts/partials/blocks/templates/jobs.html +++ b/layouts/_partials/blocks/templates/jobs.html @@ -1,4 +1,4 @@ -{{- $block := .block }} +{{- $block := .block -}} {{- $block_class := partial "GetBlockClass" .block -}} {{- with .block.data -}} {{- $options := .options -}} diff --git a/layouts/partials/blocks/templates/key_figures.html b/layouts/_partials/blocks/templates/key_figures.html similarity index 90% rename from layouts/partials/blocks/templates/key_figures.html rename to layouts/_partials/blocks/templates/key_figures.html index 9836be340..e73abecf9 100644 --- a/layouts/partials/blocks/templates/key_figures.html +++ b/layouts/_partials/blocks/templates/key_figures.html @@ -18,9 +18,9 @@
  • {{ with .image }} {{ partial "commons/image.html" (dict - "image" . - "sizes" site.Params.image_sizes.blocks.key_figures - )}} + "image" . + "sizes" site.Params.image_sizes.blocks.key_figures + ) }} {{ end }}
    diff --git a/layouts/partials/blocks/templates/license.html b/layouts/_partials/blocks/templates/license.html similarity index 100% rename from layouts/partials/blocks/templates/license.html rename to layouts/_partials/blocks/templates/license.html diff --git a/layouts/partials/blocks/templates/links.html b/layouts/_partials/blocks/templates/links.html similarity index 91% rename from layouts/partials/blocks/templates/links.html rename to layouts/_partials/blocks/templates/links.html index b03625c31..6ec2bc919 100644 --- a/layouts/partials/blocks/templates/links.html +++ b/layouts/_partials/blocks/templates/links.html @@ -28,9 +28,9 @@ {{- if .image -}}
    {{- partial "commons/image.html" (dict - "image" .image - "alt" .alt - "sizes" site.Params.image_sizes.blocks.links + "image" .image + "alt" .alt + "sizes" site.Params.image_sizes.blocks.links ) -}}
    {{- end -}} diff --git a/layouts/partials/blocks/templates/locations.html b/layouts/_partials/blocks/templates/locations.html similarity index 75% rename from layouts/partials/blocks/templates/locations.html rename to layouts/_partials/blocks/templates/locations.html index 5021ac6e2..5ce546d53 100644 --- a/layouts/partials/blocks/templates/locations.html +++ b/layouts/_partials/blocks/templates/locations.html @@ -1,6 +1,6 @@ -{{ $block := .block }} -{{ $block_class := partial "GetBlockClass" .block }} -{{ $layout := .block.data.layout | default "grid" }} +{{- $block := .block -}} +{{- $block_class := partial "GetBlockClass" .block -}} +{{- $layout := .block.data.layout | default "grid" -}} {{- with .block.data -}} {{ $options := .options }} @@ -24,19 +24,20 @@ {{ end }} {{ partial "locations/partials/map.html" (dict - "locations" $locations - "title" $map_title - )}} + "locations" $locations + "title" $map_title + ) }} {{ else }} -
    +
      {{ range $locations }} {{ partial "locations/partials/location.html" (dict "location" . "heading_level" $block.ranks.children "options" $options + "layout" $layout ) }} {{ end }} -
    + {{ end }}
    • diff --git a/layouts/partials/blocks/templates/organizations.html b/layouts/_partials/blocks/templates/organizations.html similarity index 60% rename from layouts/partials/blocks/templates/organizations.html rename to layouts/_partials/blocks/templates/organizations.html index 7f90745a9..56630dce5 100644 --- a/layouts/partials/blocks/templates/organizations.html +++ b/layouts/_partials/blocks/templates/organizations.html @@ -1,10 +1,10 @@ {{- $block := .block -}} {{- $block_index := .index -}} {{- $block_class := partial "GetBlockClass" .block -}} -{{ $logo_index := "logo" }} -{{ $longitude := "" }} -{{ $latitude := "" }} -{{- $layout := .block.data.layout | default "grid" }} +{{- $logo_index := "logo" -}} +{{- $longitude := "" -}} +{{- $latitude := "" -}} +{{- $layout := .block.data.layout | default "grid" -}} {{ if site.Params.organizations.dark_logo_background }} {{ $logo_index = "logo_on_dark_background" }} @@ -20,15 +20,15 @@
    {{ partial "blocks/top.html" $block.top }} {{ partial (printf "organizations/partials/layouts/%s/%s.html" $layout $layout) (dict - "block_index" $block_index - "heading_level" $block.ranks.children - "title" $block.title - "logo_index" $logo_index - "organizations" .organizations - "options" $options - "layout" $layout - "categories" .categories - )}} + "block_index" $block_index + "heading_level" $block.ranks.children + "title" $block.title + "logo_index" $logo_index + "organizations" .organizations + "options" $options + "layout" $layout + "categories" .categories + ) }}
    diff --git a/layouts/partials/blocks/templates/pages.html b/layouts/_partials/blocks/templates/pages.html similarity index 89% rename from layouts/partials/blocks/templates/pages.html rename to layouts/_partials/blocks/templates/pages.html index e55cd8eb7..b07204643 100644 --- a/layouts/partials/blocks/templates/pages.html +++ b/layouts/_partials/blocks/templates/pages.html @@ -31,10 +31,10 @@ {{ partial "blocks/top.html" $block.top }} {{- partial (printf "pages/partials/layouts/%s/%s.html" $layout $layout) (dict - "pages" .pages - "heading_level" $block.ranks.children - "options" $options - ) }} + "pages" .pages + "heading_level" $block.ranks.children + "options" $options + ) }} diff --git a/layouts/partials/blocks/templates/papers.html b/layouts/_partials/blocks/templates/papers.html similarity index 75% rename from layouts/partials/blocks/templates/papers.html rename to layouts/_partials/blocks/templates/papers.html index 54d7c1199..b5fada5c0 100644 --- a/layouts/partials/blocks/templates/papers.html +++ b/layouts/_partials/blocks/templates/papers.html @@ -8,17 +8,17 @@
    {{ partial "blocks/top.html" $block.top }} -
    +
      {{ range .papers -}} {{ with site.GetPage .path }} {{ partial "papers/partials/paper.html" (dict - "paper" . - "actions" false - "heading_level" $block.ranks.children - )}} + "paper" . + "actions" false + "heading_level" $block.ranks.children + ) }} {{ end }} {{ end}} -
    +
    diff --git a/layouts/partials/blocks/templates/persons.html b/layouts/_partials/blocks/templates/persons.html similarity index 64% rename from layouts/partials/blocks/templates/persons.html rename to layouts/_partials/blocks/templates/persons.html index cc81536af..cfb5df9dd 100644 --- a/layouts/partials/blocks/templates/persons.html +++ b/layouts/_partials/blocks/templates/persons.html @@ -6,7 +6,7 @@ {{- with .block.data -}} {{ $layout := .layout | default "grid" }} {{ $options := .options }} - {{ $image_sizes := index site.Params.image_sizes.blocks.persons $layout }} + {{ $image_sizes := index site.Params.image_sizes.sections.persons.layouts $layout }} {{ range .persons }} {{- $person := site.GetPage .path -}} {{- $role := .role -}} @@ -19,7 +19,7 @@ {{ end }} {{ end }} - {{ if $is_large }} + {{ if and $is_large $options.summary }} {{ $block_class = printf "%s block-with-long-text" $block_class }} {{ end }} @@ -31,27 +31,19 @@
    {{ partial "blocks/top.html" $block.top }} - - {{ if eq .layout "list" }} - {{ partial "persons/partials/layouts/list/list.html" (dict - "options" $options - "block" $block - )}} - {{ else }} -
    +
      {{- range .persons -}} {{ $person := site.GetPage .path }} {{ partial "persons/partials/person.html" (dict - "options" $options - "heading_level" $block.ranks.children - "person" $person - "role" .role - "layout" $layout - "image_sizes" $image_sizes - )}} + "options" $options + "heading_level" $block.ranks.children + "person" $person + "role" .role + "layout" $layout + "image_sizes" $image_sizes + ) }} {{- end -}} -
    - {{ end }} +
    diff --git a/layouts/partials/blocks/templates/posts.html b/layouts/_partials/blocks/templates/posts.html similarity index 99% rename from layouts/partials/blocks/templates/posts.html rename to layouts/_partials/blocks/templates/posts.html index d0bfd4f67..631064196 100644 --- a/layouts/partials/blocks/templates/posts.html +++ b/layouts/_partials/blocks/templates/posts.html @@ -33,7 +33,7 @@ "posts" .posts "heading_level" $block.ranks.children "options" $options - )}} + ) }} {{ end }} diff --git a/layouts/partials/blocks/templates/programs.html b/layouts/_partials/blocks/templates/programs.html similarity index 62% rename from layouts/partials/blocks/templates/programs.html rename to layouts/_partials/blocks/templates/programs.html index 8fc33e3c1..ea213d1c3 100644 --- a/layouts/partials/blocks/templates/programs.html +++ b/layouts/_partials/blocks/templates/programs.html @@ -1,25 +1,27 @@ {{ $block := .block }} +{{ $layout := $block.data.layout }} {{ $block_class := partial "GetBlockClass" .block }} {{ with .block.data }} {{ $options := .options }} + {{ $layout := .layout }}
    {{ partial "blocks/top.html" $block.top }} - {{ if eq $block.data.layout "grid" }} -
    + {{ if eq $layout "grid" }} +
      diff --git a/layouts/partials/categories/partials/category.html b/layouts/_partials/categories/partials/category.html similarity index 100% rename from layouts/partials/categories/partials/category.html rename to layouts/_partials/categories/partials/category.html diff --git a/layouts/partials/categories/partials/category/articles-count.html b/layouts/_partials/categories/partials/category/articles-count.html similarity index 100% rename from layouts/partials/categories/partials/category/articles-count.html rename to layouts/_partials/categories/partials/category/articles-count.html diff --git a/layouts/partials/categories/partials/category/heading.html b/layouts/_partials/categories/partials/category/heading.html similarity index 100% rename from layouts/partials/categories/partials/category/heading.html rename to layouts/_partials/categories/partials/category/heading.html diff --git a/layouts/_partials/categories/partials/category/media.html b/layouts/_partials/categories/partials/category/media.html new file mode 100644 index 000000000..6f764da81 --- /dev/null +++ b/layouts/_partials/categories/partials/category/media.html @@ -0,0 +1,5 @@ +{{ partial "commons/item/media.html" (dict + "image" .image + "type" "categories" + "layout" .layout +) }} \ No newline at end of file diff --git a/layouts/partials/categories/partials/category/summary.html b/layouts/_partials/categories/partials/category/summary.html similarity index 100% rename from layouts/partials/categories/partials/category/summary.html rename to layouts/_partials/categories/partials/category/summary.html diff --git a/layouts/partials/categories/partials/layouts/alternate/alternate-item.html b/layouts/_partials/categories/partials/layouts/alternate/alternate-item.html similarity index 100% rename from layouts/partials/categories/partials/layouts/alternate/alternate-item.html rename to layouts/_partials/categories/partials/layouts/alternate/alternate-item.html diff --git a/layouts/partials/categories/partials/layouts/alternate/alternate.html b/layouts/_partials/categories/partials/layouts/alternate/alternate.html similarity index 79% rename from layouts/partials/categories/partials/layouts/alternate/alternate.html rename to layouts/_partials/categories/partials/layouts/alternate/alternate.html index d468a6eda..b78d2a378 100644 --- a/layouts/partials/categories/partials/layouts/alternate/alternate.html +++ b/layouts/_partials/categories/partials/layouts/alternate/alternate.html @@ -14,11 +14,11 @@
    1. {{ partial "categories/partials/layouts/alternate/alternate-item.html" (dict - "category" . - "heading_level" $heading_level - "options" $options - "layout" "alternate" - ) }} + "category" . + "heading_level" $heading_level + "options" $options + "layout" "alternate" + ) }}
      2. {{ end }} diff --git a/layouts/partials/categories/partials/layouts/cards/cards-item.html b/layouts/_partials/categories/partials/layouts/cards/cards-item.html similarity index 100% rename from layouts/partials/categories/partials/layouts/cards/cards-item.html rename to layouts/_partials/categories/partials/layouts/cards/cards-item.html diff --git a/layouts/partials/categories/partials/layouts/cards/cards.html b/layouts/_partials/categories/partials/layouts/cards/cards.html similarity index 67% rename from layouts/partials/categories/partials/layouts/cards/cards.html rename to layouts/_partials/categories/partials/layouts/cards/cards.html index b8bded811..f207ca8ae 100644 --- a/layouts/partials/categories/partials/layouts/cards/cards.html +++ b/layouts/_partials/categories/partials/layouts/cards/cards.html @@ -6,11 +6,11 @@ {{ range $categories }}
    2. {{ partial "categories/partials/layouts/cards/cards-item.html" (dict - "category" . - "heading_level" $heading_level - "options" $options - "layout" "cards" - ) }} + "category" . + "heading_level" $heading_level + "options" $options + "layout" "cards" + ) }}
      3. {{ end }} diff --git a/layouts/partials/categories/partials/layouts/grid/grid-item.html b/layouts/_partials/categories/partials/layouts/grid/grid-item.html similarity index 100% rename from layouts/partials/categories/partials/layouts/grid/grid-item.html rename to layouts/_partials/categories/partials/layouts/grid/grid-item.html diff --git a/layouts/partials/categories/partials/layouts/grid/grid.html b/layouts/_partials/categories/partials/layouts/grid/grid.html similarity index 67% rename from layouts/partials/categories/partials/layouts/grid/grid.html rename to layouts/_partials/categories/partials/layouts/grid/grid.html index 4cead378c..32d7436c3 100644 --- a/layouts/partials/categories/partials/layouts/grid/grid.html +++ b/layouts/_partials/categories/partials/layouts/grid/grid.html @@ -6,11 +6,11 @@ {{ range $categories }}
    3. {{ partial "categories/partials/layouts/grid/grid-item.html" (dict - "category" . - "heading_level" $heading_level - "options" $options - "layout" "grid" - ) }} + "category" . + "heading_level" $heading_level + "options" $options + "layout" "grid" + ) }}
      4. {{ end }} diff --git a/layouts/partials/categories/partials/layouts/large/large-item.html b/layouts/_partials/categories/partials/layouts/large/large-item.html similarity index 100% rename from layouts/partials/categories/partials/layouts/large/large-item.html rename to layouts/_partials/categories/partials/layouts/large/large-item.html diff --git a/layouts/partials/categories/partials/layouts/large/large.html b/layouts/_partials/categories/partials/layouts/large/large.html similarity index 67% rename from layouts/partials/categories/partials/layouts/large/large.html rename to layouts/_partials/categories/partials/layouts/large/large.html index a30c7f6eb..fe4f556c1 100644 --- a/layouts/partials/categories/partials/layouts/large/large.html +++ b/layouts/_partials/categories/partials/layouts/large/large.html @@ -6,11 +6,11 @@ {{ range $categories }}
    4. {{ partial "categories/partials/layouts/large/large-item.html" (dict - "category" . - "heading_level" $heading_level - "options" $options - "layout" "large" - ) }} + "category" . + "heading_level" $heading_level + "options" $options + "layout" "large" + ) }}
      5. {{ end }} diff --git a/layouts/partials/categories/partials/layouts/list/list-item.html b/layouts/_partials/categories/partials/layouts/list/list-item.html similarity index 100% rename from layouts/partials/categories/partials/layouts/list/list-item.html rename to layouts/_partials/categories/partials/layouts/list/list-item.html diff --git a/layouts/partials/categories/partials/layouts/list/list.html b/layouts/_partials/categories/partials/layouts/list/list.html similarity index 67% rename from layouts/partials/categories/partials/layouts/list/list.html rename to layouts/_partials/categories/partials/layouts/list/list.html index ae6c855dd..2be0ade7b 100644 --- a/layouts/partials/categories/partials/layouts/list/list.html +++ b/layouts/_partials/categories/partials/layouts/list/list.html @@ -6,11 +6,11 @@ {{ range $categories }}
    5. {{ partial "categories/partials/layouts/list/list-item.html" (dict - "category" . - "heading_level" $heading_level - "options" $options - "layout" "list" - ) }} + "category" . + "heading_level" $heading_level + "options" $options + "layout" "list" + ) }}
      6. {{ end }} diff --git a/layouts/partials/categories/section.html b/layouts/_partials/categories/section.html similarity index 79% rename from layouts/partials/categories/section.html rename to layouts/_partials/categories/section.html index b3a6b14e1..da4d185c5 100644 --- a/layouts/partials/categories/section.html +++ b/layouts/_partials/categories/section.html @@ -2,14 +2,14 @@
      {{ partial "toc/container.html" (dict - "toc" "toc/default.html" - "context" . - ) }} + "toc" "toc/default.html" + "context" . + ) }} {{ partial "categories/section/summary.html" (dict - "context" . - "block_wrapped" true - ) }} + "context" . + "block_wrapped" true + ) }} {{ if (partial "IsFirstPage" .) }} {{ partial "contents/list.html" (dict diff --git a/layouts/partials/categories/section/categories.html b/layouts/_partials/categories/section/categories.html similarity index 81% rename from layouts/partials/categories/section/categories.html rename to layouts/_partials/categories/section/categories.html index dc15430d4..205e57e62 100644 --- a/layouts/partials/categories/section/categories.html +++ b/layouts/_partials/categories/section/categories.html @@ -8,7 +8,7 @@ {{ end }} {{ partial $layout_partial (dict - "categories" $categories - "heading_level" 2 - "options" $options - ) }} + "categories" $categories + "heading_level" 2 + "options" $options +) }} diff --git a/layouts/partials/categories/section/hero.html b/layouts/_partials/categories/section/hero.html similarity index 54% rename from layouts/partials/categories/section/hero.html rename to layouts/_partials/categories/section/hero.html index c0434ce81..2d2c41faa 100644 --- a/layouts/partials/categories/section/hero.html +++ b/layouts/_partials/categories/section/hero.html @@ -6,10 +6,9 @@ {{ end }} {{ end }} -{{- partial "header/hero.html" - (dict - "title" $title - "image" .Params.image - "sizes" site.Params.image_sizes.sections.categories.hero - "context" . - ) -}} +{{- partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.categories.hero + "context" . +) -}} diff --git a/layouts/partials/categories/section/summary.html b/layouts/_partials/categories/section/summary.html similarity index 100% rename from layouts/partials/categories/section/summary.html rename to layouts/_partials/categories/section/summary.html diff --git a/layouts/partials/categories/single.html b/layouts/_partials/categories/single.html similarity index 83% rename from layouts/partials/categories/single.html rename to layouts/_partials/categories/single.html index 080539165..88fe99097 100644 --- a/layouts/partials/categories/single.html +++ b/layouts/_partials/categories/single.html @@ -11,6 +11,8 @@ "block_wrapped" true ) }} + {{ partial "taxonomies/term-list-container.html" (dict "taxonomy" .Type) }} + {{ partial "contents/list.html" (dict "context" . "contents" .Params.contents @@ -23,7 +25,7 @@
      {{ $section_type := strings.TrimSuffix "_categories" .Type }} {{ $list_partial := printf "%s/partials/%s.html" $section_type $section_type }} - {{ if templates.Exists ( printf "partials/%s" $list_partial ) }} + {{ if templates.Exists ( printf "_partials/%s" $list_partial ) }} {{ partial $list_partial . }} {{ end }} {{ partial "commons/pagination.html" . }} diff --git a/layouts/partials/categories/single/categories.html b/layouts/_partials/categories/single/categories.html similarity index 94% rename from layouts/partials/categories/single/categories.html rename to layouts/_partials/categories/single/categories.html index 08e75d05f..1d657dfbc 100644 --- a/layouts/partials/categories/single/categories.html +++ b/layouts/_partials/categories/single/categories.html @@ -9,5 +9,5 @@ {{ end }} {{ end }} - -
      \ No newline at end of file + +
      \ No newline at end of file diff --git a/layouts/_partials/categories/single/hero.html b/layouts/_partials/categories/single/hero.html new file mode 100644 index 000000000..d9b0c12b5 --- /dev/null +++ b/layouts/_partials/categories/single/hero.html @@ -0,0 +1,7 @@ +{{- $title := or .Params.header_text .Title -}} +{{- partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.categories.hero_term + "context" . +) -}} diff --git a/layouts/partials/categories/single/summary.html b/layouts/_partials/categories/single/summary.html similarity index 100% rename from layouts/partials/categories/single/summary.html rename to layouts/_partials/categories/single/summary.html diff --git a/layouts/partials/commons/address.html b/layouts/_partials/commons/address.html similarity index 100% rename from layouts/partials/commons/address.html rename to layouts/_partials/commons/address.html diff --git a/layouts/partials/commons/agenda/access.html b/layouts/_partials/commons/agenda/access.html similarity index 100% rename from layouts/partials/commons/agenda/access.html rename to layouts/_partials/commons/agenda/access.html diff --git a/layouts/partials/commons/agenda/dates.html b/layouts/_partials/commons/agenda/dates.html similarity index 92% rename from layouts/partials/commons/agenda/dates.html rename to layouts/_partials/commons/agenda/dates.html index d48457112..dfe98b200 100644 --- a/layouts/partials/commons/agenda/dates.html +++ b/layouts/_partials/commons/agenda/dates.html @@ -19,9 +19,9 @@

      {{ i18n "commons.date" (cond $has_primary_date 2 {{ with .Params.dates }} {{ if ne .status "archive" }} {{ partial "commons/agenda/dropdown-calendar.html" (dict - "index" "primary" - "calendar_links" .add_to_calendar - )}} + "index" "primary" + "calendar_links" .add_to_calendar + ) }} {{ end }} {{ end }} @@ -47,9 +47,9 @@

      {{ i18n "commons.date" (cond $has_primary_date 2 {{ end }} {{ if ne .status "archive" }} {{ partial "commons/agenda/dropdown-calendar.html" (dict - "index" $index - "calendar_links" $time_slot.add_to_calendar - )}} + "index" $index + "calendar_links" $time_slot.add_to_calendar + ) }} {{ end }} {{ end }} diff --git a/layouts/partials/commons/agenda/dropdown-calendar.html b/layouts/_partials/commons/agenda/dropdown-calendar.html similarity index 100% rename from layouts/partials/commons/agenda/dropdown-calendar.html rename to layouts/_partials/commons/agenda/dropdown-calendar.html diff --git a/layouts/partials/commons/agenda/practicals.html b/layouts/_partials/commons/agenda/practicals.html similarity index 100% rename from layouts/partials/commons/agenda/practicals.html rename to layouts/_partials/commons/agenda/practicals.html diff --git a/layouts/partials/commons/alerts/alert.html b/layouts/_partials/commons/alerts/alert.html similarity index 100% rename from layouts/partials/commons/alerts/alert.html rename to layouts/_partials/commons/alerts/alert.html diff --git a/layouts/partials/commons/alerts/list.html b/layouts/_partials/commons/alerts/list.html similarity index 100% rename from layouts/partials/commons/alerts/list.html rename to layouts/_partials/commons/alerts/list.html diff --git a/layouts/partials/commons/categories.html b/layouts/_partials/commons/categories.html similarity index 100% rename from layouts/partials/commons/categories.html rename to layouts/_partials/commons/categories.html diff --git a/layouts/partials/commons/contact-details.html b/layouts/_partials/commons/contact-details.html similarity index 73% rename from layouts/partials/commons/contact-details.html rename to layouts/_partials/commons/contact-details.html index ea7427392..251b231a5 100644 --- a/layouts/partials/commons/contact-details.html +++ b/layouts/_partials/commons/contact-details.html @@ -11,19 +11,19 @@ {{ i18n "commons.contact.website" }} {{ end }} {{ partial "commons/links/website.html" (dict - "value" .value - "label" .label - "title" (i18n "commons.contact.socials.label.website" (dict "name" $name )) - ) }} + "value" .value + "label" .label + "title" (i18n "commons.contact.socials.label.website" (dict "name" $name )) + ) }} {{ end }} {{ partial "commons/socials" (dict - "context" . - "name" $name - "with_labels" $with_labels - "in_itemscope" true - ) }} + "context" . + "name" $name + "with_labels" $with_labels + "in_itemscope" true + ) }} {{ with .phone_numbers }} {{ with or .phone_mobile .phone }} @@ -32,10 +32,10 @@ {{ i18n "commons.contact.phone.label" }} {{ end }} {{ partial "commons/links/tel.html" (dict - "value" .value - "label" .label - "title" (i18n "commons.contact.phone.a11y_label" (dict "phone_number" .label)) - ) }} + "value" .value + "label" .label + "title" (i18n "commons.contact.phone.a11y_label" (dict "phone_number" .label)) + ) }} {{ end }} @@ -45,10 +45,10 @@ {{ i18n "commons.contact.phone_professional.label" }} {{ end }} {{ partial "commons/links/tel.html" (dict - "value" .value - "label" .label - "title" (i18n "commons.contact.phone_professional.a11y_label" (dict "phone_number" .label )) - ) }} + "value" .value + "label" .label + "title" (i18n "commons.contact.phone_professional.a11y_label" (dict "phone_number" .label )) + ) }} {{ end }} {{ end }} diff --git a/layouts/partials/commons/download-link.html b/layouts/_partials/commons/download-link.html similarity index 100% rename from layouts/partials/commons/download-link.html rename to layouts/_partials/commons/download-link.html diff --git a/layouts/partials/commons/extension-and-size.html b/layouts/_partials/commons/extension-and-size.html similarity index 100% rename from layouts/partials/commons/extension-and-size.html rename to layouts/_partials/commons/extension-and-size.html diff --git a/layouts/partials/commons/i18n.html b/layouts/_partials/commons/i18n.html similarity index 100% rename from layouts/partials/commons/i18n.html rename to layouts/_partials/commons/i18n.html diff --git a/layouts/partials/commons/image-default.html b/layouts/_partials/commons/image-default.html similarity index 86% rename from layouts/partials/commons/image-default.html rename to layouts/_partials/commons/image-default.html index 5fa627a34..453a46c48 100644 --- a/layouts/partials/commons/image-default.html +++ b/layouts/_partials/commons/image-default.html @@ -7,8 +7,8 @@ {{ $sizes := .item }} {{- partial "commons/image.html" (dict - "image" $image - "sizes" $sizes - ) -}} + "image" $image + "sizes" $sizes + ) -}} {{ end }} {{- end -}} diff --git a/layouts/partials/commons/image-figure.html b/layouts/_partials/commons/image-figure.html similarity index 83% rename from layouts/partials/commons/image-figure.html rename to layouts/_partials/commons/image-figure.html index 1758816e7..b365d5c5a 100644 --- a/layouts/partials/commons/image-figure.html +++ b/layouts/_partials/commons/image-figure.html @@ -8,9 +8,9 @@ {{ $image := partial "GetMedia" .image.id }} {{ $image_class := .image_class | default "" }} {{ $image_class = printf "%s image-%s" $image_class (partial "GetImageDirection" .image) }} - {{ $with_lightbox := not site.Params.image_sizes.design_system.lightbox.disabled }} + {{ $with_lightbox := not site.Params.components.lightbox.disabled }} {{ if and $with_lightbox $in_gallery }} - {{ $with_lightbox = not site.Params.image_sizes.design_system.lightbox.in_gallery.disabled }} + {{ $with_lightbox = not site.Params.components.lightbox.in_gallery.disabled }} {{ end }} {{ if $image }} @@ -23,11 +23,11 @@ {{ end }} > {{ $image_tag := partial "commons/image.html" (dict - "image" .id - "alt" .alt - "sizes" $sizes - "lazy" $lazy - "crop" $crop + "image" .id + "alt" .alt + "sizes" $sizes + "lazy" $lazy + "crop" $crop ) }} {{ if $with_lightbox }} diff --git a/layouts/partials/commons/image.html b/layouts/_partials/commons/image.html similarity index 100% rename from layouts/partials/commons/image.html rename to layouts/_partials/commons/image.html diff --git a/layouts/partials/commons/item/federated.html b/layouts/_partials/commons/item/federated.html similarity index 100% rename from layouts/partials/commons/item/federated.html rename to layouts/_partials/commons/item/federated.html diff --git a/layouts/partials/commons/item/heading.html b/layouts/_partials/commons/item/heading.html similarity index 100% rename from layouts/partials/commons/item/heading.html rename to layouts/_partials/commons/item/heading.html diff --git a/layouts/partials/commons/item/media.html b/layouts/_partials/commons/item/media.html similarity index 67% rename from layouts/partials/commons/item/media.html rename to layouts/_partials/commons/item/media.html index 5db01539a..99cf4421f 100644 --- a/layouts/partials/commons/item/media.html +++ b/layouts/_partials/commons/item/media.html @@ -1,6 +1,6 @@ {{ $image := .image }} {{ $type := .type | default "page" }} -{{ $layout := .layout | default "item" }} +{{ $layout := .layout }} {{ $sizes := .sizes }} {{ $class := "media" }} {{ with .class }} @@ -9,17 +9,17 @@ {{ if not $sizes }} {{ $sizes = partial "GetSiteParamWithDefault" (dict - "param" (printf "image_sizes.sections.%s.%s" $type $layout) - "default" "image_sizes.design_system.item" + "param" (printf "image_sizes.sections.%s.layouts.%s" $type $layout) + "default" (printf "image_sizes._default.layouts.%s" $layout) ) }} {{ end }}
      {{- if $image -}} {{- partial "commons/image.html" (dict - "image" $image - "sizes" $sizes - ) -}} + "image" $image + "sizes" $sizes + ) -}} {{- else -}} {{- partial "commons/image-default.html" $type -}} {{- end -}} diff --git a/layouts/partials/commons/item/more.html b/layouts/_partials/commons/item/more.html similarity index 100% rename from layouts/partials/commons/item/more.html rename to layouts/_partials/commons/item/more.html diff --git a/layouts/partials/commons/item/schedule.html b/layouts/_partials/commons/item/schedule.html similarity index 96% rename from layouts/partials/commons/item/schedule.html rename to layouts/_partials/commons/item/schedule.html index 86d6cb813..568e3d7c9 100644 --- a/layouts/partials/commons/item/schedule.html +++ b/layouts/_partials/commons/item/schedule.html @@ -4,7 +4,7 @@ {{ $on_two_lines := .on_two_lines }} {{ $with_hours := .with_hours }} {{ $type := .type }} -{{ $date_format := index site.Params (printf "%ss" $type) "date_format" }} +{{ $date_format := index site.Params (pluralize $type) "date_format" }} {{ $time_format := ( i18n "commons.time_format" ) }} {{ if or $dates.computed.short $dates.computed.two_lines.short $time_slot }} diff --git a/layouts/partials/commons/item/status.html b/layouts/_partials/commons/item/status.html similarity index 78% rename from layouts/partials/commons/item/status.html rename to layouts/_partials/commons/item/status.html index 8cc6dd6d5..b2bd9d438 100644 --- a/layouts/partials/commons/item/status.html +++ b/layouts/_partials/commons/item/status.html @@ -1,5 +1,5 @@ {{ $status := .status }} -{{ $type := .type }} +{{ $type := pluralize .type }}

      {{ i18n (printf "%s.status.%s" $type $status) }} diff --git a/layouts/partials/commons/item/summary.html b/layouts/_partials/commons/item/summary.html similarity index 75% rename from layouts/partials/commons/item/summary.html rename to layouts/_partials/commons/item/summary.html index 6c8284f0f..b9ec4b77e 100644 --- a/layouts/partials/commons/item/summary.html +++ b/layouts/_partials/commons/item/summary.html @@ -4,8 +4,8 @@ {{ with $summary }}

      {{ partial "GetRichSummary" ( dict - "summary" $summary - "kind" $type - )}} + "summary" $summary + "kind" $type + ) }}
      {{ end }} \ No newline at end of file diff --git a/layouts/partials/commons/lang-switch.html b/layouts/_partials/commons/lang-switch.html similarity index 100% rename from layouts/partials/commons/lang-switch.html rename to layouts/_partials/commons/lang-switch.html diff --git a/layouts/partials/commons/lightbox/button.html b/layouts/_partials/commons/lightbox/button.html similarity index 84% rename from layouts/partials/commons/lightbox/button.html rename to layouts/_partials/commons/lightbox/button.html index 150620d30..c23c7e73f 100644 --- a/layouts/partials/commons/lightbox/button.html +++ b/layouts/_partials/commons/lightbox/button.html @@ -17,8 +17,8 @@ {{ $title = i18n "commons.lightbox.button" }} {{ end }} - +
      {{ end }} \ No newline at end of file diff --git a/layouts/partials/commons/lightbox/lightbox.html b/layouts/_partials/commons/lightbox/lightbox.html similarity index 100% rename from layouts/partials/commons/lightbox/lightbox.html rename to layouts/_partials/commons/lightbox/lightbox.html diff --git a/layouts/partials/commons/links/tel.html b/layouts/_partials/commons/links/tel.html similarity index 100% rename from layouts/partials/commons/links/tel.html rename to layouts/_partials/commons/links/tel.html diff --git a/layouts/partials/commons/links/website.html b/layouts/_partials/commons/links/website.html similarity index 100% rename from layouts/partials/commons/links/website.html rename to layouts/_partials/commons/links/website.html diff --git a/layouts/partials/commons/logo.html b/layouts/_partials/commons/logo.html similarity index 100% rename from layouts/partials/commons/logo.html rename to layouts/_partials/commons/logo.html diff --git a/layouts/partials/commons/menu-dropdown.html b/layouts/_partials/commons/menu-dropdown.html similarity index 92% rename from layouts/partials/commons/menu-dropdown.html rename to layouts/_partials/commons/menu-dropdown.html index ebd52f867..c07ab738f 100644 --- a/layouts/partials/commons/menu-dropdown.html +++ b/layouts/_partials/commons/menu-dropdown.html @@ -22,9 +22,9 @@ {{ end }} {{ if $parent.path }} {{ with partial "GetMenuSummary" (dict - "summary" .summary - "path" $parent.path - )}} + "summary" .summary + "path" $parent.path + ) }}
      {{ . }}
      diff --git a/layouts/partials/commons/menu.html b/layouts/_partials/commons/menu.html similarity index 90% rename from layouts/partials/commons/menu.html rename to layouts/_partials/commons/menu.html index f5687761c..863619cb8 100644 --- a/layouts/partials/commons/menu.html +++ b/layouts/_partials/commons/menu.html @@ -64,9 +64,9 @@ {{ .title | markdownify }}       {{ partial "GetMenuSummary" (dict - "summary" $level_options.summary - "path" .path - ) }} + "summary" $level_options.summary + "path" .path + ) }} {{- else -}} {{ if gt .level 1 }} {{ $link_class = printf "%s disabled" $link_class }} @@ -77,18 +77,18 @@ {{- if and (ne $stop $level) (gt (len .children) 0) -}} {{- $next_level := add $level 1 -}} {{- $submenu := partial "commons/menu.html" (dict - "items" .children - "level" $next_level - "options" $options - "context" $context - ) -}} + "items" .children + "level" $next_level + "options" $options + "context" $context + ) -}} {{- if $has_dropdown }} {{ partial "commons/menu-dropdown" (dict - "parent" . - "level" $next_level - "options" $options - "submenu" $submenu - )}} + "parent" . + "level" $next_level + "options" $options + "submenu" $submenu + ) }} {{- else -}} {{- $submenu -}} {{- end -}} @@ -107,8 +107,8 @@ {{ end }} {{ if in site.Params.i18n.positions $kind }} {{ partial "commons/i18n.html" (dict - "context" $context - "position" $kind - )}} + "context" $context + "position" $kind + ) }} {{ end }} diff --git a/layouts/partials/commons/pagination.html b/layouts/_partials/commons/pagination.html similarity index 100% rename from layouts/partials/commons/pagination.html rename to layouts/_partials/commons/pagination.html diff --git a/layouts/partials/commons/reading-time.html b/layouts/_partials/commons/reading-time.html similarity index 100% rename from layouts/partials/commons/reading-time.html rename to layouts/_partials/commons/reading-time.html diff --git a/layouts/partials/commons/search/button.html b/layouts/_partials/commons/search/button.html similarity index 100% rename from layouts/partials/commons/search/button.html rename to layouts/_partials/commons/search/button.html diff --git a/layouts/_partials/commons/search/modal.html b/layouts/_partials/commons/search/modal.html new file mode 100644 index 000000000..e6d1c3f6b --- /dev/null +++ b/layouts/_partials/commons/search/modal.html @@ -0,0 +1,13 @@ +{{ if site.Params.search.active }} + + + + +{{ end }} \ No newline at end of file diff --git a/layouts/partials/commons/section/archive-link.html b/layouts/_partials/commons/section/archive-link.html similarity index 100% rename from layouts/partials/commons/section/archive-link.html rename to layouts/_partials/commons/section/archive-link.html diff --git a/layouts/partials/commons/share/dropdown.html b/layouts/_partials/commons/share/dropdown.html similarity index 100% rename from layouts/partials/commons/share/dropdown.html rename to layouts/_partials/commons/share/dropdown.html diff --git a/layouts/partials/commons/share/links.html b/layouts/_partials/commons/share/links.html similarity index 100% rename from layouts/partials/commons/share/links.html rename to layouts/_partials/commons/share/links.html diff --git a/layouts/partials/commons/share/list-item.html b/layouts/_partials/commons/share/list-item.html similarity index 100% rename from layouts/partials/commons/share/list-item.html rename to layouts/_partials/commons/share/list-item.html diff --git a/layouts/partials/commons/siblings-navigation.html b/layouts/_partials/commons/siblings-navigation.html similarity index 100% rename from layouts/partials/commons/siblings-navigation.html rename to layouts/_partials/commons/siblings-navigation.html diff --git a/layouts/partials/commons/socials.html b/layouts/_partials/commons/socials.html similarity index 100% rename from layouts/partials/commons/socials.html rename to layouts/_partials/commons/socials.html diff --git a/layouts/partials/commons/summary-in-content.html b/layouts/_partials/commons/summary-in-content.html similarity index 100% rename from layouts/partials/commons/summary-in-content.html rename to layouts/_partials/commons/summary-in-content.html diff --git a/layouts/partials/commons/transcription.html b/layouts/_partials/commons/transcription.html similarity index 100% rename from layouts/partials/commons/transcription.html rename to layouts/_partials/commons/transcription.html diff --git a/layouts/partials/contents/backlinks.html b/layouts/_partials/contents/backlinks.html similarity index 91% rename from layouts/partials/contents/backlinks.html rename to layouts/_partials/contents/backlinks.html index 6e2cf2a7c..a29eb0147 100644 --- a/layouts/partials/contents/backlinks.html +++ b/layouts/_partials/contents/backlinks.html @@ -35,9 +35,9 @@ {{ with .events }} {{ $title := i18n (printf "%s.backlinks.events" $type) }} {{ $params = partial "GetLayoutAndOptions" (dict - "param" "persons.single.events" - "default" "events.index" - ) }} + "param" "persons.single.events" + "default" "events.index" + ) }} {{ partial "blocks/templates/agenda.html" (dict "block" (dict "top" (dict @@ -63,9 +63,9 @@ {{ with .pages }} {{ $title := i18n (printf "%s.backlinks.pages" $type) }} {{ $params = partial "GetLayoutAndOptions" (dict - "param" "persons.single.pages" - "default" "pages.index" - ) }} + "param" "persons.single.pages" + "default" "pages.index" + ) }} {{ partial "blocks/templates/pages.html" (dict "block" (dict "top" (dict @@ -91,9 +91,9 @@ {{ with .projects }} {{ $title := i18n (printf "%s.backlinks.projects" $type) }} {{ $params = partial "GetLayoutAndOptions" (dict - "param" "persons.single.projects" - "default" "projects.index" - ) }} + "param" "persons.single.projects" + "default" "projects.index" + ) }} {{ partial "blocks/templates/projects.html" (dict "block" (dict "top" (dict @@ -119,9 +119,9 @@ {{ with .posts }} {{ $title := i18n (printf "%s.backlinks.posts" $type) }} {{ $params = partial "GetLayoutAndOptions" (dict - "param" "persons.single.posts" - "default" "posts.index" - ) }} + "param" "persons.single.posts" + "default" "posts.index" + ) }} {{ partial "blocks/templates/posts.html" (dict "block" (dict "top" (dict diff --git a/layouts/partials/contents/list.html b/layouts/_partials/contents/list.html similarity index 86% rename from layouts/partials/contents/list.html rename to layouts/_partials/contents/list.html index ce275ba7e..3583d8cb1 100644 --- a/layouts/partials/contents/list.html +++ b/layouts/_partials/contents/list.html @@ -21,12 +21,12 @@ {{ end }} - {{ if templates.Exists ( printf "partials/%s" $template ) }} + {{ if templates.Exists ( printf "_partials/%s" $template ) }} {{ partial $template (dict - "block" $content - "context" $context - "index" $index - )}} + "block" $content + "context" $context + "index" $index + ) }} {{ end }} {{ if and $is_title $is_layout_collapsed }} diff --git a/layouts/partials/diplomas/partials/diplomas.html b/layouts/_partials/diplomas/partials/diplomas.html similarity index 100% rename from layouts/partials/diplomas/partials/diplomas.html rename to layouts/_partials/diplomas/partials/diplomas.html diff --git a/layouts/partials/diplomas/section.html b/layouts/_partials/diplomas/section.html similarity index 88% rename from layouts/partials/diplomas/section.html rename to layouts/_partials/diplomas/section.html index b020abe2e..1c36ef6c8 100644 --- a/layouts/partials/diplomas/section.html +++ b/layouts/_partials/diplomas/section.html @@ -3,9 +3,9 @@
      {{ partial "diplomas/section/summary.html" (dict - "with_container" true - "context" . - ) }} + "with_container" true + "context" . + ) }} {{ if (partial "IsFirstPage" .) }} {{ partial "contents/list.html" (dict diff --git a/layouts/partials/diplomas/section/diplomas-select.html b/layouts/_partials/diplomas/section/diplomas-select.html similarity index 100% rename from layouts/partials/diplomas/section/diplomas-select.html rename to layouts/_partials/diplomas/section/diplomas-select.html diff --git a/layouts/_partials/diplomas/section/hero.html b/layouts/_partials/diplomas/section/hero.html new file mode 100644 index 000000000..b77efef12 --- /dev/null +++ b/layouts/_partials/diplomas/section/hero.html @@ -0,0 +1,7 @@ +{{- $title := or .Params.header_text .Title -}} +{{- partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.diplomas.hero + "context" . +) -}} diff --git a/layouts/partials/diplomas/section/summary.html b/layouts/_partials/diplomas/section/summary.html similarity index 100% rename from layouts/partials/diplomas/section/summary.html rename to layouts/_partials/diplomas/section/summary.html diff --git a/layouts/partials/diplomas/single.html b/layouts/_partials/diplomas/single.html similarity index 90% rename from layouts/partials/diplomas/single.html rename to layouts/_partials/diplomas/single.html index 034324f84..18a6f257f 100644 --- a/layouts/partials/diplomas/single.html +++ b/layouts/_partials/diplomas/single.html @@ -3,9 +3,9 @@
      {{ partial "diplomas/single/summary.html" (dict - "context" . - "block_wrapped" true - ) }} + "context" . + "block_wrapped" true + ) }} {{ partial "contents/list.html" (dict "context" . @@ -19,9 +19,9 @@ {{/* TODO Cleanup figma and reduce number of program layout */}} {{ if $programs_options }} {{ partial "programs/partials/program.html" (dict - "program" . - "options" $programs_options - )}} + "program" . + "options" $programs_options + ) }} {{ else }}
    6. {{- $title := partial "PrepareHTML" .Title -}} diff --git a/layouts/partials/diplomas/single/certification-logo.html b/layouts/_partials/diplomas/single/certification-logo.html similarity index 100% rename from layouts/partials/diplomas/single/certification-logo.html rename to layouts/_partials/diplomas/single/certification-logo.html diff --git a/layouts/_partials/diplomas/single/hero.html b/layouts/_partials/diplomas/single/hero.html new file mode 100644 index 000000000..324522fa9 --- /dev/null +++ b/layouts/_partials/diplomas/single/hero.html @@ -0,0 +1,8 @@ +{{- $title := or .Params.header_text .Title -}} +{{ partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.home.hero + "context" . + "hero_complement" "diplomas/single/hero/essential.html" +) }} diff --git a/layouts/partials/diplomas/single/hero/essential.html b/layouts/_partials/diplomas/single/hero/essential.html similarity index 100% rename from layouts/partials/diplomas/single/hero/essential.html rename to layouts/_partials/diplomas/single/hero/essential.html diff --git a/layouts/partials/diplomas/single/summary.html b/layouts/_partials/diplomas/single/summary.html similarity index 100% rename from layouts/partials/diplomas/single/summary.html rename to layouts/_partials/diplomas/single/summary.html diff --git a/layouts/_partials/events/partials/agenda.html b/layouts/_partials/events/partials/agenda.html new file mode 100644 index 000000000..74158403b --- /dev/null +++ b/layouts/_partials/events/partials/agenda.html @@ -0,0 +1,47 @@ +{{ $layout := .layout }} +{{ $options := .options }} +{{ $agenda := .agenda }} +{{ $is_sub_event := .is_sub_event }} +{{ $event_attributes := "itemscope itemtype='https://schema.org/Event'" }} + +
        + {{ range $agenda }} +
      • + {{ if eq $layout "agenda" }} +

        {{ .Key | strings.FirstUpper | safeHTML }}

        + {{ end }} +
          + {{ range .Pages }} + {{ if .Params.children_for_the_day }} + {{ $event_attributes := printf "%s %s" "ok" "itemprop='superEvent'" }} + {{ end}} +
        1. + {{ partial "events/partials/event.html" (dict + "event" . + "layout" $layout + "options" site.Params.events.index.options + "is_sub_event" $is_sub_event + ) }} + {{ with .Params.children_for_the_day }} +
            + {{ range $index, $children := . }} + {{ with (site.GetPage .path) }} + {{ $event_attributes := printf "%s %s" $event_attributes "itemprop='subEvent'"}} +
          1. + {{ partial "events/partials/event.html" (dict + "event" . + "layout" $layout + "options" $options + "is_sub_event" true + ) }} +
            2. + {{ end }} + {{ end }} +
          + {{ end }} +
          2. + {{ end }} +
        +
        • + {{ end }} +
      \ No newline at end of file diff --git a/layouts/partials/events/partials/event.html b/layouts/_partials/events/partials/event.html similarity index 70% rename from layouts/partials/events/partials/event.html rename to layouts/_partials/events/partials/event.html index 833f5c432..39df7373e 100644 --- a/layouts/partials/events/partials/event.html +++ b/layouts/_partials/events/partials/event.html @@ -26,25 +26,22 @@ {{ $dates := .Params.dates }} -
      +
      {{ if or .Params.dates .Params.current_time_slot }} {{ partial "events/partials/event/meta-dates.html" (dict - "dates" .Params.dates - "time_slot" .Params.current_time_slot - )}} + "dates" .Params.dates + "time_slot" .Params.current_time_slot + ) }} {{ end }}
      {{ partial "events/partials/event/heading.html" (dict - "item" . - "options" $options - "level" $heading_level - "itemprop" "name" - ) }} + "item" . + "options" $options + "level" $heading_level + "itemprop" "name" + ) }} {{ partial "events/partials/event/federated.html" . }} @@ -77,10 +74,7 @@ {{ partial "GetRichSummary" ( dict "summary" .Params.summary "kind" "events" - )}} - {{ if eq $layout "large" }} - - {{ end }} + ) }}
      {{ end }} @@ -88,24 +82,23 @@ {{ partial "commons/categories.html" ( dict "context" . "kind" "event" - )}} + ) }} {{- end -}} - {{ if $with_more }} + {{ if or (eq $layout "large") $with_more }} {{ partial "commons/item/more.html" . }} {{- end -}}
      7. -
      - {{- if and $options.image .Params.image -}} - {{ $sizes := index site.Params.image_sizes.blocks.events $layout }} - {{- partial "commons/image.html" - (dict - "image" .Params.image - "sizes" $sizes - ) -}} - {{- else -}} - {{- partial "commons/image-default.html" "events" -}} - {{- end -}} -
      + {{ if $options.image }} + {{ $sizes := index site.Params.image_sizes.sections.events $layout }} + {{ if and .Params.parent (eq $layout "agenda") }} + {{ $sizes = site.Params.image_sizes.sections.events.children_in_agenda }} + {{ end }} + {{ partial "events/partials/event/media.html" (dict + "image" .Params.image + "layout" $layout + "sizes" $sizes + ) }} + {{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/partials/events/partials/event/federated.html b/layouts/_partials/events/partials/event/federated.html similarity index 100% rename from layouts/partials/events/partials/event/federated.html rename to layouts/_partials/events/partials/event/federated.html diff --git a/layouts/partials/events/partials/event/heading.html b/layouts/_partials/events/partials/event/heading.html similarity index 100% rename from layouts/partials/events/partials/event/heading.html rename to layouts/_partials/events/partials/event/heading.html diff --git a/layouts/partials/events/partials/event/hours.html b/layouts/_partials/events/partials/event/hours.html similarity index 100% rename from layouts/partials/events/partials/event/hours.html rename to layouts/_partials/events/partials/event/hours.html diff --git a/layouts/_partials/events/partials/event/media.html b/layouts/_partials/events/partials/event/media.html new file mode 100644 index 000000000..81de92d71 --- /dev/null +++ b/layouts/_partials/events/partials/event/media.html @@ -0,0 +1,6 @@ +{{ partial "commons/item/media.html" (dict + "image" .image + "type" "events" + "layout" .layout + "sizes" .sizes +) }} \ No newline at end of file diff --git a/layouts/partials/events/partials/event/meta-dates.html b/layouts/_partials/events/partials/event/meta-dates.html similarity index 100% rename from layouts/partials/events/partials/event/meta-dates.html rename to layouts/_partials/events/partials/event/meta-dates.html diff --git a/layouts/partials/events/partials/event/parent.html b/layouts/_partials/events/partials/event/parent.html similarity index 100% rename from layouts/partials/events/partials/event/parent.html rename to layouts/_partials/events/partials/event/parent.html diff --git a/layouts/partials/events/partials/event/schedule.html b/layouts/_partials/events/partials/event/schedule.html similarity index 100% rename from layouts/partials/events/partials/event/schedule.html rename to layouts/_partials/events/partials/event/schedule.html diff --git a/layouts/partials/events/partials/event/status.html b/layouts/_partials/events/partials/event/status.html similarity index 53% rename from layouts/partials/events/partials/event/status.html rename to layouts/_partials/events/partials/event/status.html index eabf9409d..9efc083e2 100644 --- a/layouts/partials/events/partials/event/status.html +++ b/layouts/_partials/events/partials/event/status.html @@ -1,4 +1,4 @@ {{ partial "commons/item/status.html" (dict - "status" . - "type" "event" - )}} \ No newline at end of file + "status" . + "type" "event" +) }} \ No newline at end of file diff --git a/layouts/partials/events/partials/events.html b/layouts/_partials/events/partials/events.html similarity index 100% rename from layouts/partials/events/partials/events.html rename to layouts/_partials/events/partials/events.html diff --git a/layouts/partials/events/section-month.html b/layouts/_partials/events/section-month.html similarity index 81% rename from layouts/partials/events/section-month.html rename to layouts/_partials/events/section-month.html index 0208d9474..58db21a7a 100644 --- a/layouts/partials/events/section-month.html +++ b/layouts/_partials/events/section-month.html @@ -1,9 +1,9 @@ {{ partial "events/section/hero.html" . }}
      {{ partial "events/section/summary.html" (dict - "with_container" true - "context" . - ) }} + "with_container" true + "context" . + ) }} {{ partial "events/section/calendar.html" . }} @@ -16,9 +16,9 @@ {{ $events := .Pages }} {{ partial "events/partials/events.html" (dict - "events" .Pages - "context" . - "per_page" 10000 - )}} + "events" .Pages + "context" . + "per_page" 10000 + ) }}
      diff --git a/layouts/partials/events/section-year.html b/layouts/_partials/events/section-year.html similarity index 85% rename from layouts/partials/events/section-year.html rename to layouts/_partials/events/section-year.html index fcc4b9f12..b36f2b669 100644 --- a/layouts/partials/events/section-year.html +++ b/layouts/_partials/events/section-year.html @@ -1,9 +1,9 @@ {{ partial "events/section/hero.html" . }}
      {{ partial "events/section/summary.html" (dict - "with_container" true - "context" . - ) }} + "with_container" true + "context" . + ) }} {{ partial "events/section/calendar.html" . }} @@ -25,10 +25,10 @@
      {{ partial "events/partials/events.html" (dict - "events" .RegularPagesRecursive - "context" . - "per_page" site.Params.events.index.per_page - )}} + "events" .RegularPagesRecursive + "context" . + "per_page" site.Params.events.index.per_page + ) }} {{ partial "commons/pagination.html" . }}
      diff --git a/layouts/partials/events/section.html b/layouts/_partials/events/section.html similarity index 87% rename from layouts/partials/events/section.html rename to layouts/_partials/events/section.html index 826c8c2fd..4b92f96e4 100644 --- a/layouts/partials/events/section.html +++ b/layouts/_partials/events/section.html @@ -1,9 +1,9 @@ {{ partial "events/section/hero.html" . }}
      {{ partial "events/section/summary.html" (dict - "with_container" true - "context" . - ) }} + "with_container" true + "context" . + ) }} {{ if site.Params.events.index.highlight_exhibitions.active }} {{ $exhibitions := where .Site.RegularPages "Section" "exhibitions" }} @@ -23,10 +23,10 @@ {{ $events = where $events "Params.dates.archive" false }} {{ partial "events/partials/events.html" (dict - "events" $events - "context" . - "per_page" site.Params.events.index.per_page - )}} + "events" $events + "context" . + "per_page" site.Params.events.index.per_page + ) }} {{ partial "commons/pagination.html" . }}
      diff --git a/layouts/partials/events/section/archives.html b/layouts/_partials/events/section/archives.html similarity index 100% rename from layouts/partials/events/section/archives.html rename to layouts/_partials/events/section/archives.html diff --git a/layouts/partials/events/section/archives/latest.html b/layouts/_partials/events/section/archives/latest.html similarity index 76% rename from layouts/partials/events/section/archives/latest.html rename to layouts/_partials/events/section/archives/latest.html index 8f92358c4..923cf4fad 100644 --- a/layouts/partials/events/section/archives/latest.html +++ b/layouts/_partials/events/section/archives/latest.html @@ -7,9 +7,9 @@

      {{ i18n "events.archives.latest" }}

      {{ partial "events/partials/agenda.html" (dict - "layout" site.Params.events.index.layout - "options" site.Params.events.index.options - "agenda" $agenda - ) }} + "layout" site.Params.events.index.layout + "options" site.Params.events.index.options + "agenda" $agenda + ) }}
      {{ end }} diff --git a/layouts/partials/events/section/archives/years.html b/layouts/_partials/events/section/archives/years.html similarity index 100% rename from layouts/partials/events/section/archives/years.html rename to layouts/_partials/events/section/archives/years.html diff --git a/layouts/partials/events/section/calendar.html b/layouts/_partials/events/section/calendar.html similarity index 66% rename from layouts/partials/events/section/calendar.html rename to layouts/_partials/events/section/calendar.html index d18626878..7e9512618 100644 --- a/layouts/partials/events/section/calendar.html +++ b/layouts/_partials/events/section/calendar.html @@ -4,11 +4,11 @@ {{ partial "events/section/calendar/year.html" . }} {{ else if .Params.is_month }} {{ partial "events/section/calendar/month.html" (dict - "name" .Title - "days" .Params.days - "permalink" .Permalink - "label_type" "long" - ) }} + "name" .Title + "days" .Params.days + "permalink" .Permalink + "label_type" "long" + ) }} {{ end }}
      diff --git a/layouts/partials/events/section/calendar/month.html b/layouts/_partials/events/section/calendar/month.html similarity index 100% rename from layouts/partials/events/section/calendar/month.html rename to layouts/_partials/events/section/calendar/month.html diff --git a/layouts/partials/events/section/calendar/year.html b/layouts/_partials/events/section/calendar/year.html similarity index 100% rename from layouts/partials/events/section/calendar/year.html rename to layouts/_partials/events/section/calendar/year.html diff --git a/layouts/partials/events/section/exhibitions.html b/layouts/_partials/events/section/exhibitions.html similarity index 58% rename from layouts/partials/events/section/exhibitions.html rename to layouts/_partials/events/section/exhibitions.html index 55f621287..a3d35e261 100644 --- a/layouts/partials/events/section/exhibitions.html +++ b/layouts/_partials/events/section/exhibitions.html @@ -8,21 +8,21 @@ {{ with $current_exhibitions }}

      {{ i18n "exhibitions.current" }}

      {{ partial "exhibitions/partials/exhibitions.html" (dict - "exhibitions" . - "heading_level" 3 - "layout" site.Params.events.index.highlight_exhibitions.current.layout - "options" site.Params.events.index.highlight_exhibitions.current.options - )}} + "exhibitions" . + "heading_level" 3 + "layout" site.Params.events.index.highlight_exhibitions.current.layout + "options" site.Params.events.index.highlight_exhibitions.current.options + ) }} {{ end }} {{ with $future_exhibitions }}

      {{ i18n "exhibitions.future" }}

      {{ partial "exhibitions/partials/exhibitions.html" (dict - "exhibitions" . - "heading_level" 3 - "layout" site.Params.events.index.highlight_exhibitions.future.layout - "options" site.Params.events.index.highlight_exhibitions.future.options - )}} + "exhibitions" . + "heading_level" 3 + "layout" site.Params.events.index.highlight_exhibitions.future.layout + "options" site.Params.events.index.highlight_exhibitions.future.options + ) }} {{ end }} diff --git a/layouts/partials/events/section/filters.html b/layouts/_partials/events/section/filters.html similarity index 100% rename from layouts/partials/events/section/filters.html rename to layouts/_partials/events/section/filters.html diff --git a/layouts/partials/events/section/filters/dates.html b/layouts/_partials/events/section/filters/dates.html similarity index 80% rename from layouts/partials/events/section/filters/dates.html rename to layouts/_partials/events/section/filters/dates.html index a8aed166c..5dbde0df6 100644 --- a/layouts/partials/events/section/filters/dates.html +++ b/layouts/_partials/events/section/filters/dates.html @@ -10,11 +10,11 @@ {{ range .Params.next_months }} {{ with site.GetPage .path }} {{ partial "events/section/calendar/month.html" (dict - "name" .Title - "days" .Params.days - "permalink" .Permalink - "label_type" "short" - ) }} + "name" .Title + "days" .Params.days + "permalink" .Permalink + "label_type" "short" + ) }} {{ end }} {{ end }} diff --git a/layouts/partials/events/section/filters/taxonomies.html b/layouts/_partials/events/section/filters/taxonomies.html similarity index 100% rename from layouts/partials/events/section/filters/taxonomies.html rename to layouts/_partials/events/section/filters/taxonomies.html diff --git a/layouts/partials/events/section/hero.html b/layouts/_partials/events/section/hero.html similarity index 52% rename from layouts/partials/events/section/hero.html rename to layouts/_partials/events/section/hero.html index 0e7f86f8c..adb4d139d 100644 --- a/layouts/partials/events/section/hero.html +++ b/layouts/_partials/events/section/hero.html @@ -9,11 +9,10 @@ )}} {{ end }} -{{- partial "header/hero.html" - (dict - "title" $title - "image" .Params.image - "sizes" site.Params.image_sizes.sections.events.hero - "button" $button - "context" . - ) -}} +{{- partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.events.hero + "button" $button + "context" . +) -}} diff --git a/layouts/partials/events/section/summary.html b/layouts/_partials/events/section/summary.html similarity index 100% rename from layouts/partials/events/section/summary.html rename to layouts/_partials/events/section/summary.html diff --git a/layouts/partials/events/single.html b/layouts/_partials/events/single.html similarity index 95% rename from layouts/partials/events/single.html rename to layouts/_partials/events/single.html index 1a20eb9ff..70a296015 100644 --- a/layouts/partials/events/single.html +++ b/layouts/_partials/events/single.html @@ -14,9 +14,9 @@ {{ partial "events/single/sidebar.html" . }} {{ partial "events/single/summary.html" (dict - "context" . - "block_wrapped" true - ) }} + "context" . + "block_wrapped" true + ) }} {{ partial "contents/list.html" (dict "context" . diff --git a/layouts/partials/events/single/event-infos.html b/layouts/_partials/events/single/event-infos.html similarity index 100% rename from layouts/partials/events/single/event-infos.html rename to layouts/_partials/events/single/event-infos.html diff --git a/layouts/partials/events/single/hero.html b/layouts/_partials/events/single/hero.html similarity index 74% rename from layouts/partials/events/single/hero.html rename to layouts/_partials/events/single/hero.html index 9d54dda8c..bf6073b8d 100644 --- a/layouts/partials/events/single/hero.html +++ b/layouts/_partials/events/single/hero.html @@ -12,12 +12,11 @@ {{ $sizes = index site.Params.image_sizes.sections.events.hero_single $image_format }} {{ end }} -{{- partial "header/hero.html" - (dict - "title" $title - "image" $image - "sizes" $sizes - "context" . - "share" $share - "button" false - ) -}} \ No newline at end of file +{{- partial "header/hero.html" (dict + "title" $title + "image" $image + "sizes" $sizes + "context" . + "share" $share + "button" false +) -}} \ No newline at end of file diff --git a/layouts/partials/events/single/parent.html b/layouts/_partials/events/single/parent.html similarity index 59% rename from layouts/partials/events/single/parent.html rename to layouts/_partials/events/single/parent.html index d03c1d310..6cc5095ae 100644 --- a/layouts/partials/events/single/parent.html +++ b/layouts/_partials/events/single/parent.html @@ -4,11 +4,11 @@

      {{ i18n "events.part_of" }}

      {{ partial "events/partials/event.html" (dict - "event" . - "layout" "parent" - "options" site.Params.events.index.options - "with_more" true - "is_sup_event" true - )}} + "event" . + "layout" "parent" + "options" site.Params.events.index.options + "with_more" true + "is_sup_event" true + ) }}
      {{ end }} \ No newline at end of file diff --git a/layouts/partials/events/single/programme.html b/layouts/_partials/events/single/programme.html similarity index 61% rename from layouts/partials/events/single/programme.html rename to layouts/_partials/events/single/programme.html index af1674538..1981e595b 100644 --- a/layouts/partials/events/single/programme.html +++ b/layouts/_partials/events/single/programme.html @@ -4,11 +4,11 @@ {{ if $events }} {{ $agenda := $events.GroupByDate site.Params.events.index.group_by_date "asc" }} {{ partial "events/partials/agenda.html" (dict - "layout" site.Params.events.single.agenda.layout - "options" site.Params.events.single.agenda.options - "agenda" $agenda - "is_sub_event" true - ) }} - {{ end }} + "layout" site.Params.events.single.agenda.layout + "options" site.Params.events.single.agenda.options + "agenda" $agenda + "is_sub_event" true + ) }} + {{ end }} \ No newline at end of file diff --git a/layouts/partials/events/single/sidebar.html b/layouts/_partials/events/single/sidebar.html similarity index 88% rename from layouts/partials/events/single/sidebar.html rename to layouts/_partials/events/single/sidebar.html index cee91a325..323b3465f 100644 --- a/layouts/partials/events/single/sidebar.html +++ b/layouts/_partials/events/single/sidebar.html @@ -8,9 +8,9 @@ {{ end }} {{ partial "toc/container.html" (dict - "toc" "toc/default.html" - "context" . - )}} + "toc" "toc/default.html" + "context" . + ) }} {{ if $events }} {{ i18n "events.see_programme" }} {{ end }} diff --git a/layouts/partials/events/single/summary.html b/layouts/_partials/events/single/summary.html similarity index 100% rename from layouts/partials/events/single/summary.html rename to layouts/_partials/events/single/summary.html diff --git a/layouts/partials/events_categories/single.html b/layouts/_partials/events_categories/single.html similarity index 96% rename from layouts/partials/events_categories/single.html rename to layouts/_partials/events_categories/single.html index 5829a5cf1..7e4d88976 100644 --- a/layouts/partials/events_categories/single.html +++ b/layouts/_partials/events_categories/single.html @@ -1,9 +1,9 @@ {{ partial "events/section/hero.html" . }}
      {{ partial "events/section/summary.html" (dict - "with_container" true - "context" . - ) }} + "with_container" true + "context" . + ) }} {{ partial "contents/list.html" (dict "context" . diff --git a/layouts/partials/exhibitions/partials/exhibition.html b/layouts/_partials/exhibitions/partials/exhibition.html similarity index 86% rename from layouts/partials/exhibitions/partials/exhibition.html rename to layouts/_partials/exhibitions/partials/exhibition.html index 8ea29776d..5b0569df1 100644 --- a/layouts/partials/exhibitions/partials/exhibition.html +++ b/layouts/_partials/exhibitions/partials/exhibition.html @@ -3,6 +3,7 @@ {{ $heading_level := .heading_level }} {{ $with_more := .with_more }} {{ $options := .options }} +{{ $layout := .layout }} {{ with $exhibition }} {{ $class := "exhibition" }} @@ -19,11 +20,11 @@
      {{ partial "exhibitions/partials/exhibition/heading.html" (dict - "item" . - "options" $options - "level" $heading_level - "itemprop" "name" - )}} + "item" . + "options" $options + "level" $heading_level + "itemprop" "name" + ) }} {{ partial "exhibitions/partials/exhibition/federated.html" . }} @@ -31,14 +32,14 @@ {{ partial "exhibitions/partials/exhibition/schedule.html" (dict "dates" .Params.dates "on_two_lines" false - )}} + ) }} {{ end }} {{ if and $dates.status $options.status }} {{ partial "exhibitions/partials/exhibition/status.html" (dict "status" $dates.status "type" "exhibition" - )}} + ) }} {{ end }} {{ if and $options.summary .Params.summary }} @@ -51,7 +52,7 @@ {{ partial "commons/categories" ( dict "context" . "kind" "event" - )}} + ) }} {{- end -}} {{ if $with_more }} @@ -61,9 +62,10 @@ {{ if $options.image }} {{ partial "exhibitions/partials/exhibition/media.html" (dict - "image" $exhibition.Params.image - "layout" $layout - )}} + "image" $exhibition.Params.image + "layout" $layout + "type" "exhibitions" + ) }} {{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/partials/exhibitions/partials/exhibition/federated.html b/layouts/_partials/exhibitions/partials/exhibition/federated.html similarity index 100% rename from layouts/partials/exhibitions/partials/exhibition/federated.html rename to layouts/_partials/exhibitions/partials/exhibition/federated.html diff --git a/layouts/partials/exhibitions/partials/exhibition/heading.html b/layouts/_partials/exhibitions/partials/exhibition/heading.html similarity index 100% rename from layouts/partials/exhibitions/partials/exhibition/heading.html rename to layouts/_partials/exhibitions/partials/exhibition/heading.html diff --git a/layouts/_partials/exhibitions/partials/exhibition/media.html b/layouts/_partials/exhibitions/partials/exhibition/media.html new file mode 100644 index 000000000..3454ff56b --- /dev/null +++ b/layouts/_partials/exhibitions/partials/exhibition/media.html @@ -0,0 +1,5 @@ +{{ partial "commons/item/media.html" (dict + "image" .image + "type" "exhibitions" + "layout" .layout +) }} \ No newline at end of file diff --git a/layouts/partials/exhibitions/partials/exhibition/schedule.html b/layouts/_partials/exhibitions/partials/exhibition/schedule.html similarity index 100% rename from layouts/partials/exhibitions/partials/exhibition/schedule.html rename to layouts/_partials/exhibitions/partials/exhibition/schedule.html diff --git a/layouts/partials/exhibitions/partials/exhibition/status.html b/layouts/_partials/exhibitions/partials/exhibition/status.html similarity index 50% rename from layouts/partials/exhibitions/partials/exhibition/status.html rename to layouts/_partials/exhibitions/partials/exhibition/status.html index b172992c5..21c6b7015 100644 --- a/layouts/partials/exhibitions/partials/exhibition/status.html +++ b/layouts/_partials/exhibitions/partials/exhibition/status.html @@ -1,4 +1,4 @@ {{ partial "commons/item/status.html" (dict - "status" . - "type" "exhibition" - )}} \ No newline at end of file + "status" . + "type" "exhibition" +) }} \ No newline at end of file diff --git a/layouts/partials/exhibitions/partials/exhibition/summary.html b/layouts/_partials/exhibitions/partials/exhibition/summary.html similarity index 100% rename from layouts/partials/exhibitions/partials/exhibition/summary.html rename to layouts/_partials/exhibitions/partials/exhibition/summary.html diff --git a/layouts/partials/exhibitions/partials/exhibitions.html b/layouts/_partials/exhibitions/partials/exhibitions.html similarity index 73% rename from layouts/partials/exhibitions/partials/exhibitions.html rename to layouts/_partials/exhibitions/partials/exhibitions.html index 37f6db6ee..b21ec1b40 100644 --- a/layouts/partials/exhibitions/partials/exhibitions.html +++ b/layouts/_partials/exhibitions/partials/exhibitions.html @@ -8,12 +8,12 @@ {{ range $exhibitions }}
    7. {{ partial "exhibitions/partials/exhibition.html" (dict - "exhibition" . - "heading_level" $heading_level - "layout" $layout - "options" $options - "with_more" $with_more - )}} + "exhibition" . + "heading_level" $heading_level + "layout" $layout + "options" $options + "with_more" $with_more + ) }}
      8. {{ end }}
    diff --git a/layouts/partials/exhibitions/section.html b/layouts/_partials/exhibitions/section.html similarity index 73% rename from layouts/partials/exhibitions/section.html rename to layouts/_partials/exhibitions/section.html index 30e0d4781..c65dcf9f6 100644 --- a/layouts/partials/exhibitions/section.html +++ b/layouts/_partials/exhibitions/section.html @@ -1,9 +1,9 @@ {{ partial "exhibitions/section/hero.html" . }}
    {{ partial "exhibitions/section/summary.html" (dict - "with_container" true - "context" . - ) }} + "with_container" true + "context" . + ) }} {{ if (partial "IsFirstPage" .) }} {{ partial "contents/list.html" (dict @@ -16,10 +16,10 @@
    {{ partial "exhibitions/partials/exhibitions.html" (dict - "exhibitions" .RegularPages - "layout" site.Params.exhibitions.index.layout - "options" site.Params.exhibitions.index.options - )}} + "exhibitions" .RegularPages + "layout" site.Params.exhibitions.index.layout + "options" site.Params.exhibitions.index.options + ) }} {{ partial "commons/section/archive-link.html" . }} {{ partial "commons/pagination.html" . }}
    diff --git a/layouts/_partials/exhibitions/section/hero.html b/layouts/_partials/exhibitions/section/hero.html new file mode 100644 index 000000000..85102fbf2 --- /dev/null +++ b/layouts/_partials/exhibitions/section/hero.html @@ -0,0 +1,7 @@ +{{- $title := or .Params.header_text .Title -}} +{{- partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.exhibitions.hero + "context" . +) -}} diff --git a/layouts/partials/exhibitions/section/summary.html b/layouts/_partials/exhibitions/section/summary.html similarity index 100% rename from layouts/partials/exhibitions/section/summary.html rename to layouts/_partials/exhibitions/section/summary.html diff --git a/layouts/partials/exhibitions/single.html b/layouts/_partials/exhibitions/single.html similarity index 94% rename from layouts/partials/exhibitions/single.html rename to layouts/_partials/exhibitions/single.html index 1e98681ac..8addd568b 100644 --- a/layouts/partials/exhibitions/single.html +++ b/layouts/_partials/exhibitions/single.html @@ -10,9 +10,9 @@ {{ partial "exhibitions/single/sidebar.html" . }} {{ partial "exhibitions/single/summary.html" (dict - "context" . - "block_wrapped" true - ) }} + "context" . + "block_wrapped" true + ) }} {{ partial "contents/list.html" (dict "context" . diff --git a/layouts/partials/exhibitions/single/exhibition-infos.html b/layouts/_partials/exhibitions/single/exhibition-infos.html similarity index 100% rename from layouts/partials/exhibitions/single/exhibition-infos.html rename to layouts/_partials/exhibitions/single/exhibition-infos.html diff --git a/layouts/partials/exhibitions/single/hero.html b/layouts/_partials/exhibitions/single/hero.html similarity index 75% rename from layouts/partials/exhibitions/single/hero.html rename to layouts/_partials/exhibitions/single/hero.html index b32ee8268..dd3cde596 100644 --- a/layouts/partials/exhibitions/single/hero.html +++ b/layouts/_partials/exhibitions/single/hero.html @@ -12,12 +12,11 @@ {{ $sizes = index site.Params.image_sizes.sections.exhibitions.hero_single $image_format }} {{ end }} -{{- partial "header/hero.html" - (dict - "title" $title - "image" $image - "sizes" $sizes - "context" . - "share" $share - "button" false - ) -}} \ No newline at end of file +{{- partial "header/hero.html" (dict + "title" $title + "image" $image + "sizes" $sizes + "context" . + "share" $share + "button" false +) -}} \ No newline at end of file diff --git a/layouts/partials/exhibitions/single/sidebar.html b/layouts/_partials/exhibitions/single/sidebar.html similarity index 67% rename from layouts/partials/exhibitions/single/sidebar.html rename to layouts/_partials/exhibitions/single/sidebar.html index 002159b81..80449d514 100644 --- a/layouts/partials/exhibitions/single/sidebar.html +++ b/layouts/_partials/exhibitions/single/sidebar.html @@ -5,11 +5,9 @@ {{- partial "exhibitions/single/exhibition-infos.html" . -}} {{ end }} - {{ partial "toc/container.html" - (dict - "toc" "toc/default.html" - "context" . - ) - }} + {{ partial "toc/container.html" (dict + "toc" "toc/default.html" + "context" . + ) }}
    diff --git a/layouts/partials/exhibitions/single/summary.html b/layouts/_partials/exhibitions/single/summary.html similarity index 100% rename from layouts/partials/exhibitions/single/summary.html rename to layouts/_partials/exhibitions/single/summary.html diff --git a/layouts/partials/footer/backtotop.html b/layouts/_partials/footer/backtotop.html similarity index 100% rename from layouts/partials/footer/backtotop.html rename to layouts/_partials/footer/backtotop.html diff --git a/layouts/partials/footer/contents.html b/layouts/_partials/footer/contents.html similarity index 100% rename from layouts/partials/footer/contents.html rename to layouts/_partials/footer/contents.html diff --git a/layouts/partials/footer/credit.html b/layouts/_partials/footer/credit.html similarity index 100% rename from layouts/partials/footer/credit.html rename to layouts/_partials/footer/credit.html diff --git a/layouts/partials/footer/debug.html b/layouts/_partials/footer/debug.html similarity index 97% rename from layouts/partials/footer/debug.html rename to layouts/_partials/footer/debug.html index c1cd0c255..5ddb47d83 100644 --- a/layouts/partials/footer/debug.html +++ b/layouts/_partials/footer/debug.html @@ -224,6 +224,7 @@ position: absolute; bottom: 0; left: 0; + text-align: left !important; font-family: sans-serif; white-space: nowrap; opacity: 0.9; @@ -315,7 +316,7 @@ const threshold = 0.2, // 20% of tolerance parent = img.parentElement, - pixelRatio = window.devicePixelRatio, + pixelRatio = Math.round(window.devicePixelRatio * 10) / 10, dimensions = { width: Math.round(img.naturalWidth * pixelRatio), height: Math.round(img.naturalHeight * pixelRatio) @@ -325,9 +326,10 @@ height: Math.round(img.height * window.devicePixelRatio) }, essential = -`Loaded : ${dimensions.width}x${dimensions.height}
    +`Ratio : ${pixelRatio}
    +Loaded : ${dimensions.width}x${dimensions.height}
    Needed : ${target.width}x${target.height}
    -Ideal config : ${target.width / pixelRatio}x${target.height / pixelRatio}` +Ideal config : ${img.width}x${img.height}` result =` Rendered size: ${img.width}x${img.height} Intrinsic size: ${dimensions.width}x${dimensions.height} diff --git a/layouts/partials/footer/footer-simple.html b/layouts/_partials/footer/footer-simple.html similarity index 100% rename from layouts/partials/footer/footer-simple.html rename to layouts/_partials/footer/footer-simple.html diff --git a/layouts/partials/footer/footer.html b/layouts/_partials/footer/footer.html similarity index 100% rename from layouts/partials/footer/footer.html rename to layouts/_partials/footer/footer.html diff --git a/layouts/partials/footer/js.html b/layouts/_partials/footer/js.html similarity index 100% rename from layouts/partials/footer/js.html rename to layouts/_partials/footer/js.html diff --git a/layouts/partials/footer/legals.html b/layouts/_partials/footer/legals.html similarity index 62% rename from layouts/partials/footer/legals.html rename to layouts/_partials/footer/legals.html index 49e9a212f..6e3c878cf 100644 --- a/layouts/partials/footer/legals.html +++ b/layouts/_partials/footer/legals.html @@ -5,11 +5,10 @@ {{ if not (in site.Params.i18n.positions "footer") }} {{ $class = printf "%s without-i18n" $class }} {{ end }} - {{ partial "commons/menu.html" - (dict - "kind" "legal" - "level" 1 - "class" $class - "context" . - )}} + {{ partial "commons/menu.html" (dict + "kind" "legal" + "level" 1 + "class" $class + "context" . + ) }} {{ end }} diff --git a/layouts/partials/footer/logo.html b/layouts/_partials/footer/logo.html similarity index 100% rename from layouts/partials/footer/logo.html rename to layouts/_partials/footer/logo.html diff --git a/layouts/partials/footer/plausible.html b/layouts/_partials/footer/plausible.html similarity index 100% rename from layouts/partials/footer/plausible.html rename to layouts/_partials/footer/plausible.html diff --git a/layouts/partials/footer/script.html b/layouts/_partials/footer/script.html similarity index 100% rename from layouts/partials/footer/script.html rename to layouts/_partials/footer/script.html diff --git a/layouts/partials/footer/site.html b/layouts/_partials/footer/site.html similarity index 100% rename from layouts/partials/footer/site.html rename to layouts/_partials/footer/site.html diff --git a/layouts/partials/footer/site/journal.html b/layouts/_partials/footer/site/journal.html similarity index 100% rename from layouts/partials/footer/site/journal.html rename to layouts/_partials/footer/site/journal.html diff --git a/layouts/partials/footer/site/laboratory.html b/layouts/_partials/footer/site/laboratory.html similarity index 72% rename from layouts/partials/footer/site/laboratory.html rename to layouts/_partials/footer/site/laboratory.html index 382e31152..06045474e 100644 --- a/layouts/partials/footer/site/laboratory.html +++ b/layouts/_partials/footer/site/laboratory.html @@ -11,10 +11,10 @@ {{ with .phone_numbers.phone }}

    {{ partial "commons/links/tel.html" (dict - "value" .value - "label" .label - "title" ( i18n "commons.contact.phone.a11y_label" ( dict "phone_number" .label ) ) - ) }} + "value" .value + "label" .label + "title" ( i18n "commons.contact.phone.a11y_label" ( dict "phone_number" .label ) ) + ) }}

    {{ end }} {{ end }} diff --git a/layouts/partials/footer/site/school.html b/layouts/_partials/footer/site/school.html similarity index 66% rename from layouts/partials/footer/site/school.html rename to layouts/_partials/footer/site/school.html index 76c7f2453..7fa983bf4 100644 --- a/layouts/partials/footer/site/school.html +++ b/layouts/_partials/footer/site/school.html @@ -16,20 +16,20 @@ {{ with .phone_numbers.phone }}

    {{ partial "commons/links/tel.html" (dict - "value" .value - "label" .label - "title" ( i18n "commons.contact.phone.a11y_label" ( dict "phone_number" .label ) ) - ) }} + "value" .value + "label" .label + "title" ( i18n "commons.contact.phone.a11y_label" ( dict "phone_number" .label ) ) + ) }}

    {{ end }} {{ with .websites.website }}

    {{ partial "commons/links/website.html" (dict - "value" .value - "label" .label - "title" ( i18n "commons.contact.socials.label.website" ( dict "name" $name ) ) - ) }} + "value" .value + "label" .label + "title" ( i18n "commons.contact.socials.label.website" ( dict "name" $name ) ) + ) }}

    {{ end }} {{ end }} diff --git a/layouts/partials/footer/social.html b/layouts/_partials/footer/social.html similarity index 63% rename from layouts/partials/footer/social.html rename to layouts/_partials/footer/social.html index 501db4829..b81157746 100644 --- a/layouts/partials/footer/social.html +++ b/layouts/_partials/footer/social.html @@ -2,17 +2,17 @@ {{ if $menu.items }} {{ partial "commons/menu.html" (dict - "kind" "social" - "level" 1 - "class" "nav-social" - )}} + "kind" "social" + "level" 1 + "class" "nav-social" + ) }} {{ end }} {{ with site.Params.contact_details }} {{ end }} \ No newline at end of file diff --git a/layouts/partials/head/csp.html b/layouts/_partials/head/csp.html similarity index 100% rename from layouts/partials/head/csp.html rename to layouts/_partials/head/csp.html diff --git a/layouts/partials/head/css.html b/layouts/_partials/head/css.html similarity index 100% rename from layouts/partials/head/css.html rename to layouts/_partials/head/css.html diff --git a/layouts/partials/head/extras.html b/layouts/_partials/head/extras.html similarity index 100% rename from layouts/partials/head/extras.html rename to layouts/_partials/head/extras.html diff --git a/layouts/partials/head/favicons.html b/layouts/_partials/head/favicons.html similarity index 100% rename from layouts/partials/head/favicons.html rename to layouts/_partials/head/favicons.html diff --git a/layouts/partials/head/init.html b/layouts/_partials/head/init.html similarity index 100% rename from layouts/partials/head/init.html rename to layouts/_partials/head/init.html diff --git a/layouts/partials/head/rss.html b/layouts/_partials/head/rss.html similarity index 100% rename from layouts/partials/head/rss.html rename to layouts/_partials/head/rss.html diff --git a/layouts/partials/head/script.html b/layouts/_partials/head/script.html similarity index 100% rename from layouts/partials/head/script.html rename to layouts/_partials/head/script.html diff --git a/layouts/partials/head/seo.html b/layouts/_partials/head/seo.html similarity index 91% rename from layouts/partials/head/seo.html rename to layouts/_partials/head/seo.html index 74c6e98f9..e5ef22b61 100644 --- a/layouts/partials/head/seo.html +++ b/layouts/_partials/head/seo.html @@ -27,17 +27,17 @@ {{- with $sharedImage -}} {{- $ogImage = partial "GetImageUrl" (dict - "media" . - "size" "1200" - ) -}} + "media" . + "size" "1200" + ) -}} {{- $twitterImage = partial "GetImageUrl" (dict - "media" . - "size" "1200" - ) -}} + "media" . + "size" "1200" + ) -}} {{- $pagefindImage = partial "GetImageUrl" (dict - "media" . - "size" site.Params.image_sizes._default.pagefind - ) -}} + "media" . + "size" site.Params.image_sizes._default.pagefind + ) -}} {{- end -}} {{- $seoUrl := .Permalink -}} diff --git a/layouts/partials/header/accessibility.html b/layouts/_partials/header/accessibility.html similarity index 100% rename from layouts/partials/header/accessibility.html rename to layouts/_partials/header/accessibility.html diff --git a/layouts/partials/header/breadcrumbs.html b/layouts/_partials/header/breadcrumbs.html similarity index 100% rename from layouts/partials/header/breadcrumbs.html rename to layouts/_partials/header/breadcrumbs.html diff --git a/layouts/partials/header/button.html b/layouts/_partials/header/button.html similarity index 100% rename from layouts/partials/header/button.html rename to layouts/_partials/header/button.html diff --git a/layouts/partials/header/cta.html b/layouts/_partials/header/cta.html similarity index 100% rename from layouts/partials/header/cta.html rename to layouts/_partials/header/cta.html diff --git a/layouts/partials/header/header.html b/layouts/_partials/header/header.html similarity index 83% rename from layouts/partials/header/header.html rename to layouts/_partials/header/header.html index c5c8cc79f..697b4d6c3 100644 --- a/layouts/partials/header/header.html +++ b/layouts/_partials/header/header.html @@ -23,13 +23,12 @@ {{ if $primary.items }} {{ partial "header/button.html" }} {{ end }} {{ partial "hooks/before-primary-menu-end.html" . }} diff --git a/layouts/partials/header/hero.html b/layouts/_partials/header/hero.html similarity index 94% rename from layouts/partials/header/hero.html rename to layouts/_partials/header/hero.html index 0c2b9659a..3ac61269a 100644 --- a/layouts/partials/header/hero.html +++ b/layouts/_partials/header/hero.html @@ -76,11 +76,11 @@

    {{ partial "PrepareHTML" .title }}

    {{ if .image }} {{ partial "commons/image-figure.html" (dict - "image" .image - "sizes" ( .sizes | default site.Params.image_sizes.design_system.hero ) - "lazy" false - "focusable_figcaption" true - ) }} + "image" .image + "sizes" ( .sizes | default site.Params.image_sizes._default.hero ) + "lazy" false + "focusable_figcaption" true + ) }} {{ end }} {{ if .hero_after_image_complement }} diff --git a/layouts/partials/header/logo.html b/layouts/_partials/header/logo.html similarity index 100% rename from layouts/partials/header/logo.html rename to layouts/_partials/header/logo.html diff --git a/layouts/_partials/home/hero.html b/layouts/_partials/home/hero.html new file mode 100644 index 000000000..fed6d64f3 --- /dev/null +++ b/layouts/_partials/home/hero.html @@ -0,0 +1,8 @@ +{{- $title := or .Params.header_text .Title -}} +{{ partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "breadcrumb" false + "sizes" site.Params.image_sizes.sections.home.hero + "context" . +) }} diff --git a/layouts/partials/home/summary.html b/layouts/_partials/home/summary.html similarity index 100% rename from layouts/partials/home/summary.html rename to layouts/_partials/home/summary.html diff --git a/layouts/partials/hooks/after-footer-end.html b/layouts/_partials/hooks/after-footer-end.html similarity index 100% rename from layouts/partials/hooks/after-footer-end.html rename to layouts/_partials/hooks/after-footer-end.html diff --git a/layouts/partials/hooks/after-hero-start.html b/layouts/_partials/hooks/after-hero-start.html similarity index 100% rename from layouts/partials/hooks/after-hero-start.html rename to layouts/_partials/hooks/after-hero-start.html diff --git a/layouts/partials/hooks/after-page-hero.html b/layouts/_partials/hooks/after-page-hero.html similarity index 100% rename from layouts/partials/hooks/after-page-hero.html rename to layouts/_partials/hooks/after-page-hero.html diff --git a/layouts/partials/hooks/before-document-content-end.html b/layouts/_partials/hooks/before-document-content-end.html similarity index 100% rename from layouts/partials/hooks/before-document-content-end.html rename to layouts/_partials/hooks/before-document-content-end.html diff --git a/layouts/partials/hooks/before-header-end.html b/layouts/_partials/hooks/before-header-end.html similarity index 100% rename from layouts/partials/hooks/before-header-end.html rename to layouts/_partials/hooks/before-header-end.html diff --git a/layouts/partials/hooks/before-header.html b/layouts/_partials/hooks/before-header.html similarity index 100% rename from layouts/partials/hooks/before-header.html rename to layouts/_partials/hooks/before-header.html diff --git a/layouts/partials/hooks/before-hero-content-end.html b/layouts/_partials/hooks/before-hero-content-end.html similarity index 100% rename from layouts/partials/hooks/before-hero-content-end.html rename to layouts/_partials/hooks/before-hero-content-end.html diff --git a/layouts/partials/hooks/before-main-end.html b/layouts/_partials/hooks/before-main-end.html similarity index 100% rename from layouts/partials/hooks/before-main-end.html rename to layouts/_partials/hooks/before-main-end.html diff --git a/layouts/partials/hooks/before-primary-menu-end.html b/layouts/_partials/hooks/before-primary-menu-end.html similarity index 100% rename from layouts/partials/hooks/before-primary-menu-end.html rename to layouts/_partials/hooks/before-primary-menu-end.html diff --git a/layouts/partials/hooks/before-program-end.html b/layouts/_partials/hooks/before-program-end.html similarity index 100% rename from layouts/partials/hooks/before-program-end.html rename to layouts/_partials/hooks/before-program-end.html diff --git a/layouts/partials/hooks/before-search-modal-end.html b/layouts/_partials/hooks/before-search-modal-end.html similarity index 100% rename from layouts/partials/hooks/before-search-modal-end.html rename to layouts/_partials/hooks/before-search-modal-end.html diff --git a/layouts/partials/isInteractiveMapPresent b/layouts/_partials/isInteractiveMapPresent.html similarity index 100% rename from layouts/partials/isInteractiveMapPresent rename to layouts/_partials/isInteractiveMapPresent.html diff --git a/layouts/partials/jobs/partials/job.html b/layouts/_partials/jobs/partials/job.html similarity index 86% rename from layouts/partials/jobs/partials/job.html rename to layouts/_partials/jobs/partials/job.html index 88e7b390f..46d805b2f 100644 --- a/layouts/partials/jobs/partials/job.html +++ b/layouts/_partials/jobs/partials/job.html @@ -17,11 +17,11 @@ itemscope itemtype="https://schema.org/JobPosting">
    {{ partial "jobs/partials/job/heading.html" (dict - "item" . - "options" $options - "level" $heading_level - "itemprop" "title" - )}} + "item" . + "options" $options + "level" $heading_level + "itemprop" "title" + ) }} {{ if and $options.summary .Params.summary }}
    @@ -37,7 +37,7 @@ {{ partial "commons/categories.html" ( dict "context" . "kind" "job" - )}} + ) }} {{- end -}} {{ if $with_more }} @@ -47,9 +47,9 @@ {{ if $options.image }} {{ partial "jobs/partials/job/media.html" (dict - "image" $job.Params.image - "layout" $layout - )}} + "image" $job.Params.image + "layout" $layout + ) }} {{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/partials/jobs/partials/job/dates.html b/layouts/_partials/jobs/partials/job/dates.html similarity index 100% rename from layouts/partials/jobs/partials/job/dates.html rename to layouts/_partials/jobs/partials/job/dates.html diff --git a/layouts/partials/jobs/partials/job/heading.html b/layouts/_partials/jobs/partials/job/heading.html similarity index 100% rename from layouts/partials/jobs/partials/job/heading.html rename to layouts/_partials/jobs/partials/job/heading.html diff --git a/layouts/_partials/jobs/partials/job/media.html b/layouts/_partials/jobs/partials/job/media.html new file mode 100644 index 000000000..b3db525ee --- /dev/null +++ b/layouts/_partials/jobs/partials/job/media.html @@ -0,0 +1,5 @@ +{{ partial "commons/item/media.html" (dict + "image" .image + "type" "jobs" + "layout" .layout +) }} \ No newline at end of file diff --git a/layouts/partials/jobs/partials/job/summary.html b/layouts/_partials/jobs/partials/job/summary.html similarity index 100% rename from layouts/partials/jobs/partials/job/summary.html rename to layouts/_partials/jobs/partials/job/summary.html diff --git a/layouts/partials/jobs/partials/jobs.html b/layouts/_partials/jobs/partials/jobs.html similarity index 71% rename from layouts/partials/jobs/partials/jobs.html rename to layouts/_partials/jobs/partials/jobs.html index d7f7ce533..b8c073dc8 100644 --- a/layouts/partials/jobs/partials/jobs.html +++ b/layouts/_partials/jobs/partials/jobs.html @@ -7,11 +7,11 @@ {{ range $jobs }}
  • {{ partial "jobs/partials/job.html" (dict - "job" . - "heading_level" $heading_level - "layout" $layout - "options" $options - )}} + "job" . + "heading_level" $heading_level + "layout" $layout + "options" $options + ) }}
    • {{ end }} diff --git a/layouts/partials/jobs/section.html b/layouts/_partials/jobs/section.html similarity index 89% rename from layouts/partials/jobs/section.html rename to layouts/_partials/jobs/section.html index 5da94aa42..fc9e894d8 100644 --- a/layouts/partials/jobs/section.html +++ b/layouts/_partials/jobs/section.html @@ -1,9 +1,9 @@ {{ partial "jobs/section/hero.html" . }}
    {{ partial "jobs/section/summary.html" (dict - "with_container" true - "context" . - ) }} + "with_container" true + "context" . + ) }} {{ if (partial "IsFirstPage" .) }} {{ partial "contents/list.html" (dict diff --git a/layouts/_partials/jobs/section/hero.html b/layouts/_partials/jobs/section/hero.html new file mode 100644 index 000000000..1c35e5c0e --- /dev/null +++ b/layouts/_partials/jobs/section/hero.html @@ -0,0 +1,7 @@ +{{- $title := or .Params.header_text .Title -}} +{{- partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.jobs.hero + "context" . +) -}} diff --git a/layouts/partials/jobs/section/summary.html b/layouts/_partials/jobs/section/summary.html similarity index 100% rename from layouts/partials/jobs/section/summary.html rename to layouts/_partials/jobs/section/summary.html diff --git a/layouts/partials/jobs/single.html b/layouts/_partials/jobs/single.html similarity index 95% rename from layouts/partials/jobs/single.html rename to layouts/_partials/jobs/single.html index 6f0eaf973..d865cd085 100644 --- a/layouts/partials/jobs/single.html +++ b/layouts/_partials/jobs/single.html @@ -15,9 +15,9 @@ {{ end }} {{ partial "jobs/single/summary.html" (dict - "context" . - "block_wrapped" true - ) }} + "context" . + "block_wrapped" true + ) }} {{ partial "contents/list.html" (dict "context" . diff --git a/layouts/partials/posts/single/hero.html b/layouts/_partials/jobs/single/hero.html similarity index 58% rename from layouts/partials/posts/single/hero.html rename to layouts/_partials/jobs/single/hero.html index d1984ea60..defeae464 100644 --- a/layouts/partials/posts/single/hero.html +++ b/layouts/_partials/jobs/single/hero.html @@ -5,8 +5,8 @@ {{ end }} {{- partial "header/hero.html" (dict - "title" $title - "image" .Params.image - "sizes" site.Params.image_sizes.sections.posts.hero_single - "context" . + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.jobs.hero_single + "context" . ) -}} diff --git a/layouts/partials/jobs/single/job-infos.html b/layouts/_partials/jobs/single/job-infos.html similarity index 100% rename from layouts/partials/jobs/single/job-infos.html rename to layouts/_partials/jobs/single/job-infos.html diff --git a/layouts/partials/jobs/single/sidebar.html b/layouts/_partials/jobs/single/sidebar.html similarity index 79% rename from layouts/partials/jobs/single/sidebar.html rename to layouts/_partials/jobs/single/sidebar.html index e117daae0..095edfc25 100644 --- a/layouts/partials/jobs/single/sidebar.html +++ b/layouts/_partials/jobs/single/sidebar.html @@ -7,8 +7,8 @@ {{ end }} {{ partial "toc/container.html" (dict - "toc" "toc/default.html" - "context" . - ) }} + "toc" "toc/default.html" + "context" . + ) }}
    diff --git a/layouts/partials/jobs/single/summary.html b/layouts/_partials/jobs/single/summary.html similarity index 100% rename from layouts/partials/jobs/single/summary.html rename to layouts/_partials/jobs/single/summary.html diff --git a/layouts/partials/journals/partials/journal.html b/layouts/_partials/journals/partials/journal.html similarity index 83% rename from layouts/partials/journals/partials/journal.html rename to layouts/_partials/journals/partials/journal.html index 2820db6b7..4c99600e5 100644 --- a/layouts/partials/journals/partials/journal.html +++ b/layouts/_partials/journals/partials/journal.html @@ -16,11 +16,11 @@ itemscope itemtype="https://schema.org/Periodical">
    {{ partial "journals/partials/journal/heading.html" (dict - "item" . - "options" $options - "level" $heading_level - "itemprop" "title" - )}} + "item" . + "options" $options + "level" $heading_level + "itemprop" "title" + ) }} {{ if and $options.summary .Params.summary }}
    @@ -31,9 +31,9 @@ {{ if $options.image }} {{ partial "journals/partials/journal/media.html" (dict - "image" $journal.Params.image - "layout" $layout - )}} + "image" $journal.Params.image + "layout" $layout + ) }} {{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/partials/journals/partials/journal/heading.html b/layouts/_partials/journals/partials/journal/heading.html similarity index 100% rename from layouts/partials/journals/partials/journal/heading.html rename to layouts/_partials/journals/partials/journal/heading.html diff --git a/layouts/_partials/journals/partials/journal/media.html b/layouts/_partials/journals/partials/journal/media.html new file mode 100644 index 000000000..4134ea254 --- /dev/null +++ b/layouts/_partials/journals/partials/journal/media.html @@ -0,0 +1,5 @@ +{{ partial "commons/item/media.html" (dict + "image" .image + "type" "journals" + "layout" .layout +) }} \ No newline at end of file diff --git a/layouts/partials/journals/partials/journal/summary.html b/layouts/_partials/journals/partials/journal/summary.html similarity index 100% rename from layouts/partials/journals/partials/journal/summary.html rename to layouts/_partials/journals/partials/journal/summary.html diff --git a/layouts/partials/journals/partials/journals.html b/layouts/_partials/journals/partials/journals.html similarity index 72% rename from layouts/partials/journals/partials/journals.html rename to layouts/_partials/journals/partials/journals.html index 10829b0c3..4588655f0 100644 --- a/layouts/partials/journals/partials/journals.html +++ b/layouts/_partials/journals/partials/journals.html @@ -7,11 +7,11 @@ {{ range $journals }}
  • {{ partial "journals/partials/journal.html" (dict - "journal" . - "heading_level" $heading_level - "layout" $layout - "options" $options - )}} + "journal" . + "heading_level" $heading_level + "layout" $layout + "options" $options + ) }}
    • {{ end }} diff --git a/layouts/partials/journals/section.html b/layouts/_partials/journals/section.html similarity index 88% rename from layouts/partials/journals/section.html rename to layouts/_partials/journals/section.html index 6c5051cde..856393baf 100644 --- a/layouts/partials/journals/section.html +++ b/layouts/_partials/journals/section.html @@ -1,9 +1,9 @@ {{ partial "journals/section/hero.html" . }}
    {{ partial "journals/section/summary.html" (dict - "with_container" true - "context" . - ) }} + "with_container" true + "context" . + ) }} {{ if (partial "IsFirstPage" .) }} {{ partial "contents/list.html" (dict diff --git a/layouts/_partials/journals/section/hero.html b/layouts/_partials/journals/section/hero.html new file mode 100644 index 000000000..7ebd9429f --- /dev/null +++ b/layouts/_partials/journals/section/hero.html @@ -0,0 +1,7 @@ +{{- $title := or .Params.header_text .Title -}} +{{- partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.journals.hero + "context" . +) -}} diff --git a/layouts/partials/journals/section/summary.html b/layouts/_partials/journals/section/summary.html similarity index 100% rename from layouts/partials/journals/section/summary.html rename to layouts/_partials/journals/section/summary.html diff --git a/layouts/partials/journals/single.html b/layouts/_partials/journals/single.html similarity index 91% rename from layouts/partials/journals/single.html rename to layouts/_partials/journals/single.html index 063f17195..5f95813f9 100644 --- a/layouts/partials/journals/single.html +++ b/layouts/_partials/journals/single.html @@ -6,9 +6,9 @@ {{ with .Params.summary }}{{ end }} {{ partial "journals/single/summary.html" (dict - "context" . - "block_wrapped" true - ) }} + "context" . + "block_wrapped" true + ) }} {{ partial "contents/list.html" (dict "context" . diff --git a/layouts/partials/jobs/single/hero.html b/layouts/_partials/journals/single/hero.html similarity index 58% rename from layouts/partials/jobs/single/hero.html rename to layouts/_partials/journals/single/hero.html index 7920243c5..67de42557 100644 --- a/layouts/partials/jobs/single/hero.html +++ b/layouts/_partials/journals/single/hero.html @@ -5,8 +5,8 @@ {{ end }} {{- partial "header/hero.html" (dict - "title" $title - "image" .Params.image - "sizes" site.Params.image_sizes.sections.jobs.hero_single - "context" . - ) -}} + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.journals.hero_single + "context" . +) -}} diff --git a/layouts/partials/journals/single/summary.html b/layouts/_partials/journals/single/summary.html similarity index 100% rename from layouts/partials/journals/single/summary.html rename to layouts/_partials/journals/single/summary.html diff --git a/layouts/partials/laboratories/partials/laboratories.html b/layouts/_partials/laboratories/partials/laboratories.html similarity index 73% rename from layouts/partials/laboratories/partials/laboratories.html rename to layouts/_partials/laboratories/partials/laboratories.html index 43b5d98c4..875802bc1 100644 --- a/layouts/partials/laboratories/partials/laboratories.html +++ b/layouts/_partials/laboratories/partials/laboratories.html @@ -7,11 +7,11 @@ {{ range $laboratories }}
  • {{ partial "laboratories/partials/laboratory.html" (dict - "laboratory" . - "heading_level" $heading_level - "layout" $layout - "options" $options - )}} + "laboratory" . + "heading_level" $heading_level + "layout" $layout + "options" $options + ) }}
    • {{ end }} diff --git a/layouts/partials/laboratories/partials/laboratory.html b/layouts/_partials/laboratories/partials/laboratory.html similarity index 83% rename from layouts/partials/laboratories/partials/laboratory.html rename to layouts/_partials/laboratories/partials/laboratory.html index 93053e463..8d2d21219 100644 --- a/layouts/partials/laboratories/partials/laboratory.html +++ b/layouts/_partials/laboratories/partials/laboratory.html @@ -16,11 +16,11 @@ itemscope itemtype="https://schema.org/ResearchOrganization">
    {{ partial "laboratories/partials/laboratory/heading.html" (dict - "item" . - "options" $options - "level" $heading_level - "itemprop" "title" - )}} + "item" . + "options" $options + "level" $heading_level + "itemprop" "title" + ) }} {{ if and $options.summary .Params.summary }}
    @@ -31,9 +31,9 @@ {{ if $options.image }} {{ partial "laboratories/partials/laboratory/media.html" (dict - "image" $laboratory.Params.image - "layout" $layout - )}} + "image" $laboratory.Params.image + "layout" $layout + ) }} {{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/partials/laboratories/partials/laboratory/heading.html b/layouts/_partials/laboratories/partials/laboratory/heading.html similarity index 100% rename from layouts/partials/laboratories/partials/laboratory/heading.html rename to layouts/_partials/laboratories/partials/laboratory/heading.html diff --git a/layouts/_partials/laboratories/partials/laboratory/media.html b/layouts/_partials/laboratories/partials/laboratory/media.html new file mode 100644 index 000000000..61505579a --- /dev/null +++ b/layouts/_partials/laboratories/partials/laboratory/media.html @@ -0,0 +1,5 @@ +{{ partial "commons/item/media.html" (dict + "image" .image + "type" "laboratories" + "layout" .layout +) }} \ No newline at end of file diff --git a/layouts/partials/laboratories/partials/laboratory/summary.html b/layouts/_partials/laboratories/partials/laboratory/summary.html similarity index 100% rename from layouts/partials/laboratories/partials/laboratory/summary.html rename to layouts/_partials/laboratories/partials/laboratory/summary.html diff --git a/layouts/partials/laboratories/section.html b/layouts/_partials/laboratories/section.html similarity index 88% rename from layouts/partials/laboratories/section.html rename to layouts/_partials/laboratories/section.html index bca625aef..cc6036030 100644 --- a/layouts/partials/laboratories/section.html +++ b/layouts/_partials/laboratories/section.html @@ -1,9 +1,9 @@ {{ partial "laboratories/section/hero.html" . }}
    {{ partial "laboratories/section/summary.html" (dict - "with_container" true - "context" . - ) }} + "with_container" true + "context" . + ) }} {{ if (partial "IsFirstPage" .) }} {{ partial "contents/list.html" (dict diff --git a/layouts/_partials/laboratories/section/hero.html b/layouts/_partials/laboratories/section/hero.html new file mode 100644 index 000000000..e66c29970 --- /dev/null +++ b/layouts/_partials/laboratories/section/hero.html @@ -0,0 +1,7 @@ +{{- $title := or .Params.header_text .Title -}} +{{- partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.laboratories.hero + "context" . +) -}} diff --git a/layouts/partials/laboratories/section/summary.html b/layouts/_partials/laboratories/section/summary.html similarity index 100% rename from layouts/partials/laboratories/section/summary.html rename to layouts/_partials/laboratories/section/summary.html diff --git a/layouts/partials/laboratories/single.html b/layouts/_partials/laboratories/single.html similarity index 92% rename from layouts/partials/laboratories/single.html rename to layouts/_partials/laboratories/single.html index 949034a17..7657993dc 100644 --- a/layouts/partials/laboratories/single.html +++ b/layouts/_partials/laboratories/single.html @@ -6,9 +6,9 @@ {{ with .Params.summary }}{{ end }} {{ partial "schools/single/summary.html" (dict - "context" . - "block_wrapped" true - ) }} + "context" . + "block_wrapped" true + ) }}
    {{ partial "commons/contact-details.html" (dict "subject" .) }} diff --git a/layouts/partials/schools/single/hero.html b/layouts/_partials/laboratories/single/hero.html similarity index 57% rename from layouts/partials/schools/single/hero.html rename to layouts/_partials/laboratories/single/hero.html index 87114e186..65db22e89 100644 --- a/layouts/partials/schools/single/hero.html +++ b/layouts/_partials/laboratories/single/hero.html @@ -5,8 +5,8 @@ {{ end }} {{- partial "header/hero.html" (dict - "title" $title - "image" .Params.logo - "sizes" site.Params.image_sizes.sections.schools.hero_single - "context" . - ) -}} + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.laboratories.hero_single + "context" . +) -}} diff --git a/layouts/partials/laboratories/single/summary.html b/layouts/_partials/laboratories/single/summary.html similarity index 100% rename from layouts/partials/laboratories/single/summary.html rename to layouts/_partials/laboratories/single/summary.html diff --git a/layouts/_partials/locations/partials/location.html b/layouts/_partials/locations/partials/location.html new file mode 100644 index 000000000..b89c32d9e --- /dev/null +++ b/layouts/_partials/locations/partials/location.html @@ -0,0 +1,42 @@ +{{ $location := .location }} +{{ $options := .options }} +{{ $layout := .layout }} +{{ $heading_tag := partial "GetHeadingTag" (dict + "level" .heading_level + "attributes" "class='location-title' itemprop='headline'" +) }} + +{{ with $location }} +
  • +
    +
    + {{- $title := partial "PrepareHTML" .Title -}} + {{ $heading_tag.open }} + {{ $title }} + {{ $heading_tag.close }} + {{ with .Params.contact_details }} + {{ partial "commons/address" .postal_address }} + {{ end }} +
    + {{- if and .Params.summary $options.summary -}} + {{ partial "GetRichSummary" ( dict + "summary" .Params.summary + "kind" "locations" + ) }} +

    + {{- i18n "blocks.locations.button_location" -}} +

    + {{- end -}} +
    +
    + + {{ if $options.image }} + {{ partial "locations/partials/location/media.html" (dict + "image" .Params.image + "layout" $layout + "type" "locations" + ) }} + {{- end -}} +
    +
    • +{{ end }} \ No newline at end of file diff --git a/layouts/_partials/locations/partials/location/media.html b/layouts/_partials/locations/partials/location/media.html new file mode 100644 index 000000000..7de9453d3 --- /dev/null +++ b/layouts/_partials/locations/partials/location/media.html @@ -0,0 +1 @@ +{{ partial "commons/item/media.html" . }} \ No newline at end of file diff --git a/layouts/_partials/locations/partials/locations.html b/layouts/_partials/locations/partials/locations.html new file mode 100644 index 000000000..35f727db0 --- /dev/null +++ b/layouts/_partials/locations/partials/locations.html @@ -0,0 +1,10 @@ +
      + {{ range .Paginator.Pages }} + {{ partial "locations/partials/location.html" (dict + "location" . + "heading_level" 2 + "layout" site.Params.locations.index.layout + "options" site.Params.locations.index.options + ) }} + {{ end }} +
    diff --git a/layouts/partials/locations/partials/map.html b/layouts/_partials/locations/partials/map.html similarity index 75% rename from layouts/partials/locations/partials/map.html rename to layouts/_partials/locations/partials/map.html index dc5c4b3eb..da4df7167 100644 --- a/layouts/partials/locations/partials/map.html +++ b/layouts/_partials/locations/partials/map.html @@ -8,13 +8,13 @@ {{ if $has_address }}
    -
    {{ range $locations }} {{ $address_geolocation := .Params.contact_details.postal_address.geolocation }} {{ if and $address_geolocation.longitude $address_geolocation.latitude }} -
    +
  • {{ $title := "" }} {{ if .Params.title }}
    @@ -36,17 +36,16 @@ {{ end -}} {{- if .Params.image -}}
    - {{- partial "commons/image.html" - (dict - "image" .Params.image - "alt" $title - "sizes" site.Params.image_sizes.sections.locations.map - ) -}} + {{- partial "commons/image.html" (dict + "image" .Params.image + "alt" $title + "sizes" site.Params.image_sizes.sections.locations.layouts.map + ) -}}
    {{- end -}} -
    • + {{ end }} {{ end }} -
    +
    {{ end }} diff --git a/layouts/partials/locations/section.html b/layouts/_partials/locations/section.html similarity index 80% rename from layouts/partials/locations/section.html rename to layouts/_partials/locations/section.html index a0b786b94..925ad8838 100644 --- a/layouts/partials/locations/section.html +++ b/layouts/_partials/locations/section.html @@ -2,9 +2,9 @@
    {{ partial "locations/section/summary.html" (dict - "with_container" true - "context" . - ) }} + "with_container" true + "context" . + ) }} {{ if (partial "IsFirstPage" .) }} {{ partial "contents/list.html" (dict @@ -20,8 +20,8 @@ {{ if site.Params.locations.index.map }} {{ $locations := .Pages }} {{ partial "locations/partials/map.html" (dict - "locations" $locations - "title" (i18n "programs.location" $locations) - )}} + "locations" $locations + "title" (i18n "programs.location" $locations) + ) }} {{ end }}
    \ No newline at end of file diff --git a/layouts/_partials/locations/section/hero.html b/layouts/_partials/locations/section/hero.html new file mode 100644 index 000000000..7d824b8e1 --- /dev/null +++ b/layouts/_partials/locations/section/hero.html @@ -0,0 +1,7 @@ +{{- $title := or .Params.header_text .Title -}} +{{- partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.locations.hero + "context" . +) -}} diff --git a/layouts/partials/locations/section/summary.html b/layouts/_partials/locations/section/summary.html similarity index 100% rename from layouts/partials/locations/section/summary.html rename to layouts/_partials/locations/section/summary.html diff --git a/layouts/partials/locations/single.html b/layouts/_partials/locations/single.html similarity index 93% rename from layouts/partials/locations/single.html rename to layouts/_partials/locations/single.html index ee97ec56d..002806239 100644 --- a/layouts/partials/locations/single.html +++ b/layouts/_partials/locations/single.html @@ -6,9 +6,9 @@ {{ with .Params.summary }}{{ end }} {{ partial "locations/single/summary.html" (dict - "context" . - "block_wrapped" true - ) }} + "context" . + "block_wrapped" true + ) }} {{ partial "contents/list.html" (dict "context" . @@ -17,6 +17,7 @@ {{ partial "locations/single/diplomas.html" . }}
    + {{ $address_geolocation := .Params.contact_details.postal_address.geolocation }} {{ if and $address_geolocation.longitude $address_geolocation.latitude }} {{ partial "locations/partials/map.html" (dict diff --git a/layouts/_partials/locations/single/diplomas.html b/layouts/_partials/locations/single/diplomas.html new file mode 100644 index 000000000..032a7ca1d --- /dev/null +++ b/layouts/_partials/locations/single/diplomas.html @@ -0,0 +1,25 @@ +
    + {{ range .Params.diplomas }} + {{ $diploma := site.GetPage .path }} + {{ if $diploma }} +

    + + {{- partial "PrepareHTML" $diploma.Title -}} + +

    + + {{ with .programs }} +
      + {{- range . -}} + {{ $program := site.GetPage .path }} + {{- partial "programs/partials/program.html" (dict + "program" $program + "heading_level" 3 + "options" site.Params.locations.single.programs.options + ) -}} + {{- end -}} +
    + {{ end }} + {{ end }} + {{ end }} +
    \ No newline at end of file diff --git a/layouts/_partials/locations/single/hero.html b/layouts/_partials/locations/single/hero.html new file mode 100644 index 000000000..5a54bd1f0 --- /dev/null +++ b/layouts/_partials/locations/single/hero.html @@ -0,0 +1,8 @@ +{{- $title := or .Params.header_text .Title -}} +{{- partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.locations.hero_single + "context" . + "hero_text_complement" "locations/single/hero/address.html" +) -}} diff --git a/layouts/partials/locations/single/hero/address.html b/layouts/_partials/locations/single/hero/address.html similarity index 100% rename from layouts/partials/locations/single/hero/address.html rename to layouts/_partials/locations/single/hero/address.html diff --git a/layouts/partials/locations/single/summary.html b/layouts/_partials/locations/single/summary.html similarity index 100% rename from layouts/partials/locations/single/summary.html rename to layouts/_partials/locations/single/summary.html diff --git a/layouts/_partials/organizations/partials/layouts/carousel/carousel.html b/layouts/_partials/organizations/partials/layouts/carousel/carousel.html new file mode 100644 index 000000000..b09201f58 --- /dev/null +++ b/layouts/_partials/organizations/partials/layouts/carousel/carousel.html @@ -0,0 +1,35 @@ +{{ $logo_index := .logo_index }} +{{ $options := .options }} +{{ $layout := .layout }} +{{ $heading_level := .heading_level | default 2 }} + +
      + {{- range .organizations }} +
    • + {{ if .path }} + {{ with site.GetPage .path }} + {{ partial "organizations/partials/organization.html" (dict + "organization" . + "options" $options + "layout" $layout + "heading_level" $heading_level + ) }} + {{ end }} + {{ else }} + {{ partial "organizations/partials/organization.html" (dict + "organization" (dict + "Title" .name + "Permalink" .url + "Params" (dict + "logo" .logo + "external" true + ) + ) + "options" $options + "layout" $layout + "heading_level" $heading_level + ) }} + {{ end }} +
      • + {{ end -}} +
    diff --git a/layouts/partials/organizations/partials/layouts/grid/grid.html b/layouts/_partials/organizations/partials/layouts/grid/grid.html similarity index 71% rename from layouts/partials/organizations/partials/layouts/grid/grid.html rename to layouts/_partials/organizations/partials/layouts/grid/grid.html index 9b264fe12..2d90967b6 100644 --- a/layouts/partials/organizations/partials/layouts/grid/grid.html +++ b/layouts/_partials/organizations/partials/layouts/grid/grid.html @@ -3,19 +3,20 @@ {{ $layout := .layout }} {{ $heading_level := .heading_level | default 2 }} -
    +
      {{- range .organizations }} - {{ if .path }} - {{ with site.GetPage .path }} - {{ partial "organizations/partials/organization.html" (dict +
    • + {{ if .path }} + {{ with site.GetPage .path }} + {{ partial "organizations/partials/organization.html" (dict "organization" . "options" $options "layout" $layout "heading_level" $heading_level ) }} - {{ end }} - {{ else }} - {{ partial "organizations/partials/organization.html" (dict + {{ end }} + {{ else }} + {{ partial "organizations/partials/organization.html" (dict "organization" (dict "Title" .name "Permalink" .url @@ -28,6 +29,7 @@ "layout" $layout "heading_level" $heading_level ) }} - {{ end }} + {{ end }} +
      • {{ end -}} -
    \ No newline at end of file + \ No newline at end of file diff --git a/layouts/partials/organizations/partials/layouts/large/large.html b/layouts/_partials/organizations/partials/layouts/large/large.html similarity index 71% rename from layouts/partials/organizations/partials/layouts/large/large.html rename to layouts/_partials/organizations/partials/layouts/large/large.html index 3e0fa9bbf..0b5dad44e 100644 --- a/layouts/partials/organizations/partials/layouts/large/large.html +++ b/layouts/_partials/organizations/partials/layouts/large/large.html @@ -3,19 +3,20 @@ {{ $layout := .layout }} {{ $heading_level := .heading_level | default 2 }} -
    +
      {{- range .organizations }} - {{ if .path }} - {{ with site.GetPage .path }} - {{ partial "organizations/partials/organization.html" (dict +
    • + {{ if .path }} + {{ with site.GetPage .path }} + {{ partial "organizations/partials/organization.html" (dict "organization" . "options" $options "layout" $layout "heading_level" $heading_level ) }} - {{ end }} - {{ else }} - {{ partial "organizations/partials/organization.html" (dict + {{ end }} + {{ else }} + {{ partial "organizations/partials/organization.html" (dict "organization" (dict "Title" .name "Permalink" .url @@ -28,6 +29,7 @@ "layout" $layout "heading_level" $heading_level ) }} - {{ end }} + {{ end }} +
      • {{ end -}} -
    \ No newline at end of file + \ No newline at end of file diff --git a/layouts/partials/organizations/partials/layouts/map/filters-button.html b/layouts/_partials/organizations/partials/layouts/map/filters-button.html similarity index 100% rename from layouts/partials/organizations/partials/layouts/map/filters-button.html rename to layouts/_partials/organizations/partials/layouts/map/filters-button.html diff --git a/layouts/partials/organizations/partials/layouts/map/filters.html b/layouts/_partials/organizations/partials/layouts/map/filters.html similarity index 96% rename from layouts/partials/organizations/partials/layouts/map/filters.html rename to layouts/_partials/organizations/partials/layouts/map/filters.html index c0f137d2e..d4f3d3bd5 100644 --- a/layouts/partials/organizations/partials/layouts/map/filters.html +++ b/layouts/_partials/organizations/partials/layouts/map/filters.html @@ -18,7 +18,7 @@ {{ with site.GetPage .path }} {{ $id := printf "%s-%s" $index .Slug }}
  • - +
    • {{ end }} diff --git a/layouts/partials/organizations/partials/layouts/map/map.html b/layouts/_partials/organizations/partials/layouts/map/map.html similarity index 77% rename from layouts/partials/organizations/partials/layouts/map/map.html rename to layouts/_partials/organizations/partials/layouts/map/map.html index 73e3e7adc..356daa273 100644 --- a/layouts/partials/organizations/partials/layouts/map/map.html +++ b/layouts/_partials/organizations/partials/layouts/map/map.html @@ -22,14 +22,14 @@ {{ if $address_geolocation }}
  • {{ partial "organizations/partials/organization.html" (dict - "organization" . - "options" (merge $options (dict - "address" true - "logo" false - )) - "layout" $layout - "heading_level" $heading_level - ) }} + "organization" . + "options" (merge $options (dict + "address" true + "logo" false + )) + "layout" $layout + "heading_level" $heading_level + ) }}
    • {{ end }} {{ end }} @@ -47,17 +47,16 @@ {{ if and $options.filters $categories }} {{ partial "organizations/partials/layouts/map/filters.html" ( dict - "categories" $categories - "index" $block_index - ) }} + "categories" $categories + "index" $block_index + ) }} {{ end }} -
    + aria-label="{{ $aria_label }}"> {{ if and $options.filters $categories }} {{ partial "organizations/partials/layouts/map/filters-button.html" $block_index }} {{ end }} @@ -67,11 +66,12 @@ {{ $address_geolocation := .Params.contact_details.postal_address.geolocation }} {{ if $address_geolocation }} {{ partial "organizations/partials/organization.html" (dict - "organization" . - "options" $options - "with_geolocation" true - "heading_level" $heading_level - ) }} + "organization" . + "layout" $layout + "options" $options + "with_geolocation" true + "heading_level" $heading_level + ) }} {{ end }} {{ end }} {{ end -}} diff --git a/layouts/partials/organizations/partials/logo.html b/layouts/_partials/organizations/partials/logo.html similarity index 68% rename from layouts/partials/organizations/partials/logo.html rename to layouts/_partials/organizations/partials/logo.html index 182b27717..8b52e5680 100644 --- a/layouts/partials/organizations/partials/logo.html +++ b/layouts/_partials/organizations/partials/logo.html @@ -5,9 +5,9 @@ {{ end }} {{- end -}} \ No newline at end of file diff --git a/layouts/partials/organizations/partials/organization.html b/layouts/_partials/organizations/partials/organization.html similarity index 94% rename from layouts/partials/organizations/partials/organization.html rename to layouts/_partials/organizations/partials/organization.html index 26e916e53..d95469d42 100644 --- a/layouts/partials/organizations/partials/organization.html +++ b/layouts/_partials/organizations/partials/organization.html @@ -20,9 +20,7 @@ {{ end }} {{ if and $options.filters .Params.organizations_categories }} data-filters="{{ (partial "GetCategoriesSlug" .) | encoding.Jsonify }}" - {{ end }} - > - + {{ end }}>
    {{ $heading_tag.open }} {{- if $options.link -}} @@ -53,16 +51,16 @@ {{ if and $options.categories .Params.organizations_categories }} {{ partial "commons/categories.html" (dict - "context" . - "kind" "organization" - )}} + "context" . + "kind" "organization" + ) }} {{ end }}
    {{ if $options.logo }} {{ partial "organizations/partials/organization/media.html" (dict - "context" . - "layout" $layout - )}} + "context" . + "layout" $layout + ) }} {{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/partials/organizations/partials/organization/media.html b/layouts/_partials/organizations/partials/organization/media.html similarity index 72% rename from layouts/partials/organizations/partials/organization/media.html rename to layouts/_partials/organizations/partials/organization/media.html index 4e59a5897..7e6cedf35 100644 --- a/layouts/partials/organizations/partials/organization/media.html +++ b/layouts/_partials/organizations/partials/organization/media.html @@ -3,11 +3,11 @@ {{- if and $prefer_images .context.Params.image -}} {{ partial "commons/item/media.html" (dict - "image" .context.Params.image - "class" "media--image" - "type" "organizations" - "layout" $layout - )}} + "image" .context.Params.image + "class" "media--image" + "type" "organizations" + "layout" $layout + ) }} {{- else -}} {{ end }} - {{ if and $program.Params.image $options.image }} -
    - {{ partial "commons/image.html" - (dict - "image" $program.Params.image - "sizes" site.Params.image_sizes.blocks.programs - ) }} -
    + {{ partial "programs/partials/program/media.html" (dict + "image" $program.Params.image + "layout" $layout + "type" "programs" + ) }} {{ end }} diff --git a/layouts/_partials/programs/partials/program/media.html b/layouts/_partials/programs/partials/program/media.html new file mode 100644 index 000000000..7de9453d3 --- /dev/null +++ b/layouts/_partials/programs/partials/program/media.html @@ -0,0 +1 @@ +{{ partial "commons/item/media.html" . }} \ No newline at end of file diff --git a/layouts/partials/programs/partials/programs.html b/layouts/_partials/programs/partials/programs.html similarity index 81% rename from layouts/partials/programs/partials/programs.html rename to layouts/_partials/programs/partials/programs.html index 8be54e5d2..049ff0880 100644 --- a/layouts/partials/programs/partials/programs.html +++ b/layouts/_partials/programs/partials/programs.html @@ -6,9 +6,9 @@
      {{ range .Paginator.Pages }} {{- partial "programs/partials/program.html" (dict - "program" . - "options" site.Params.programs.index.options - ) -}} + "program" . + "options" site.Params.programs.index.options + ) -}} {{ end }}
    {{ end }} diff --git a/layouts/partials/programs/section.html b/layouts/_partials/programs/section.html similarity index 77% rename from layouts/partials/programs/section.html rename to layouts/_partials/programs/section.html index 2ee1821dd..cada42110 100644 --- a/layouts/partials/programs/section.html +++ b/layouts/_partials/programs/section.html @@ -1,16 +1,14 @@ {{ partial "programs/section/hero.html" . }}
    - {{ partial "toc/container.html" - (dict - "toc" "toc/default.html" - "context" . - ) - }} + {{ partial "toc/container.html" (dict + "toc" "toc/default.html" + "context" . + ) }} {{ partial "programs/section/summary.html" (dict - "with_container" true - "context" . - ) }} + "with_container" true + "context" . + ) }} {{ partial "contents/list.html" (dict "context" . @@ -31,10 +29,10 @@
      {{- range $programs -}} {{ partial "programs/partials/program.html" (dict - "program" . - "heading_level" 2 - "options" site.Params.programs.index.options - )}} + "program" . + "heading_level" 2 + "options" site.Params.programs.index.options + ) }} {{- end -}}
    diff --git a/layouts/_partials/programs/section/hero.html b/layouts/_partials/programs/section/hero.html new file mode 100644 index 000000000..97d3b98c3 --- /dev/null +++ b/layouts/_partials/programs/section/hero.html @@ -0,0 +1,7 @@ +{{- $title := or .Params.header_text .Title -}} +{{- partial "header/hero.html" (dict + "title" $title + "image" .Params.image + "sizes" site.Params.image_sizes.sections.programs.hero + "context" . +) -}} diff --git a/layouts/partials/programs/section/summary.html b/layouts/_partials/programs/section/summary.html similarity index 100% rename from layouts/partials/programs/section/summary.html rename to layouts/_partials/programs/section/summary.html diff --git a/layouts/partials/programs/single.html b/layouts/_partials/programs/single.html similarity index 100% rename from layouts/partials/programs/single.html rename to layouts/_partials/programs/single.html diff --git a/layouts/_partials/programs/single/admission.html b/layouts/_partials/programs/single/admission.html new file mode 100644 index 000000000..25e7c36ec --- /dev/null +++ b/layouts/_partials/programs/single/admission.html @@ -0,0 +1,109 @@ +{{- if or (partial "GetTextFromHTML" .Params.prerequisites) (partial "GetTextFromHTML" .Params.pricing) (partial "GetTextFromHTML" .Params.registration) (partial "GetTextFromHTML" .Params.accessibility) (partial "GetTextFromHTML" .Params.other) -}} +
    +
    +
    +

    {{ i18n "programs.toc.admission" }}

    +
    + {{- if partial "GetTextFromHTML" .Params.prerequisites -}} +
    +

    {{ i18n "programs.prerequisites" }}

    + {{- partial "PrepareHTML" .Params.prerequisites -}} +
    + {{- end -}} + + {{- if partial "GetTextFromHTML" .Params.pricing -}} +
    +

    {{ i18n "programs.pricing" }}

    + {{- partial "PrepareHTML" .Params.pricing -}} +
    + {{- end -}} + + {{- if partial "GetTextFromHTML" .Params.pricing_initial -}} +
    +

    {{ i18n "programs.pricing_initial" }}

    + {{- partial "PrepareHTML" .Params.pricing_initial -}} +
    + {{- end -}} + + {{- if partial "GetTextFromHTML" .Params.pricing_continuing -}} +
    +

    {{ i18n "programs.pricing_continuing" }}

    + {{- partial "PrepareHTML" .Params.pricing_continuing -}} +
    + {{- end -}} + + {{- if partial "GetTextFromHTML" .Params.pricing_apprenticeship -}} +
    +

    {{ i18n "programs.pricing_apprenticeship" }}

    + {{- partial "PrepareHTML" .Params.pricing_apprenticeship -}} +
    + {{- end -}} + + {{- if or .Params.registration .Params.registration_url -}} +
    +

    {{ i18n "programs.registration" }}

    + {{- partial "PrepareHTML" .Params.registration -}} + {{- if partial "GetTextFromHTML" .Params.registration_url -}} +

    {{ i18n "programs.apply" }}

    + {{- end -}} +
    + {{- end -}} + + {{- if partial "GetTextFromHTML" .Params.accessibility -}} +
    +

    {{ i18n "programs.accessibility" }}

    + {{- partial "PrepareHTML" .Params.accessibility -}} +
    + {{- end -}} + + {{- if partial "GetTextFromHTML" .Params.other -}} +
    +

    {{ i18n "programs._other" }}

    + {{- partial "PrepareHTML" .Params.other -}} +
    + {{- end -}} + + {{- if .Params.roles -}} +
    +

    {{ i18n "programs.roles" }}

    + {{- with .Params.roles -}} + {{- range . }} + {{ $title := .title }} + {{- range .persons -}} + {{ $slug := . }} + {{ with site.GetPage "persons" }} + {{ with .GetPage $slug }} +

    + {{ $title }} +
    + {{ partial "PrepareHTML" .Title }} + {{ if .Params.phone }} +
    + {{ safeHTML .Params.phone }} + {{ end }} + {{ if .Params.email }} +
    + {{ .Params.email }} + {{ end }} +

    + {{ end }} + {{ end }} + {{ end }} + {{ end -}} + {{- end -}} +
    + {{- end -}} + + {{- if partial "GetTextFromHTML" .Params.contacts -}} +
    +

    {{ i18n "programs.contacts" }}

    + {{- if or (partial "GetTextFromHTML" .Params.contacts) -}} + {{- partial "PrepareHTML" .Params.contacts -}} + {{- end -}} +
    + {{- end -}} +
    +
    +
    +
    +{{- end -}} diff --git a/layouts/_partials/programs/single/certification.html b/layouts/_partials/programs/single/certification.html new file mode 100644 index 000000000..a7b231bdb --- /dev/null +++ b/layouts/_partials/programs/single/certification.html @@ -0,0 +1,17 @@ +{{- if .Params.certifications.qualiopi.certified -}} +
    +
    +
    +

    {{ i18n "programs.toc.certification" }}

    +
    +
    + {{ i18n + {{- if partial "GetTextFromHTML" .Params.certifications.qualiopi.text -}} + {{- partial "PrepareHTML" .Params.certifications.qualiopi.text -}} + {{- end -}} +
    +
    +
    +
    +
    +{{- end -}} diff --git a/layouts/partials/programs/single/cohorts.html b/layouts/_partials/programs/single/cohorts.html similarity index 100% rename from layouts/partials/programs/single/cohorts.html rename to layouts/_partials/programs/single/cohorts.html diff --git a/layouts/_partials/programs/single/hero.html b/layouts/_partials/programs/single/hero.html new file mode 100644 index 000000000..65bc4c440 --- /dev/null +++ b/layouts/_partials/programs/single/hero.html @@ -0,0 +1,8 @@ +{{- $title := or .Params.header_text .Title -}} + +{{ partial "header/hero.html" (dict + "title" $title + "context" . + "hero_content_complement" "programs/single/hero/logos.html" + "hero_complement" "programs/single/hero/essential.html" +)}} diff --git a/layouts/partials/programs/single/hero/essential.html b/layouts/_partials/programs/single/hero/essential.html similarity index 100% rename from layouts/partials/programs/single/hero/essential.html rename to layouts/_partials/programs/single/hero/essential.html diff --git a/layouts/partials/programs/single/hero/logos.html b/layouts/_partials/programs/single/hero/logos.html similarity index 77% rename from layouts/partials/programs/single/hero/logos.html rename to layouts/_partials/programs/single/hero/logos.html index 693c79338..ba3b36ab3 100644 --- a/layouts/partials/programs/single/hero/logos.html +++ b/layouts/_partials/programs/single/hero/logos.html @@ -2,11 +2,10 @@
    {{ if and site.Params.programs.single.options.logo .Params.logo }} {{ end }} {{ if site.Params.programs.single.options.diploma_certification }} diff --git a/layouts/_partials/programs/single/image.html b/layouts/_partials/programs/single/image.html new file mode 100644 index 000000000..76b5414dd --- /dev/null +++ b/layouts/_partials/programs/single/image.html @@ -0,0 +1,8 @@ +{{ if . }} + {{ partial "commons/image-figure.html" (dict + "image" . + "sizes" site.Params.image_sizes.sections.programs.image + "itemprop" true + "image_class" "featured-image" + )}} +{{ end }} \ No newline at end of file diff --git a/layouts/_partials/programs/single/pedagogy.html b/layouts/_partials/programs/single/pedagogy.html new file mode 100644 index 000000000..5a91589c0 --- /dev/null +++ b/layouts/_partials/programs/single/pedagogy.html @@ -0,0 +1,43 @@ +{{- if or (partial "GetTextFromHTML" .Params.content) (partial "GetTextFromHTML" .Params.pedagogy) (partial "GetTextFromHTML" .Params.evaluation) (.Params.teachers) -}} +
    +
    +
    +

    {{ i18n "programs.toc.pedagogy" }}

    +
    + {{- if partial "GetTextFromHTML" .Params.content -}} +
    +

    {{ i18n "programs.content" }}

    + {{- partial "PrepareHTML" .Params.content -}} +
    + {{- end -}} + + {{- if partial "GetTextFromHTML" .Params.pedagogy -}} +
    +

    {{ i18n "programs.pedagogy" }}

    + {{- partial "PrepareHTML" .Params.pedagogy -}} +
    + {{- end -}} + + {{- if partial "GetTextFromHTML" .Params.evaluation -}} +
    +

    {{ i18n "programs.evaluation" }}

    + {{- partial "PrepareHTML" .Params.evaluation -}} +
    + {{- end -}} + + {{- if .Params.teachers -}} + {{ $title := i18n "programs.teachers" -}} +
    +

    {{ $title }}

    + {{- partial "programs/single/teachers.html" (dict + "title" $title + "teachers" .Params.teachers + "descriptions" .Params.teachers_description + ) -}} +
    + {{- end -}} +
    +
    +
    +
    +{{- end -}} diff --git a/layouts/partials/programs/single/presentation.html b/layouts/_partials/programs/single/presentation.html similarity index 95% rename from layouts/partials/programs/single/presentation.html rename to layouts/_partials/programs/single/presentation.html index 0183a2a25..3c98b3ef4 100644 --- a/layouts/partials/programs/single/presentation.html +++ b/layouts/_partials/programs/single/presentation.html @@ -28,10 +28,10 @@

    {{ i18n "programs.children" }}

    {{- range . -}} {{ $child := site.GetPage .path }} {{ partial "programs/partials/program.html" (dict - "program" $child - "heading_level" 4 - "options" site.Params.programs.single.children.options - )}} + "program" $child + "heading_level" 4 + "options" site.Params.programs.single.children.options + ) }} {{- end -}} @@ -85,7 +85,6 @@

    {{ i18n "programs.administrative_information" }}

    {{ end }} -
    diff --git a/layouts/partials/programs/single/related-events.html b/layouts/_partials/programs/single/related-events.html similarity index 65% rename from layouts/partials/programs/single/related-events.html rename to layouts/_partials/programs/single/related-events.html index 9d29c8f54..af3d83c7d 100644 --- a/layouts/partials/programs/single/related-events.html +++ b/layouts/_partials/programs/single/related-events.html @@ -13,24 +13,24 @@

    {{ i18n "events.title" }}

    {{ $events = partial "GetPathSliceFromObjects" . }} {{ $params := partial "GetLayoutAndOptions" (dict - "param" "programs.related_events" - "default" "events.index" - ) }} + "param" "programs.related_events" + "default" "events.index" + ) }}
    {{ partial "blocks/templates/agenda.html" (dict - "block" (dict - "template" "agenda" - "ranks" (dict - "base" 2 - "self" 2 - ) - "data" (dict - "events" $events - "layout" $params.layout - "options" $params.options - ) + "block" (dict + "template" "agenda" + "ranks" (dict + "base" 2 + "self" 2 + ) + "data" (dict + "events" $events + "layout" $params.layout + "options" $params.options ) - ) }} + ) + ) }}
    diff --git a/layouts/_partials/programs/single/related-exhibitions.html b/layouts/_partials/programs/single/related-exhibitions.html new file mode 100644 index 000000000..b2fea7666 --- /dev/null +++ b/layouts/_partials/programs/single/related-exhibitions.html @@ -0,0 +1,38 @@ +{{ $exhibitions := .exhibitions }} +{{ $context := .context }} + +{{ with $exhibitions }} +
    +
    +
    +

    {{ i18n "exhibitions.title" }}

    + + {{ $category_name := safeHTML $context.Title | truncate 30 }} + {{ i18n "exhibitions.see_all_in_program" (dict "Title" $category_name) }} + + + {{ $exhibitions = partial "GetPathSliceFromObjects" . }} + {{ $params := partial "GetLayoutAndOptions" (dict + "param" "programs.related_exhibitions" + "default" "exhibitions.index" + ) }} +
    + {{ partial "blocks/templates/exhibitions.html" (dict + "block" (dict + "template" "exhibitions" + "ranks" (dict + "base" 2 + "self" 2 + ) + "data" (dict + "exhibitions" $exhibitions + "layout" $params.layout + "options" $params.options + ) + ) + ) }} +
    +
    +
    +
    +{{ end }} \ No newline at end of file diff --git a/layouts/partials/programs/single/related-posts.html b/layouts/_partials/programs/single/related-posts.html similarity index 63% rename from layouts/partials/programs/single/related-posts.html rename to layouts/_partials/programs/single/related-posts.html index c6cf68286..ff25e1174 100644 --- a/layouts/partials/programs/single/related-posts.html +++ b/layouts/_partials/programs/single/related-posts.html @@ -14,23 +14,23 @@

    {{ i18n "posts.title" }}

    {{ $posts = partial "GetPathSliceFromObjects" . }} {{ $params := partial "GetLayoutAndOptions" (dict - "param" "programs.related_posts" - "default" "posts.index" - ) }} + "param" "programs.related_posts" + "default" "posts.index" + ) }} {{ partial "blocks/templates/posts.html" (dict - "block" (dict - "template" "posts" - "ranks" (dict - "base" 2 - "self" 2 - ) - "data" (dict - "posts" $posts - "layout" $params.layout - "options" $params.options - ) + "block" (dict + "template" "posts" + "ranks" (dict + "base" 2 + "self" 2 ) - ) }} + "data" (dict + "posts" $posts + "layout" $params.layout + "options" $params.options + ) + ) + ) }}
    diff --git a/layouts/partials/programs/single/related-projects.html b/layouts/_partials/programs/single/related-projects.html similarity index 63% rename from layouts/partials/programs/single/related-projects.html rename to layouts/_partials/programs/single/related-projects.html index 7fd855960..557ff379e 100644 --- a/layouts/partials/programs/single/related-projects.html +++ b/layouts/_partials/programs/single/related-projects.html @@ -14,23 +14,23 @@

    {{ i18n "projects.title" }}

    {{ $projects = partial "GetPathSliceFromObjects" . }} {{ $params := partial "GetLayoutAndOptions" (dict - "param" "programs.related_projects" - "default" "projects.index" - ) }} + "param" "programs.related_projects" + "default" "projects.index" + ) }} {{ partial "blocks/templates/projects.html" (dict - "block" (dict - "template" "projects" - "ranks" (dict - "base" 2 - "self" 2 - ) - "data" (dict - "projects" $projects - "layout" $params.layout - "options" $params.options - ) + "block" (dict + "template" "projects" + "ranks" (dict + "base" 2 + "self" 2 ) - ) }} + "data" (dict + "projects" $projects + "layout" $params.layout + "options" $params.options + ) + ) + ) }}
    diff --git a/layouts/partials/programs/single/related.html b/layouts/_partials/programs/single/related.html similarity index 52% rename from layouts/partials/programs/single/related.html rename to layouts/_partials/programs/single/related.html index 377fc75dc..e621e59c7 100644 --- a/layouts/partials/programs/single/related.html +++ b/layouts/_partials/programs/single/related.html @@ -4,25 +4,37 @@ {{ $post_category := site.GetPage ( printf "/posts_categories/%s" .posts ) }} {{ with $post_category }} {{ partial "programs/single/related-posts.html" (dict - "posts" ( first site.Params.programs.related_posts.quantity .Pages ) - "context" . - ) }} + "posts" ( first site.Params.programs.related_posts.quantity .Pages ) + "context" . + ) }} {{ end }} {{ $event_category := site.GetPage (printf "/events_categories/%s" .events ) }} {{ with $event_category }} - {{ partial "programs/single/related-events.html" (dict - "events" ( first site.Params.programs.related_events.quantity .Pages ) + {{ $events := where .Pages "Type" "events" }} + {{ if $events }} + {{ partial "programs/single/related-events.html" (dict + "events" ( first site.Params.programs.related_events.quantity $events ) + "context" . + ) }} + {{ end }} + + {{ $exhibitions := where .Pages "Type" "exhibitions" }} + {{ if $exhibitions }} + {{ partial "programs/single/related-exhibitions.html" (dict + "exhibitions" ( first site.Params.programs.related_exhibitions.quantity $exhibitions ) "context" . ) }} + {{ end }} + {{ end }} {{ $project_category := site.GetPage (printf "/projects_categories/%s" .projects ) }} {{ with $project_category }} {{ partial "programs/single/related-projects.html" (dict - "projects" ( first site.Params.programs.related_projects.quantity .Pages ) - "context" . - ) }} + "projects" ( first site.Params.programs.related_projects.quantity .Pages ) + "context" . + ) }} {{ end }} diff --git a/layouts/_partials/programs/single/results.html b/layouts/_partials/programs/single/results.html new file mode 100644 index 000000000..66f5a71ab --- /dev/null +++ b/layouts/_partials/programs/single/results.html @@ -0,0 +1,24 @@ +{{- if or (partial "GetTextFromHTML" .Params.opportunities) (partial "GetTextFromHTML" .Params.results) -}} +
    +
    +
    +

    {{ i18n "programs.toc.results" }}

    +
    + {{- if partial "GetTextFromHTML" .Params.opportunities -}} +
    +

    {{ i18n "programs.opportunities" }}

    + {{- partial "PrepareHTML" .Params.opportunities -}} +
    + {{- end -}} + + {{- if partial "GetTextFromHTML" .Params.results -}} +
    +

    {{ i18n "programs.results" }}

    + {{- partial "PrepareHTML" .Params.results -}} +
    + {{- end -}} +
    +
    +
    +
    +{{- end -}} diff --git a/layouts/partials/programs/single/summary.html b/layouts/_partials/programs/single/summary.html similarity index 100% rename from layouts/partials/programs/single/summary.html rename to layouts/_partials/programs/single/summary.html diff --git a/layouts/partials/programs/single/taxonomies.html b/layouts/_partials/programs/single/taxonomies.html similarity index 100% rename from layouts/partials/programs/single/taxonomies.html rename to layouts/_partials/programs/single/taxonomies.html diff --git a/layouts/partials/programs/single/teachers.html b/layouts/_partials/programs/single/teachers.html similarity index 100% rename from layouts/partials/programs/single/teachers.html rename to layouts/_partials/programs/single/teachers.html diff --git a/layouts/partials/programs/single/toc.html b/layouts/_partials/programs/single/toc.html similarity index 82% rename from layouts/partials/programs/single/toc.html rename to layouts/_partials/programs/single/toc.html index 1a41bd8b4..4c3e3de2a 100644 --- a/layouts/partials/programs/single/toc.html +++ b/layouts/_partials/programs/single/toc.html @@ -22,8 +22,16 @@ {{ $roles := .context.Params.roles }} {{ $contacts := partial "GetTextFromHTML" .context.Params.contacts }} -{{ $category := site.GetPage (printf "/posts_categories/%s" .context.Params.related_categories.posts ) }} -{{ $related_posts := $category.Pages }} +{{ $post_category := site.GetPage (printf "/posts_categories/%s" .context.Params.related_categories.posts ) }} +{{ $related_posts := $post_category.Pages }} + +{{ $project_category := site.GetPage (printf "/projects_categories/%s" .context.Params.related_categories.projects ) }} +{{ $related_projects := $project_category.Pages }} + +{{ $event_category := site.GetPage (printf "/events_categories/%s" .context.Params.related_categories.events ) }} +{{ $related_events := where $event_category.Pages "Type" "events" }} +{{ $related_exhibitions := where $event_category.Pages "Type" "exhibitions" }} + {{/* nav-link required for toggle active class */}}