{{ partial "date-short.html" (dict "time" .Date "lang" $lang) }}
{{ .Title }}
diff --git a/layouts/blog/single.html b/layouts/blog/single.html index 7aa8c8b..97a2c56 100644 --- a/layouts/blog/single.html +++ b/layouts/blog/single.html @@ -1,16 +1,22 @@ {{ define "main" }}
-
-
+ {{ partial "picture" (dict "img" .Params.image "class" "img" "widths" (slice 540 720 960 1140) )}}
+ {{ if .Params.imageInfo }}
+
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 87cd0c1..1b31cbe 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -3,26 +3,26 @@
+ {{- .Params.imageInfo }}
+
+ {{ end }}
+
{{ .Title }} {{ .Params.brief }}
- + {{ .TableOfContents }} + {{ end }}
- {{ i18n "footer_share" }}
+
{{ i18n "footer_share" }}
-
{{ range .Site.Data.footer.share }}
-
- - {{ $url := .url | relLangURL }} - {{ partial "social-sharer.html" (dict "context" . "url" .url "name" .name) }} +
- + {{ $url := .URL | relLangURL }} + {{ partial "social-sharer.html" (dict "context" . "url" $url "name" .name) }} {{ end }}
-
+
{{ i18n "footer_follow_blog" }} {{ i18n "footer_follow_blog_blog" }}
-
+
- {{ i18n "footer_follow_us" }}
+
\ No newline at end of file
+{{ i18n "footer_follow_us" }}
-
{{ range .Site.Data.footer.follow }}
-
-
+
{{ partial "icon.html" .name }}
{{ .name }}
@@ -43,12 +43,12 @@
{{ range .Site.Data.footer.content }}diff --git a/layouts/partials/ticket.html b/layouts/partials/ticket.html index f1eeeda..ebfd31f 100644 --- a/layouts/partials/ticket.html +++ b/layouts/partials/ticket.html @@ -7,9 +7,9 @@ {{ if .soldOut }} {{ i18n "home_tickets_soldout" }} {{ else }} - + {{ partial "icon.html" "ticket" }} {{- i18n "home_tickets_action" -}} {{ end }} -
- {{ i18n .title }} +{{ i18n .title }}{{ if .links }}-
{{ range .links }}
-
-
+
{{ if .nameKey }}
{{ i18n .nameKey }}
{{ else }}
@@ -63,10 +63,10 @@
{{ end }}
{{ if .Site.Params.subscriptionUrl }}
- {{ i18n "newsletter" }} +{{ i18n "newsletter" }}{{ i18n "subscribe_notice" }}
+ class="btn" rel="noopener noreferrer" target="_blank"> {{ partial "icon.html" "subscribe" }} {{- i18n "subscribe_action" -}} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 9138d01..264dada 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -5,6 +5,7 @@ + {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }} {{/* NOTE: These Hugo Internal Templates can be found starting at @@ -44,10 +45,7 @@ - - + + {{ partial "stylesheets" . }} - {{ block "headextra" . }} - - {{ end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 96aa9d0..333c261 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -18,14 +18,18 @@-
{{- $currentPage := . -}}
{{ range .Site.Menus.main }}
-
- +
-
{{ if (hasPrefix .URL "http") }}
- {{ .Name }}
+
+ {{ partial "icon.html" "external" }}
+ {{ .Name }}
+
{{ else if (strings.HasSuffix .URL "pdf")}}
{{ .Name }}
{{ else if (isset .Page.Params "icon") }}
-
- {{ partial "icon.html" .Page.Params.icon }}
+
+ {{ .Name }}
+ {{ partial "icon.html" .Page.Params.icon }}
{{ else }}
{{ .Name }}
diff --git a/layouts/partials/partner.html b/layouts/partials/partner.html
index c9b357c..3874cb7 100644
--- a/layouts/partials/partner.html
+++ b/layouts/partials/partner.html
@@ -1,4 +1,6 @@
-{{ .Title }}
\ No newline at end of file
+{{- $path := path.Join "images" "partners" .Params.category .Params.key }}
+{{- $img := printf "%s.%s" (relURL $path) "png" }}
+
+{{ partial "picture" (dict "img" $img "ext" "png") }}
+{{ .Title }}
+
diff --git a/layouts/partials/picture.html b/layouts/partials/picture.html
new file mode 100644
index 0000000..e52c24e
--- /dev/null
+++ b/layouts/partials/picture.html
@@ -0,0 +1,29 @@
+{{/*
+ usage {{ partial "picture" (dict "img" XXX "class" XXX "widths" (slice 500 320, ...))}}
+ argument: a dictionary
+ "img": mandatory, image path
+ "class": the picture class if any
+ "widths": array of sizes if any
+ */}}
+{{- $img := index . "img" }}
+{{- $imgName := index (split (path.Base $img) ".") 0 }}
+{{- $imgBase := path.Join (path.Dir $img) $imgName }}
+{{- $class := index . "class" }}
+{{- $widths := index . "widths" }}
+{{- $ext := path.Ext $img }}
+
+ {{ if $widths }} + {{ $max := 0 }} + {{ range $widths }} + {{ if (gt . $max) }} + {{ $max := . }} + {{ end }} + diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html new file mode 100644 index 0000000..f294a50 --- /dev/null +++ b/layouts/partials/scripts.html @@ -0,0 +1 @@ + diff --git a/layouts/partials/social-sharer.html b/layouts/partials/social-sharer.html index bede4a0..3e74123 100644 --- a/layouts/partials/social-sharer.html +++ b/layouts/partials/social-sharer.html @@ -1,14 +1,14 @@ {{- if (eq .name "facebook") -}} + class="social" rel="noopener noreferrer" target="_blank"> {{ partial "icon.html" .name }} - {{- i18n "facebook_share_label" -}} + {{ i18n "facebook_share_label" }} {{- else if (eq .name "twitter") -}} {{ $text := i18n "twitter_share_text" }} + class="social" rel="noopener noreferrer" target="_blank"> {{ partial "icon.html" .name }} - {{- i18n "twitter_share_label" -}} + {{ i18n "twitter_share_label" }} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/layouts/partials/stylesheets.html b/layouts/partials/stylesheets.html new file mode 100644 index 0000000..2ebc10c --- /dev/null +++ b/layouts/partials/stylesheets.html @@ -0,0 +1 @@ + diff --git a/layouts/partials/team.html b/layouts/partials/team.html index b92cf1a..6ce28ed 100644 --- a/layouts/partials/team.html +++ b/layouts/partials/team.html @@ -1,15 +1,17 @@ - +{{- $photo := relURL (path.Join "images" "team" .key) }} +{{ partial "picture" (dict "img" $photo "class" "photo" ) }} ++ {{ end }} + + {{ else }} + + {{ end }} + + +
-\ No newline at end of file +{{ .Title }}
-{{ .Params.subtitle }}
+{{ .title }}
+{{ .subtitle }}
-
- {{ range .Params.socials }}
+ {{ range .socials }}
- - + {{ partial "icon.html" (lower .name) }} {{- .name -}} {{ end }}
-
-
+
{{ if .nameKey }}
{{ i18n .nameKey }}
{{ else }}
@@ -63,10 +63,10 @@
{{ end }}
{{ if .Site.Params.subscriptionUrl }}
{{ .Title }}
{{ if .Params.website }} {{ .Params.website }} {{ end }}{{index .Site.Data.partner .Params.lang "why" }}
{{ .Params.why }}
Social media
+{{index .Site.Data.partner .Params.lang "socials" }}
-
{{ range .Page.Params.socials }}
- - - {{ partial "icon.html" (lower .name) }} + + {{ partial "icon.html" .icon }} {{ .name }} @@ -37,13 +39,13 @@ {{ end }} {{ if .Params.jobs }} -
-
- {{ .title }} + {{ .title }} {{ partial "icon.html" "map-marker" }} @@ -60,4 +62,4 @@ {{ end }} -{{ end }} \ No newline at end of file +{{ end }} diff --git a/layouts/sessions/single.html b/layouts/sessions/single.html index cf14e54..a96bd55 100644 --- a/layouts/sessions/single.html +++ b/layouts/sessions/single.html @@ -50,7 +50,7 @@ {{ if .Params.presentation }} {{ partial "icon.html" "slides" }} Voir les slides diff --git a/layouts/shortcodes/album.html b/layouts/shortcodes/album.html index d317742..21c6647 100644 --- a/layouts/shortcodes/album.html +++ b/layouts/shortcodes/album.html @@ -1,8 +1,8 @@ {{ $_hugo_config := `{ "version": 1 }` }}diff --git a/layouts/shortcodes/home-info.html b/layouts/shortcodes/home-info.html index 6894453..956e736 100644 --- a/layouts/shortcodes/home-info.html +++ b/layouts/shortcodes/home-info.html @@ -1,22 +1,18 @@ {{ $_hugo_config := `{ "version": 1 }` }}{{ range (split (.Get "images") ",") }} - +{{ partial "picture" (dict "img" . "class" "img" "widths" (slice 540 720 960 1140)) }} {{ end }}\ No newline at end of file +{{ .Inner }}--\ No newline at end of file +- {{ .Inner }} -+{{ .Inner }}{{ with .Get "what" }} -- {{range (split . ",") }} -diff --git a/layouts/shortcodes/home-location.html b/layouts/shortcodes/home-location.html index 0d520b2..ba4c934 100644 --- a/layouts/shortcodes/home-location.html +++ b/layouts/shortcodes/home-location.html @@ -1,7 +1,9 @@ {{ $_hugo_config := `{ "version": 1 }` }}- {{ $labelValue := (split . ":") }} - {{ $label := (index $labelValue 0) }} - {{ $value := (index $labelValue 1) }} - {{ $value }} -- {{ end }} + {{range (split . ",") }} +{{ $label }}-+ {{ $labelValue := (split . ":") }} + {{ $label := (index $labelValue 0) }} + {{ $value := (index $labelValue 1) }} + {{ $value }} +{{ end }} + {{ end }}{{ $label }}- + {{ partial "picture" (dict "img" (.Get "image") "class" "map" "widths" (slice 540 720 960 1140)) }} + + \ No newline at end of file + diff --git a/layouts/shortcodes/home-subscribe.html b/layouts/shortcodes/home-subscribe.html index c26e182..d00f8b2 100644 --- a/layouts/shortcodes/home-subscribe.html +++ b/layouts/shortcodes/home-subscribe.html @@ -2,8 +2,8 @@-@@ -12,7 +14,7 @@ {{ .Get "address" }} {{ partial "icon.html" "direction" }} @@ -20,4 +22,4 @@- +
{{ if $logo }}@@ -13,6 +12,7 @@ {{ .Inner }}
{{ partial "icon.html" "scroll-down" }}diff --git a/layouts/shortcodes/partners.html b/layouts/shortcodes/partners.html index 673632a..ff9b415 100644 --- a/layouts/shortcodes/partners.html +++ b/layouts/shortcodes/partners.html @@ -8,7 +8,7 @@ {{ range (split (.Get "categories") ",") }}-{{ index $.Site.Params.partnerCategories . }} +{{ . }}
-
{{ $partners := where $site.AllPages "Params.category" . }}
diff --git a/layouts/shortcodes/picture.html b/layouts/shortcodes/picture.html
new file mode 100644
index 0000000..7b05f8a
--- /dev/null
+++ b/layouts/shortcodes/picture.html
@@ -0,0 +1,5 @@
+{{ $_hugo_config := `{ "version": 1 }` }}
+{{- $img := .Get "img" }}
+{{- $class := .Get "class" }}
+{{- $widths := .Get "widths" }}
+{{ partial "picture" (dict "img" $img "class" $class "widths" $widths) }}
diff --git a/layouts/shortcodes/teams.html b/layouts/shortcodes/teams.html
index b4bd275..81015c5 100644
--- a/layouts/shortcodes/teams.html
+++ b/layouts/shortcodes/teams.html
@@ -1,16 +1,13 @@
{{ $_hugo_config := `{ "version": 1 }` }}
{{ $site := .Site }}
{{ range (split (.Get "types") ",") }}
-
- {{ partial "team.html" . }} + {{ range where $site.Data.team "type" $type }}
- {{ partial "team.html" . }} {{ end }}
- {{ $typeLabel := (split . "=") }} - {{ $type := (index $typeLabel 0) }} - {{ $label := (index $typeLabel 1) }} - +{{ $typeLabel := (split . "=") }} +{{ $type := (index $typeLabel 0) }} +{{ $label := (index $typeLabel 1) }} + {{ $label }}
--
- {{ range where $site.AllPages "Params.type" $type }}
-
{{index .Site.Data.partner .Params.lang "jobs" }}
-
{{ range .Page.Params.jobs }}
-
{{ range .Page.Params.socials }}
-
-
+
{{ partial "icon.html" .icon }}
{{ .name }}
@@ -33,10 +33,9 @@
{{ .name }}
{{ end }}
{{ end }}
-
-
-
-
{{ .Title }}
+ + +{{ .Title }}
{{ end }}
diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html
new file mode 100644
index 0000000..95d0be8
--- /dev/null
+++ b/layouts/taxonomy/list.html
@@ -0,0 +1,15 @@
+{{ define "main" }}
+
+ - {{ partial "session.html" . }} + {{ end }} +
+
+
+{{ .Title }}
+-
+ {{ range where .Pages ".Params.title" "ne" "Office Hours" }}
+