diff options
author | Victoria Drake <hello@victoria.dev> | 2022-02-14 15:42:27 +0300 |
---|---|---|
committer | Victoria Drake <hello@victoria.dev> | 2022-02-14 15:42:27 +0300 |
commit | fade059bf543c62cb7a58e19137b0118bc20fc7d (patch) | |
tree | 80f4947daf7a38fb649e776ca1e9f90146700baa /layouts | |
parent | 052a699484e0ce1d4ee24d294a0fb73b17a2d4bc (diff) |
Use layout identifiers for dates
- Adds new Hugo feature
(https://gohugo.io/functions/dateformat/#datetime-formatting-layouts)
enabling date localization in defaults
Diffstat (limited to 'layouts')
-rw-r--r-- | layouts/_default/list.html | 37 | ||||
-rw-r--r-- | layouts/_default/taxonomy.html | 33 | ||||
-rw-r--r-- | layouts/blog/list.html | 55 | ||||
-rw-r--r-- | layouts/blog/single.html | 39 | ||||
-rw-r--r-- | layouts/partials/blog/archive.html | 35 | ||||
-rw-r--r-- | layouts/partials/blog/li.html | 7 | ||||
-rw-r--r-- | layouts/partials/home/blog.html | 53 |
7 files changed, 137 insertions, 122 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 5941551..f09577e 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,21 +1,22 @@ {{ define "main" }} - <div class="container markdown top-pad"> - {{ .Content }} - </div> - <div class="container"> - <ul> - {{ range .Pages.ByPublishDate.Reverse }} - {{ if .Date }} - <li> - <a href="{{ .Permalink }}">{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }} | {{ .Title | markdownify }}</a> - </li> - {{ else }} - <li> - <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a> - </li> - {{ end }} - {{ end }} - </ul> - </div> +<div class="container markdown top-pad"> + {{ .Content }} +</div> +<div class="container"> + <ul> + {{ range .Pages.ByPublishDate.Reverse }} + {{ if .Date }} + <li> + <a href="{{ .Permalink }}">{{ .Date.Format (.Site.Params.dateFormat | default ":date_medium") }} | + {{ .Title | markdownify }}</a> + </li> + {{ else }} + <li> + <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a> + </li> + {{ end }} + {{ end }} + </ul> +</div> </body> {{ end }} diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index 21511de..367c35a 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -1,21 +1,22 @@ {{ define "title" }} - <h1 class="bold-title is-1">{{ .Data.Singular | humanize }}: {{ lower .Title | markdownify }}</h1> +<h1 class="bold-title is-1">{{ .Data.Singular | humanize }}: {{ lower .Title | markdownify }}</h1> {{ end }} {{ define "main" }} - <div class="container"> - <ul> - {{ range .Pages.ByPublishDate.Reverse }} - {{ if .Date }} - <li> - <a href="{{ .Permalink }}">{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }} | {{ .Title | markdownify }}</a> - </li> - {{ else }} - <li> - <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a> - </li> - {{ end }} - {{ end }} - </ul> - </div> +<div class="container"> + <ul> + {{ range .Pages.ByPublishDate.Reverse }} + {{ if .Date }} + <li> + <a href="{{ .Permalink }}">{{ .Date.Format (.Site.Params.dateFormat | default ":date_medium") }} | + {{ .Title | markdownify }}</a> + </li> + {{ else }} + <li> + <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a> + </li> + {{ end }} + {{ end }} + </ul> +</div> {{ end }} diff --git a/layouts/blog/list.html b/layouts/blog/list.html index d3aea07..e652c3d 100644 --- a/layouts/blog/list.html +++ b/layouts/blog/list.html @@ -1,31 +1,32 @@ {{ define "main" }} - <div class="container markdown top-pad"> - {{ .Content }} - </div> - <div class="container"> - {{ if .Site.Params.home.showLatest | default true }} - <h2 class="title is-2 top-pad">{{ i18n "index_blog_latestPosts" . }}</h2> - {{ range first 1 .Pages.ByPublishDate.Reverse }} - <div class="summary">{{ if .Params.date }}{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }}{{ end }} - <h3 class="title is-3 strong-post-title"> - <a href="{{ .Permalink }}"> - {{ .Title | markdownify }} - </a> - </h3> - <div class="markdown"> - {{ .Summary }} - {{ if .Truncated }} - <a href="{{ .Permalink }}">{{ i18n "index_blog_readMore" . }}</a> - {{ end }} - </div> - </div> +<div class="container markdown top-pad"> + {{ .Content }} +</div> +<div class="container"> + {{ if .Site.Params.home.showLatest | default true }} + <h2 class="title is-2 top-pad">{{ i18n "index_blog_latestPosts" . }}</h2> + {{ range first 1 .Pages.ByPublishDate.Reverse }} + <div class="summary"> + {{ if .Params.date }}{{ .Date.Format (.Site.Params.dateFormat | default ":date_medium") }}{{ end }} + <h3 class="title is-3 strong-post-title"> + <a href="{{ .Permalink }}"> + {{ .Title | markdownify }} + </a> + </h3> + <div class="markdown"> + {{ .Summary }} + {{ if .Truncated }} + <a href="{{ .Permalink }}">{{ i18n "index_blog_readMore" . }}</a> {{ end }} - {{ end }} - <h2 class="title is-2 top-pad">{{ i18n "index_blog_allPosts" . }}</h2> - {{if .Site.Params.home.allPostsArchiveFormat}} - {{ partialCached "blog/archive.html" .}} - {{else}} - {{ partialCached "blog/li.html" . }} - {{end}} + </div> </div> + {{ end }} + {{ end }} + <h2 class="title is-2 top-pad">{{ i18n "index_blog_allPosts" . }}</h2> + {{if .Site.Params.home.allPostsArchiveFormat}} + {{ partialCached "blog/archive.html" .}} + {{else}} + {{ partialCached "blog/li.html" . }} + {{end}} +</div> {{ end }} diff --git a/layouts/blog/single.html b/layouts/blog/single.html index fa1f646..219f3b6 100644 --- a/layouts/blog/single.html +++ b/layouts/blog/single.html @@ -10,29 +10,34 @@ <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a> </h2> <div class="post-data"> - {{ if .Params.date }}{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }}{{ end }} - {{ if .Site.Params.showReadingTime | default true }} - {{ if .Params.date }} | {{ end }} - {{ i18n "blog_readingTime" .ReadingTime }} + {{ if .Params.date }}{{ .Date.Format (.Site.Params.dateFormat | default ":date_medium") }}{{ end }} + {{ if .Site.Params.showReadingTime | default true }} + {{ if .Params.date }} | {{ end }} + {{ i18n "blog_readingTime" .ReadingTime }} {{ end }} </div> {{ if or .Site.Params.share.twitter .Site.Params.share.facebook .Site.Params.share.pinterest }} <div class="blog-share"> {{ i18n "blog_shareThis" . }}: {{ if .Site.Params.share.twitter }} - <a class="twitter-share-button" href="https://twitter.com/intent/tweet?text={{ .Title | markdownify }}%20{{ .Permalink }}" onclick="window.open(this.href, 'twitter-share', 'width=550,height=235');return false;"> + <a class="twitter-share-button" + href="https://twitter.com/intent/tweet?text={{ .Title | markdownify }}%20{{ .Permalink }}" + onclick="window.open(this.href, 'twitter-share', 'width=550,height=235');return false;"> <i class="fab fa-twitter"></i> <span class="hidden">Twitter</span> </a> {{ end }} {{ if .Site.Params.share.facebook }} - <a class="icon-facebook" href="https://www.facebook.com/sharer/sharer.php?u={{ .Permalink }}" onclick="window.open(this.href, 'facebook-share','width=580,height=296');return false;"> + <a class="icon-facebook" href="https://www.facebook.com/sharer/sharer.php?u={{ .Permalink }}" + onclick="window.open(this.href, 'facebook-share','width=580,height=296');return false;"> <i class="fab fa-facebook-f"></i> <span class="hidden">Facebook</span> </a> {{ end }} {{ if .Site.Params.share.pinterest }} - <a class="icon-pinterest" href="http://pinterest.com/pin/create/button/?url={{ .Permalink }}{{ if .Params.pinterestMedia }}&media={{ .Site.BaseURL }}{{ .Params.pinterestMedia }}{{ end }}&description={{ .Title | safeHTML}}" onclick="window.open(this.href, 'pinterest-share','width=580,height=296');return false;"> + <a class="icon-pinterest" + href="http://pinterest.com/pin/create/button/?url={{ .Permalink }}{{ if .Params.pinterestMedia }}&media={{ .Site.BaseURL }}{{ .Params.pinterestMedia }}{{ end }}&description={{ .Title | safeHTML}}" + onclick="window.open(this.href, 'pinterest-share','width=580,height=296');return false;"> <i class="fab fa-pinterest-p"></i> <span class="hidden">Pinterest</span> </a> @@ -40,16 +45,16 @@ </div> {{ end }} {{ range $taxonomy_term, $taxonomy := .Params }} - {{ with $.Site.GetPage $taxonomy_term }} - {{ $len := (len $taxonomy) }} - <p> - {{ $taxonomy_term | title }}: - {{ range $key, $value := $taxonomy }} - <a href="{{ (printf "/%s/" $taxonomy_term) | relLangURL }}{{ . | urlize }}"> - {{ $value }}</a>{{ if ne (add $key 1) $len }},{{ end }} - {{ end }} - </p> - {{ end }} + {{ with $.Site.GetPage $taxonomy_term }} + {{ $len := (len $taxonomy) }} + <p> + {{ $taxonomy_term | title }}: + {{ range $key, $value := $taxonomy }} + <a href="{{ (printf " /%s/" $taxonomy_term) | relLangURL }}{{ . | urlize }}"> + {{ $value }}</a>{{ if ne (add $key 1) $len }},{{ end }} + {{ end }} + </p> + {{ end }} {{ end }} </div> <!-- Begin blog post content --> diff --git a/layouts/partials/blog/archive.html b/layouts/partials/blog/archive.html index 21e1a4a..a98b97b 100644 --- a/layouts/partials/blog/archive.html +++ b/layouts/partials/blog/archive.html @@ -1,24 +1,27 @@ <section> - {{ $prev := now.Format "2006"}} <!--start from the current year--> - {{ range first 1 .Pages.ByPublishDate.Reverse }} - {{if .Date}} <!--also add the header if there are posts during the current year--> - {{if eq $prev (.Date.Format "2006")}} <h2 class="title is-2 top-pad"> {{ $prev }}</h2> {{end}} + {{ $prev := now.Format "2006"}} + <!--start from the current year--> + {{ range first 1 .Pages.ByPublishDate.Reverse }} + {{if .Date}} + <!--also add the header if there are posts during the current year--> + {{if eq $prev (.Date.Format "2006")}} + <h2 class="title is-2 top-pad"> {{ $prev }}</h2> {{end}} + {{end}} {{end}} - {{end}} - {{range .Pages.ByPublishDate.Reverse}} + {{range .Pages.ByPublishDate.Reverse}} {{if .Date}} {{$curr := .Date.Format "2006"}} - {{if lt $curr $prev }} - <h2 class="title is-2 top-pad">{{ $curr }}</h2> - {{end}} + {{if lt $curr $prev }} + <h2 class="title is-2 top-pad">{{ $curr }}</h2> + {{end}} <li class="post-item"> - {{ if .Params.date }} - <span>{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }}</span> - - {{ end }} - <span><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></span> + {{ if .Params.date }} + <span>{{ .Date.Format (.Site.Params.dateFormat | default ":date_medium") }}</span> - + {{ end }} + <span><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></span> </li> - {{ $prev = $curr}} + {{ $prev = $curr}} + {{end}} {{end}} - {{end}} -</section>
\ No newline at end of file +</section> diff --git a/layouts/partials/blog/li.html b/layouts/partials/blog/li.html index e72f1cd..36e7830 100644 --- a/layouts/partials/blog/li.html +++ b/layouts/partials/blog/li.html @@ -1,5 +1,6 @@ {{ range .Pages.ByPublishDate.Reverse }} - <li class="post-item"> - <span><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></span>{{ if .Params.date }} - <span>{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }}</span>{{ end }} - </li> +<li class="post-item"> + <span><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></span>{{ if .Params.date }} - + <span>{{ .Date.Format (.Site.Params.dateFormat | default ":date_medium") }}</span>{{ end }} +</li> {{ end }} diff --git a/layouts/partials/home/blog.html b/layouts/partials/home/blog.html index 9f6cd59..0c6b9fb 100644 --- a/layouts/partials/home/blog.html +++ b/layouts/partials/home/blog.html @@ -4,40 +4,43 @@ <div class="container"> {{ if .Site.Params.home.showLatest | default true }} <h2 class="title is-2 has-text-centered">{{ i18n "index_blog_latestPosts" . }}</h2> - {{ range first 1 .Pages.ByPublishDate.Reverse }} - <div class="summary">{{ if .Params.date }}{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }}{{ end }} - <h3 class="title is-3 latest-post-title"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h3> - <div class="markdown"> - {{ .Summary }} - {{ if .Truncated }} - <a href="{{ .Permalink }}">{{ i18n "index_blog_readMore" . }}</a> - {{ end }} - </div> + {{ range first 1 .Pages.ByPublishDate.Reverse }} + <div class="summary"> + {{ if .Params.date }}{{ .Date.Format (.Site.Params.dateFormat | default ":date_medium") }}{{ end }} + <h3 class="title is-3 latest-post-title"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h3> + <div class="markdown"> + {{ .Summary }} + {{ if .Truncated }} + <a href="{{ .Permalink }}">{{ i18n "index_blog_readMore" . }}</a> + {{ end }} </div> - {{ end }} + </div> + {{ end }} {{ end }} </div> </div> - {{ if .Site.Params.home.showAllPosts }} - <div class="section" id="all-posts"> - <div class="container"> - <h2 class="title is-2 top-pad">{{ i18n "index_blog_allPosts" . }}</h2> - {{if .Site.Params.home.allPostsArchiveFormat}} - {{ partialCached "blog/archive.html" .}} - {{else}} - {{ partialCached "blog/li.html" . }} +{{ if .Site.Params.home.showAllPosts }} +<div class="section" id="all-posts"> + <div class="container"> + <h2 class="title is-2 top-pad">{{ i18n "index_blog_allPosts" . }}</h2> + {{if .Site.Params.home.allPostsArchiveFormat}} + {{ partialCached "blog/archive.html" .}} + {{else}} + {{ partialCached "blog/li.html" . }} {{end}} - </div> </div> - {{ else }} - <div class="container has-text-centered top-pad"> - <a href="{{ .Permalink }}">{{ i18n "index_blog_allPosts" . }}</a> - </div> - {{ end }} +</div> +{{ else }} +<div class="container has-text-centered top-pad"> + <a href="{{ .Permalink }}">{{ i18n "index_blog_allPosts" . }}</a> +</div> +{{ end }} <!-- End Blog container --> {{ partial "top-icon.html" . }} <!-- End Blog section --> -<div class="container"><hr></div> +<div class="container"> + <hr> +</div> {{ end }} |