Skip to content
Snippets Groups Projects
Commit a6d81886 authored by alexisben's avatar alexisben
Browse files

organization single re-integration

parent 17140348
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 137 additions and 103 deletions
assets/sass/_theme/sections/organizations.sass
+ 46
− 42
View file @ a6d81886
...@@ -44,53 +44,57 @@ ...@@ -44,53 +44,57 @@
@include media-breakpoint-up(desktop) @include media-breakpoint-up(desktop)
font-size: $lead-sidebar-size-desktop font-size: $lead-sidebar-size-desktop
.document-content .document-content
.organization-meta .logo
.logo figcaption
figcaption text-align: right
text-align: right @include meta
@include meta margin-bottom: $spacing0
margin-bottom: $spacing0 picture
picture aspect-ratio: 1/1
aspect-ratio: 1/1 background: $color-background-alt
background: $color-background-alt display: block
display: block padding: $spacing2
padding: $spacing2 margin-bottom: half($spacing0)
margin-bottom: half($spacing0) width: auto
img img
width: 100% width: 100%
height: 100% height: 100%
object-fit: contain object-fit: contain
object-position: center object-position: center
.blocks .blocks
margin-top: $spacing3 margin-top: $spacing3
.contacts-list .contacts-details
@include list-reset @include grid(2, md)
padding-left: 0 margin-top: $spacing3
text-align: right width: col(8)
margin-top: $spacing1 ul
li @include list-reset
list-style-type: none padding-left: 0
+ li li
margin-top: $spacing1 list-style-type: none
span + li
@include meta margin-top: $spacing1
display: block address
@include media-breakpoint-down(desktop) @extend .p
> span
@include meta
display: block
@include media-breakpoint-down(md)
.document-content .document-content
.organization-meta .logo
margin-top: $spacing3 margin-top: $spacing3
.logo display: flex
justify-content: space-between
.contacts-details
width: auto
ul + ul
margin-top: $spacing1
li
display: flex display: flex
justify-content: space-between justify-content: space-between
picture align-items: baseline
width: 66.6%
.contacts-list
li
display: flex
justify-content: space-between
align-items: baseline
@include media-breakpoint-up(desktop) @include media-breakpoint-up(md)
.document-content .document-content
> .container > .container
display: flex display: flex
...@@ -98,5 +102,5 @@ ...@@ -98,5 +102,5 @@
gap: $grid-gutter gap: $grid-gutter
[itemprop="articleBody"] [itemprop="articleBody"]
width: col(8) width: col(8)
.organization-meta .logo
width: col(3) width: col(3)
\ No newline at end of file
i18n/en.yml
+ 1
− 0
View file @ a6d81886
...@@ -23,6 +23,7 @@ commons: ...@@ -23,6 +23,7 @@ commons:
slideX: Go to slide %s slideX: Go to slide %s
close: Close close: Close
contact: contact:
address: Address
email: Email email: Email
phone: Téléphone phone: Téléphone
website: Site web website: Site web
......
i18n/fr.yml
+ 1
− 0
View file @ a6d81886
...@@ -23,6 +23,7 @@ commons: ...@@ -23,6 +23,7 @@ commons:
slideX: Aller au slide %s slideX: Aller au slide %s
close: Fermer close: Fermer
contact: contact:
address: Adresse
email: Email email: Email
phone: Téléphone phone: Téléphone
website: Site web website: Site web
......
layouts/organizations/single.html
+ 11
− 14
View file @ a6d81886
{{ define "main" }} {{ define "main" }}
{{ partial "organizations/hero.html" . }} {{ partial "organizations/hero.html" . }}
<div class="document-content"> <div class="document-content" itemscope itemtype="https://schema.org/Organization">
{{ partial "toc/container.html" {{ partial "toc/container.html" (dict
(dict "toc" "toc/default.html"
"toc" "toc/default.html" "context" .
"context" . ) }}
)
}}
<div class="container"> <div class="container">
<div itemprop="articleBody" class="rich-text"> <div itemprop="articleBody" class="rich-text">
...@@ -18,15 +16,14 @@ ...@@ -18,15 +16,14 @@
{{ if (partial "GetTextFromHTML" .Content) }} {{ if (partial "GetTextFromHTML" .Content) }}
{{ partial "PrepareHTML" ( {{ partial "PrepareHTML" (
partial "H2AddId" .Content partial "H2AddId" .Content
) }} ) }}
{{ end }} {{ end }}
</div> </div>
{{ partial "organizations/logo.html" . }}
<div class="organization-meta"> </div>
{{ partial "organizations/logo.html" . }} <div class="container">
{{ partial "organizations/contacts.html" . }} {{ partial "organizations/contact-details.html" . }}
</div>
</div> </div>
{{ partial "blocks/list.html" . }} {{ partial "blocks/list.html" . }}
</div> </div>
......
layouts/partials/organizations/contact-details.html 0 → 100644
+ 77
− 0
View file @ a6d81886
{{ with .Params }}
{{ if or .website .linkedin .twitter .email .address .city .zipcode .country .phone }}
<div class="contacts-details">
{{ if or .website .linkedin .twitter .email }}
<ul>
{{ if .website }}
<li>
<span>{{ i18n "commons.contact.website" }}</span>
<a href="{{ .website }}" target="_blank" rel="noopener" itemprop="url">{{ .website }}</a>
</li>
{{ end }}
{{ if .linkedin }}
<li>
<span>LinkedIn</span>
<a href="{{ .linkedin }}" target="_blank" rel="noopener" itemprop="url">{{ .linkedin }}</a>
</li>
{{ end }}
{{ if .twitter }}
<li>
<span>Twitter</span>
<a href="https://twitter.com/{{ .twitter }}" target="_blank" rel="noopener" itemprop="url">{{ .twitter }}</a>
</li>
{{ end }}
{{ if .email }}
<li>
<span>{{ i18n "commons.contact.email" }}</span>
<a href="mailto:{{ .email }}" itemprop="email">{{ .email }}</a>
</li>
{{ end }}
</ul>
{{ end }}
{{ if or .address .city .zipcode .country .phone }}
<ul>
{{ if or .address .city .zipcode .country }}
<li>
<span>{{ i18n "commons.contact.address" }}</span>
<address itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
{{ with .address }}
<span itemprop="streetAddress">
{{ partial "PrepareHTML" . }},
</span>
<br>
{{ end }}
{{ with .city }}
<span itemprop="addressLocality">
{{ partial "PrepareHTML" . }}
</span>
{{ end }}
{{ with .zipcode }}
<span itemprop="postalCode">
{{ partial "PrepareHTML" . }}
</span>
{{ end }}
{{ with .country }}
<span itemprop="postalCode">
{{ partial "PrepareHTML" . }}
</span>
{{ end }}
</address>
</li>
{{ end }}
{{ if .phone }}
<li>
<span>{{ i18n "commons.contact.phone" }}</span>
<a href="tel:{{ .phone }}" itemprop="telephone">{{ .phone }}</a>
</li>
{{ end }}
</ul>
{{ end }}
</div>
{{ end }}
{{ end }}
layouts/partials/organizations/contacts.html deleted 100644 → 0
+ 0
− 36
View file @ 17140348
<ul class="contacts-list">
{{ if .Params.linkedin }}
<li>
<span>Linkedin</span>
<a href="mailto:{{ .Params.linkedin }}" target="_blank" rel="noopener" itemprop="url">{{ .Params.linkedin }}</a>
</li>
{{ end }}
{{ if .Params.twitter }}
<li>
<span>Twitter</span>
<a href="https://twitter.com/{{ .Params.twitter }}" target="_blank" rel="noopener" itemprop="url">{{ .Params.twitter }}</a>
</li>
{{ end }}
{{ if .Params.website }}
<li>
<span>{{ i18n "commons.contact.website" }}</span>
<a href="{{ .Params.website }}" target="_blank" rel="noopener" itemprop="url">{{ .Params.website }}</a>
</li>
{{ end }}
{{ if .Params.email }}
<li>
<span>{{ i18n "commons.contact.email" }}</span>
<a href="mailto:{{ .Params.email }}" itemprop="email">{{ .Params.email }}</a>
</li>
{{ end }}
{{ if .Params.phone }}
<li>
<span>{{ i18n "commons.contact.phone" }}</span>
<a href="tel:{{ .Params.phone }}" itemprop="telephone">{{ .Params.phone }}</a>
</li>
{{ end }}
</ul>
layouts/partials/organizations/content.html deleted 100644 → 0
+ 0
− 9
View file @ 17140348
{{ if (partial "GetTextFromHTML" .Content) }}
<div itemprop="articleBody" class="rich-text">
{{
partial "PrepareHTML" (
partial "H2AddId" .Content
)
}}
</div>
{{ end }}
layouts/partials/organizations/logo.html
+ 0
− 1
View file @ a6d81886
{{- if .Params.logo -}} {{- if .Params.logo -}}
<figure class="logo"> <figure class="logo">
<figcaption>{{ i18n "organizations.logo" }}</figcaption>
{{- partial "commons/image.html" {{- partial "commons/image.html"
(dict (dict
"image" .Params.logo "image" .Params.logo
......
layouts/persons/list.html
+ 1
− 1
View file @ a6d81886
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
{{ $chapo_block = true }} {{ $chapo_block = true }}
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ partial "persons/chapo.html" (dict {{ partial "persons/chapo.html" (dict
"context" . "context" .
"with_container" (not $chapo_block) "with_container" (not $chapo_block)
...@@ -36,7 +37,6 @@ ...@@ -36,7 +37,6 @@
{{- end -}} {{- end -}}
</div> </div>
{{ partial "blocks/list.html" . }} {{ partial "blocks/list.html" . }}
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment