Merge branch 'main' into 6.0

assets/sass/_theme/blocks/pages.sass

@@ -124,9 +124,6 @@
     &--list
         ul
             @include list-reset
-            &.title-only
-                li
-                    line-height: 1
             li
                 display: block
                 + li

assets/sass/_theme/design-system/footer.sass

@@ -26,6 +26,8 @@ footer#document-footer
     .footer
         &-site
             @include small
+            * + *
+                margin-top: $spacing0
         &-social, &-legals, &-credit
             @include meta
         &-credit

layouts/partials/commons/image-default.html

-{{ $section_type := .}}
-{{ $use_default := (index site.Params $section_type).default_image}}
-{{ $image := site.Data.website.default.image }}
+{{ $section_type := . }}
+{{ $use_default := (index site.Params $section_type).default_image }}
+{{ $image := index site.Data.website.default "image" }}
 
 {{ if and $use_default $image }}
   {{ with index site.Params.image_sizes.sections $section_type }}
-    {{ $sizes := .items }}
+    {{ $sizes := .item }}
 
+    {{ $sizes }}
     {{- partial "commons/image.html"
-      (dict
-        "image"    $image
-        "sizes"    $sizes
-      ) -}}
+        (dict
+          "image"    $image
+          "sizes"    $sizes
+        ) -}}
   {{ end }}
-{{ end }}
+{{ end }}
\ No newline at end of file

layouts/partials/footer/site.html

+{{ $logo := site.Params.logo.header }}
+
 {{- with site.Data.school -}}
-<address itemscope itemtype="https://schema.org/CollegeOrUniversity">
-  <meta itemprop="image" content="/assets/images/logo.svg">
-  <p itemprop="name">{{ htmlUnescape (trim .name "\n") }}</p>
-  {{ if or (.address) (.country) -}}
-  <p itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
-    {{ if .address }}<span itemprop="streetAddress">{{ trim .address "\n" }}</span><br>{{ end }}
-    {{ if .zipcode }}<span itemprop="postalCode">{{ trim .zipcode "\n" }}</span> {{ end }}{{ if .city }}<span itemprop="addressLocality">{{ trim .city "\n" }}</span>{{ end }}
-    {{ if .country }}<span itemprop="addressCountry">{{ trim .country "\n" }}</span>{{ end }}
-  </p>
-  {{ end }}
-  {{- if .phone -}}
-    <p>
-      {{- $phone := trim .phone "\n " -}}
-      {{- $phone_href := replace $phone " " "" -}}
-      <a itemprop="telephone" href="tel:{{ $phone_href }}">{{ $phone }}</a>
-    </p>
-  {{- end }}
-</address>
+  <div itemscope itemtype="https://schema.org/CollegeOrUniversity">
+    <meta itemprop="logo" content="{{ $logo }}">
+    <p itemprop="name">{{ htmlUnescape (trim .name "\n") }}</p>
+    {{ if or (.address) (.country) -}}
+      <address itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
+        {{ if .address }}<span itemprop="streetAddress">{{ trim .address "\n" }}</span><br>{{ end }}
+        {{ if .zipcode }}<span itemprop="postalCode">{{ trim .zipcode "\n" }}</span> {{ end }}{{ if .city }}<span itemprop="addressLocality">{{ trim .city "\n" }}</span> {{ end }}{{ if .country }}<span itemprop="addressCountry">{{ trim .country "\n" }}</span>{{ end }}
+      </address>
+    {{ end }}
+    {{- if .phone -}}
+      <p>
+        {{- $phone := trim .phone "\n " -}}
+        {{- $phone_href := replace $phone " " "" -}}
+        <a itemprop="telephone" href="tel:{{ $phone_href }}">{{ $phone }}</a>
+      </p>
+    {{- end }}
+  </div>
 {{- end -}}
 {{- with site.Data.laboratory -}}
-<address itemscope itemtype="">
-  <meta itemprop="image" content="/assets/images/logo.svg">
-  <p itemprop="name">{{ htmlUnescape (trim .name "\n") }}</p>
-  {{ if or (.address) (.country) }}
-  <p itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
-    {{ if .address }}<span itemprop="streetAddress">{{ .address }}</span><br>{{ end }}
-    {{ if .zipcode }}<span itemprop="postalCode">{{ .zipcode }}</span> {{ end }}{{ if .city }}<span itemprop="addressLocality">{{ .city }}</span>{{ end }}<br>
-    {{ if .country }}<span itemprop="addressCountry">{{ .country }}</span>{{ end }}
-  </p>
-  {{ end }}
-  {{- if .phone -}}
-    <p>
-      {{- $phone := trim .phone "\n " -}}
-      {{- $phone_href := replace $phone " " "" -}}
-      <a itemprop="telephone" href="tel:{{ $phone_href }}">{{ $phone }}</a>
-    </p>
-  {{- end }}
-</address>
+  <div itemscope itemtype="https://schema.org/ResearchOrganization">
+    <meta itemprop="logo" content="{{ $logo }}">
+    <p itemprop="name">{{ htmlUnescape (trim .name "\n") }}</p>
+    {{ if or (.address) (.country) }}
+    <address itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
+      {{ if .address_name }}<span itemprop="name">{{ .address_name }}</span><br>{{ end }}
+      {{ if .address }}<span itemprop="streetAddress">{{ .address }}</span><br>{{ end }}
+      {{ if .address_additional }}<span itemprop="description">{{ .address_additional }}</span><br>{{ end }}
+      {{ if .zipcode }}<span itemprop="postalCode">{{ .zipcode }}</span> {{ end }}{{ if .city }}<span itemprop="addressLocality">{{ .city }}</span> {{ end }}{{ if .country }}<span itemprop="addressCountry">{{ .country }}</span>{{ end }}
+    </address>
+    {{ end }}
+    {{- if .phone -}}
+      <p>
+        {{- $phone := trim .phone "\n " -}}
+        {{- $phone_href := replace $phone " " "" -}}
+        <a itemprop="telephone" href="tel:{{ $phone_href }}">{{ $phone }}</a>
+      </p>
+    {{- end }}
+  </div>
 {{- end -}}
 {{- with site.Data.journal -}}
-<div itemscope itemtype="https://schema.org/Periodical">
-  <meta itemprop="image" content="/assets/images/logo.svg">
-  <p itemprop="name">{{ htmlUnescape (trim .name "\n") }}</p>
-  <p itemprop="issn">{{ trim .issn "\n" }}</p>
-</div>
+  <div itemscope itemtype="https://schema.org/Periodical">
+    <meta itemprop="image" content="/assets/images/logo.svg">
+    <p itemprop="name">{{ htmlUnescape (trim .name "\n") }}</p>
+    <p itemprop="issn">{{ trim .issn "\n" }}</p>
+  </div>
 {{- end -}}