diff options
author | zzossig <zzossig@gmail.com> | 2020-10-29 16:27:37 +0300 |
---|---|---|
committer | zzossig <zzossig@gmail.com> | 2020-10-29 16:27:37 +0300 |
commit | 842005439ff36b857cfcf9b54234163e6a49b5cf (patch) | |
tree | 3f7ed14322f35305cf8dcd2fb6c641b64240933d | |
parent | e09bbc6d4e7cd88ca327b74bd855794c246ebc36 (diff) |
fix #314 - Archive page shows error when there are 0 posts
-rw-r--r-- | i18n/ca.toml | 3 | ||||
-rw-r--r-- | i18n/en.toml | 5 | ||||
-rw-r--r-- | i18n/eo.toml | 5 | ||||
-rw-r--r-- | i18n/es.toml | 3 | ||||
-rw-r--r-- | i18n/fa.toml | 5 | ||||
-rw-r--r-- | i18n/fr.toml | 5 | ||||
-rw-r--r-- | i18n/ko.toml | 5 | ||||
-rw-r--r-- | i18n/ro.toml | 3 | ||||
-rw-r--r-- | i18n/zh.toml | 5 | ||||
-rw-r--r-- | layouts/archive/list.html | 42 | ||||
-rw-r--r-- | layouts/talks/list.html | 53 |
11 files changed, 85 insertions, 49 deletions
diff --git a/i18n/ca.toml b/i18n/ca.toml index 8867101..64a7630 100644 --- a/i18n/ca.toml +++ b/i18n/ca.toml @@ -114,3 +114,6 @@ other = "solarized" [skin-kimbie] other = "kimbie" + +[no-contents] +other = "Nothing to Display"
\ No newline at end of file diff --git a/i18n/en.toml b/i18n/en.toml index 3842736..506b78f 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -113,4 +113,7 @@ other = "hacker" other = "solarized" [skin-kimbie] -other = "kimbie"
\ No newline at end of file +other = "kimbie" + +[no-contents] +other = "Nothing to Display"
\ No newline at end of file diff --git a/i18n/eo.toml b/i18n/eo.toml index ac80aae..94fc1f6 100644 --- a/i18n/eo.toml +++ b/i18n/eo.toml @@ -113,4 +113,7 @@ other = "hacker" other = "solarized" [skin-kimbie] -other = "kimbie"
\ No newline at end of file +other = "kimbie" + +[no-contents] +other = "Nothing to Display"
\ No newline at end of file diff --git a/i18n/es.toml b/i18n/es.toml index 1dd00b3..647a71a 100644 --- a/i18n/es.toml +++ b/i18n/es.toml @@ -114,3 +114,6 @@ other = "solarized" [skin-kimbie] other = "kimbie" + +[no-contents] +other = "Nothing to Display"
\ No newline at end of file diff --git a/i18n/fa.toml b/i18n/fa.toml index 206bbcd..661db0a 100644 --- a/i18n/fa.toml +++ b/i18n/fa.toml @@ -113,4 +113,7 @@ other = "hacker" other = "solarized" [skin-kimbie] -other = "kimbie"
\ No newline at end of file +other = "kimbie" + +[no-contents] +other = "Nothing to Display"
\ No newline at end of file diff --git a/i18n/fr.toml b/i18n/fr.toml index 896d199..d4cba9a 100644 --- a/i18n/fr.toml +++ b/i18n/fr.toml @@ -113,4 +113,7 @@ other = "hacker" other = "solarized" [skin-kimbie] -other = "kimbie"
\ No newline at end of file +other = "kimbie" + +[no-contents] +other = "Nothing to Display"
\ No newline at end of file diff --git a/i18n/ko.toml b/i18n/ko.toml index 8d2941c..f06b688 100644 --- a/i18n/ko.toml +++ b/i18n/ko.toml @@ -113,4 +113,7 @@ other = "hacker" other = "solarized" [skin-kimbie] -other = "kimbie"
\ No newline at end of file +other = "kimbie" + +[no-contents] +other = "Nothing to Display"
\ No newline at end of file diff --git a/i18n/ro.toml b/i18n/ro.toml index 5fce423..d062ebf 100644 --- a/i18n/ro.toml +++ b/i18n/ro.toml @@ -114,3 +114,6 @@ other = "solarized" [skin-kimbie] other = "kimbie" + +[no-contents] +other = "Nothing to Display"
\ No newline at end of file diff --git a/i18n/zh.toml b/i18n/zh.toml index b4c3ad3..dcf297b 100644 --- a/i18n/zh.toml +++ b/i18n/zh.toml @@ -113,4 +113,7 @@ other = "hacker" other = "solarized" [skin-kimbie] -other = "kimbie"
\ No newline at end of file +other = "kimbie" + +[no-contents] +other = "Nothing to Display"
\ No newline at end of file diff --git a/layouts/archive/list.html b/layouts/archive/list.html index 4925349..6ccd50f 100644 --- a/layouts/archive/list.html +++ b/layouts/archive/list.html @@ -16,27 +16,31 @@ {{ $filteredPages = (where $filteredPages "Type" "!=" (lower .)) }} {{ end }} + {{ if gt (len $filteredPages) 0 }} {{ $paginator := .Paginate ($filteredPages.GroupByDate ($.Param "archiveGroupByDate" | default "2006")) ($.Param "archivePaginate") }} - {{ range ($paginator).PageGroups }} - <span class="archive__key" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}">{{ .Key }}</span> - <ul class="archive__ul" data-dir="{{ $.Param "languagedir" | default "ltr" }}"> - {{ range .Pages }} - <li class="archive__li" data-dir="{{ $.Param "languagedir" | default "ltr" }}"> - <span class="archive__meta" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}"> - {{ if ne ($.Param "languagedir") "rtl" }} - <span class="archive__type">{{ .Type }}</span> - <span class="archive__date">{{ .Date.Format (i18n "archive-dateformat") }}</span> - {{ else }} - <span class="archive__date">{{ .Date.Format (i18n "archive-dateformat") }}</span> - <span class="archive__type">{{ .Type }}</span> - {{ end }} - </span> - <a href="{{ .Permalink }}" class="archive__title" data-title-wrap="{{ $titleWrap | default "wrap"}}" data-dir="{{ $.Param "languagedir" | default "ltr" }}">{{ .Title }}</a> - </li> - {{ end }} - </ul> - {{ end }} + <span class="archive__key" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}">{{ .Key }}</span> + <ul class="archive__ul" data-dir="{{ $.Param "languagedir" | default "ltr" }}"> + {{ range .Pages }} + <li class="archive__li" data-dir="{{ $.Param "languagedir" | default "ltr" }}"> + <span class="archive__meta" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}"> + {{ if ne ($.Param "languagedir") "rtl" }} + <span class="archive__type">{{ .Type }}</span> + <span class="archive__date">{{ .Date.Format (i18n "archive-dateformat") }}</span> + {{ else }} + <span class="archive__date">{{ .Date.Format (i18n "archive-dateformat") }}</span> + <span class="archive__type">{{ .Type }}</span> + {{ end }} + </span> + <a href="{{ .Permalink }}" class="archive__title" data-title-wrap="{{ $titleWrap | default "wrap"}}" data-dir="{{ $.Param "languagedir" | default "ltr" }}">{{ .Title }}</a> + </li> + {{ end }} + </ul> + {{ end }} + {{ else }} + {{ i18n "no-contents" | default "There is nothing to display" }} + {{ end }} + </div> <div class="grow"></div> {{ partial "pagination/pagination" . }} diff --git a/layouts/talks/list.html b/layouts/talks/list.html index 023adf4..27aeedb 100644 --- a/layouts/talks/list.html +++ b/layouts/talks/list.html @@ -17,34 +17,39 @@ {{ end }} <div class="archive__container"> {{ $pages := (where .Site.RegularPages "Section" "talks") }} - {{ $paginator := .Paginate ($pages.GroupByPublishDate ($.Param "talksGroupByDate" | default "2006")) ($.Param "talksPaginate") }} - {{ range ($paginator).PageGroups }} - <span class="archive__key" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}">{{ .Key }}</span> - <ul class="archive__ul" data-dir="{{ $.Param "languagedir" | default "ltr" }}"> - {{ range .Pages }} - <li class="archive__li" data-dir="{{ $.Param "languagedir" | default "ltr" }}"> - <span class="talk__date" data-dir="{{ $.Param "languagedir" | default "ltr" }}" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}"> - {{ .PublishDate.Format (i18n "talks-dateformat") }} - </span> - {{ if .Params.disableLink }} - <div class="talk__title" data-title-wrap="{{ $titleWrap | default "wrap"}}" data-dir="{{ $.Param "languagedir" | default "ltr" }}">{{ .Title }}</div> - {{ else }} - <a href="{{ if .Params.externalLink }}{{ .Params.externalLink }}{{ else }}{{ .Permalink }}{{ end }}" target="{{ with .Params.externalLink }}_blank{{ end }}" rel="{{ with .Params.externalLink }}noreferrer{{ end }}" class="talk__title" data-title-wrap="{{ $titleWrap | default "wrap"}}" data-dir="{{ $.Param "languagedir" | default "ltr" }}">{{ .Title }}</a> - {{ end }} - {{ with .Params.subLinks }} - <div class="talk__icons"> - {{ range . }} - <a href="{{ .link }}" class="talk__icon" target="_blank" rel="noreferrer" title="{{ .type }}"> - {{ partial (print "svgs/etc/" .type ".svg") (dict "width" 23 "height" 23) }} - </a> + {{ if gt (len $pages) 0 }} + {{ $paginator := .Paginate ($pages.GroupByPublishDate ($.Param "talksGroupByDate" | default "2006")) ($.Param "talksPaginate") }} + {{ range ($paginator).PageGroups }} + <span class="archive__key" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}">{{ .Key }}</span> + <ul class="archive__ul" data-dir="{{ $.Param "languagedir" | default "ltr" }}"> + {{ range .Pages }} + <li class="archive__li" data-dir="{{ $.Param "languagedir" | default "ltr" }}"> + <span class="talk__date" data-dir="{{ $.Param "languagedir" | default "ltr" }}" data-ani="{{ $.Site.Params.enableUiAnimation | default "true" }}"> + {{ .PublishDate.Format (i18n "talks-dateformat") }} + </span> + {{ if .Params.disableLink }} + <div class="talk__title" data-title-wrap="{{ $titleWrap | default "wrap"}}" data-dir="{{ $.Param "languagedir" | default "ltr" }}">{{ .Title }}</div> + {{ else }} + <a href="{{ if .Params.externalLink }}{{ .Params.externalLink }}{{ else }}{{ .Permalink }}{{ end }}" target="{{ with .Params.externalLink }}_blank{{ end }}" rel="{{ with .Params.externalLink }}noreferrer{{ end }}" class="talk__title" data-title-wrap="{{ $titleWrap | default "wrap"}}" data-dir="{{ $.Param "languagedir" | default "ltr" }}">{{ .Title }}</a> {{ end }} - </div> - {{ end }} - </li> + {{ with .Params.subLinks }} + <div class="talk__icons"> + {{ range . }} + <a href="{{ .link }}" class="talk__icon" target="_blank" rel="noreferrer" title="{{ .type }}"> + {{ partial (print "svgs/etc/" .type ".svg") (dict "width" 23 "height" 23) }} + </a> + {{ end }} + </div> + {{ end }} + </li> + {{ end }} + </ul> {{ end }} - </ul> + {{ else }} + {{ i18n "no-contents" | default "There is nothing to display" }} {{ end }} + </div> <div class="grow"></div> {{ partial "pagination/pagination" . }} |