From 28283ed8da89ace2b63993f6ddd1c3ac816b3797 Mon Sep 17 00:00:00 2001
From: Olivia206 <olivia.simonet206@gmail.com>
Date: Thu, 15 Feb 2024 18:02:14 +0100
Subject: [PATCH] fix #270
---
layouts/partials/footer/site.html | 81 ++++++++++++++++---------------
1 file changed, 41 insertions(+), 40 deletions(-)
diff --git a/layouts/partials/footer/site.html b/layouts/partials/footer/site.html
index 103d7138..866bacff 100644
--- a/layouts/partials/footer/site.html
+++ b/layouts/partials/footer/site.html
@@ -1,47 +1,48 @@
{{- 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>
+ <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>
{{- 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>
+ <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_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 }}
</p>
- {{- 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 }}
+ </address>
{{- 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 -}}
--
GitLab