diff --git a/config/_default/params.toml b/config/_default/params.toml index 302e3cc4..548409f9 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -101,7 +101,6 @@ enableCodeCopy = true #showViews = false #showLikes = false #showTableOfContents = true - #showCards = false #groupByYear = false #cardViewScreenWidth = false #cardView = false diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml index 8f1e4af8..3234f28e 100644 --- a/exampleSite/config/_default/params.toml +++ b/exampleSite/config/_default/params.toml @@ -100,9 +100,8 @@ defaultBackgroundImage = "/img/iceland.jpg" showViews = true showLikes = true showTableOfContents = true - showCards = true groupByYear = false - cardView = true + cardView = false cardViewScreenWidth = false diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 54748237..a487f601 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -60,9 +60,7 @@ {{ end }} {{ end }} - - - + {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} {{ if $.Params.groupByYear | default ($.Site.Params.list.groupByYear | default true) }}

@@ -131,5 +129,4 @@ {{ partial "pagination.html" . }} - {{ end }} - \ No newline at end of file + {{ end }} \ No newline at end of file diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index 5857ecaa..13db9360 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -27,15 +27,15 @@
{{ .Content | emojify }}
- - {{ $jsPage := resources.Get "js/page.js" }} - {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }} - {{ end }} + + {{ $jsPage := resources.Get "js/page.js" }} + {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }} +
{{ range .Data.Terms }}
diff --git a/layouts/_default/term.html b/layouts/_default/term.html index ac95515f..b30aa3ad 100644 --- a/layouts/_default/term.html +++ b/layouts/_default/term.html @@ -27,27 +27,100 @@
{{ .Content | emojify }}
- - {{ $jsPage := resources.Get "js/page.js" }} - {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }} -
{{ end }} -
- {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} - {{ if $.Params.groupByYear | default ($.Site.Params.list.groupByYear | default true) }} -

- {{ .Key }} -

-
- {{ end }} - {{ range .Pages }} - {{ partial "article-link.html" . }} - {{ end }} - {{ end }} -
- {{ partial "pagination.html" . }} -{{ end }} + + {{ $jsPage := resources.Get "js/page.js" }} + {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }} + + + {{ if gt .Pages 0 }} + + {{ if .Params.cardView | default (.Site.Params.term.cardView | default false) }} + + {{ $cardViewScreenWidth := .Site.Params.term.cardViewScreenWidth}} + + {{ if not $.Params.groupByYear | default ($.Site.Params.term.groupByYear | default true) }} + + {{ if $cardViewScreenWidth }} +
+
+ {{ else }} +
+
+ {{ end }} + + {{ end }} + + {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} + {{ if $.Params.groupByYear | default ($.Site.Params.term.groupByYear | default true) }} +

+ {{ .Key }} +

+ {{ else }} + {{ end }} + + {{ if $.Params.groupByYear | default ($.Site.Params.term.groupByYear | default true) }} + + {{ if $cardViewScreenWidth}} +
+
+ {{ else }} +
+
+ {{ end }} + {{ end }} + + {{ range .Pages }} + + {{ if $cardViewScreenWidth }} +
+ {{ else }} +
+ {{ end }} + + {{ partial "article-link-card.html" . }} +
+ {{ end }} + {{ if $.Params.groupByYear | default ($.Site.Params.term.groupByYear | default true) }} +
+
+ {{ end }} + + + {{ end }} + + {{ if not $.Params.groupByYear | default ($.Site.Params.term.groupByYear | default true) }} +
+
+ {{ end }} + + {{ else }} +
+ {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} + {{ if $.Params.groupByYear | default ($.Site.Params.term.groupByYear | default true) }} +

+ {{ .Key }} +

+ {{ end }} + {{ range .Pages }} + {{ partial "article-link.html" . }} + {{ end }} + {{ end }} +
+ {{ end }} + + {{ else }} +
+

+ {{ i18n "list.no_articles" | emojify }} +

+
+ {{ end }} + + {{ partial "pagination.html" . }} + + {{ end }}