diff --git a/i18n/en.yml b/i18n/en.yml new file mode 100644 index 0000000..3c79a27 --- /dev/null +++ b/i18n/en.yml @@ -0,0 +1,29 @@ +- id: prev_articles + translation: "Latest articles" + +- id: next_articles + translation: "Oldest articles" + +- id: prev_article + translation: "Previous article" + +- id: next_article + translation: "Next article" + +- id: toc + translation: "Table of Contents" + +- id: posted_by + translation: "Posted by" + +- id: updated_on + translation: "Last modified on" + +- id: by + translation: "By" + +- id: "on" + translation: "on" + +- id: "date_fmt" + translation: "Jan 2 2006" diff --git a/i18n/fr.yml b/i18n/fr.yml new file mode 100644 index 0000000..0058382 --- /dev/null +++ b/i18n/fr.yml @@ -0,0 +1,29 @@ +- id: prev_articles + translation: "Articles plus récents" + +- id: next_articles + translation: "Articles plus anciens" + +- id: prev_article + translation: "Article précédent" + +- id: next_article + translation: "Article suivant" + +- id: toc + translation: "Table des matières" + +- id: posted_by + translation: "Posté par" + +- id: updated_on + translation: "Mis à jour le" + +- id: by + translation: "Par" + +- id: "on" + translation: "le" + +- id: "date_fmt" + translation: "2 Jan 2006" diff --git a/layouts/_default/section.html b/layouts/_default/section.html index a2fef0b..75dc25c 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -14,21 +14,21 @@
{{ if .Site.Params.featured_tags }}
- +
FEATURED TAGS
{{ $featured_condition_size := .Site.Params.featured_condition_size }} {{ range $name, $taxonomy := .Site.Taxonomies.tags }} {{ if gt (len $taxonomy.Pages) $featured_condition_size }} - - {{ $name }} + + #{{ $name }} {{ end }} {{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 274ca20..620aeb0 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -10,24 +10,26 @@
-
- {{ range .Params.tags }} - - {{ . }} +

{{ .Title }}

+ {{ with .Params.subtitle }}

{{ . }}

{{ end }} + {{ with .Params.tags }} +
+ {{ range . }} + + #{{ . }} {{ end }}
-

{{ .Title }}

-

{{ .Params.subtitle }}

+ {{ end }} - Par + {{ i18n "by" }} {{ if .Params.author }} {{ .Params.author }} {{ else }} {{ .Site.Title }} {{ end }} - le - {{ .Date.Format "2 Jan 2006" }} + {{ i18n "on" }} + {{ .Date.Format (i18n "date_fmt") }} {{ if .Site.Params.page_view_conter }} {{ partial "page_view_counter.html" . }} {{ end }} @@ -57,26 +59,30 @@ {{ if not (eq (.Param "showtoc") false) }}
-

Sommaire

+

{{ i18n "toc" }}

{{.TableOfContents}} {{ end }} {{ .Content }}
-
+ +
+ {{ partial "comments.html" . }} + + {{ partial "under_content.html" . }}
- {{ $name }} + + #{{ $name }} {{ end }} {{ end }} diff --git a/layouts/partials/category.html b/layouts/partials/category.html new file mode 100644 index 0000000..9308b10 --- /dev/null +++ b/layouts/partials/category.html @@ -0,0 +1,2 @@ +{{ $paginator := .Paginate (where .Data.Pages "Section" "post") }} +{{ partial "posts.html" . }} diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html new file mode 100644 index 0000000..75db356 --- /dev/null +++ b/layouts/partials/comments.html @@ -0,0 +1,19 @@ +{{ if .Site.Params.disqus_proxy }} +
+ + +{{ else if site.Config.Services.Disqus.Shortname }} +
+{{ template "_internal/disqus.html" . }} +{{ else if .Site.Params.Commento }} +
+{{ end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 70ab550..1b63379 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -5,8 +5,9 @@

- Copyright © ArmaVirumque {{ now.Year }} | - Mentions légales + Copyright © {{ .Site.Copyright }} {{ now.Year }} | + {{ .Site.Params.legal_txt }}

diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 324cc9a..e95e7ad 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -49,7 +49,11 @@ {{ if .Title }}{{ .Title }} - {{ .Site.Params.SEOTitle }}{{ else }}{{ .Site.Params.SEOTitle }}{{ end }} - + + + {{ with .OutputFormats.Get "rss" -}} + {{ printf `` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} + {{ end -}} @@ -79,7 +83,7 @@ + {{ with .Site.Params.Commento }} + + + {{ end }} + {{ range .Site.Params.custom_js }} @@ -98,5 +107,7 @@ }) - + {{ with .Site.Params.Umami }} + + {{ end }} diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 3676a3c..2468e29 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -6,7 +6,7 @@
- +

- Posté par {{ with .Params.author }}{{ . }}{{ else }}{{ .Site.Title }}{{ end }} le {{ .Date.Format "2 Jan 2006" }} + {{ i18n "posted_by" }} {{ with .Params.author }}{{ . }}{{ else }}{{ .Site.Title }}{{ end }} {{ i18n "on" }} {{ .Date.Format (i18n "date_fmt") }} {{ if (and (not .Lastmod.IsZero) (not (eq (dateFormat "2006-01-02" .Lastmod) (dateFormat "2006-01-02" .Date)))) }} -
Mise à jour le {{ dateFormat "2 Jan 2006" .Params.LastMod }} +
{{ i18n "updated_on" }} {{ dateFormat (i18n "date_fmt") .Params.LastMod }} {{ end }}

diff --git a/layouts/partials/posts.html b/layouts/partials/posts.html index 77bb7d4..447a92a 100644 --- a/layouts/partials/posts.html +++ b/layouts/partials/posts.html @@ -2,7 +2,7 @@
-
- {{ $name }} + + #{{ $name }} {{ end }} {{ end }} @@ -28,11 +28,11 @@ {{ if .Site.Params.about_me }}
-
À propos d'AVQ
+
{{ .Site.Params.about_txt }}
{{ with .Site.Params.sidebar_avatar }} -
- +
+ avatar
diff --git a/layouts/partials/under_content.html b/layouts/partials/under_content.html new file mode 100644 index 0000000..e69de29 diff --git a/layouts/taxonomy/category.html b/layouts/taxonomy/category.html new file mode 100644 index 0000000..92e0961 --- /dev/null +++ b/layouts/taxonomy/category.html @@ -0,0 +1,3 @@ +{{ define "main" }} + {{ partial "category.html" . }} +{{ end }} diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html new file mode 100644 index 0000000..ccbd3d8 --- /dev/null +++ b/layouts/taxonomy/tag.html @@ -0,0 +1,6 @@ +{{ define "main" }} +
+

Tag #{{ .Data.Term }}

+
+ {{ partial "category.html" . }} +{{ end }} diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html new file mode 100644 index 0000000..ac8ed7d --- /dev/null +++ b/layouts/taxonomy/terms.html @@ -0,0 +1,56 @@ +{{ define "main" }} + +
+
+
+ +
+ + {{ .Content }} + +
+ +
+ + + {{ if .Site.Params.featured_tags }} +
+
+
Tags
+
+ {{ $featured_condition_size := .Site.Params.featured_condition_size }} + {{ range $name, $taxonomy := .Site.Taxonomies.tags }} + {{ if gt (len $taxonomy.Pages) $featured_condition_size }} + + #{{ $name }} + + {{ end }} + {{ end }} +
+
+ {{ end }} + + + {{ if .Site.Params.friends }} +
+
+
FRIENDS
+
    + {{ range .Site.Params.friend_link }} +
  • {{.title}}
    • + {{ end }} +
+
+ {{ end }} +
+
+
+
+ +{{ end }}