diff --git a/wowchemy/layouts/_default/list.html b/wowchemy/layouts/_default/list.html index 9537c452..ea7ee996 100644 --- a/wowchemy/layouts/_default/list.html +++ b/wowchemy/layouts/_default/list.html @@ -8,17 +8,9 @@ {{ end }} {{ $paginator := .Paginate .Pages }} - {{ range $paginator.Pages }} - {{ if eq $.Params.view 1 }} - {{ partial "li_list" . }} - {{ else if eq $.Params.view 3 }} - {{ partial "li_card" . }} - {{ else if eq $.Params.view 4 }} - {{ partial "li_citation" . }} - {{ else }} - {{ partial "li_compact" . }} - {{ end }} - {{ end }} + {{ range $index, $post := $paginator.Pages }} + {{ partial "functions/render_view" (dict "page" $ "item" . "view" ($.Params.view | default "compact") "index" $index) }} + {{end}} {{ partial "pagination" . }} diff --git a/wowchemy/layouts/partials/functions/render_view.html b/wowchemy/layouts/partials/functions/render_view.html new file mode 100644 index 00000000..73a5058d --- /dev/null +++ b/wowchemy/layouts/partials/functions/render_view.html @@ -0,0 +1,31 @@ +{{/* Wowchemy content preview renderer */}} + +{{ $page := .page }} +{{ $item := .item }} +{{ $view := .view }} +{{ $view_file := "" }} +{{ $view_dtype := printf "%T" $view }} +{{ $index := .index }} + +{{if eq $view_dtype "int" }} + {{/* Support legacy numeric views 1-4 */}} + {{ if eq $view 1 }} + {{ $view_file = "list" }} + {{ else if eq $view 3 }} + {{ $view_file = "card" }} + {{ else if eq $view 4 }} + {{ $view_file = "citation" }} + {{ else }} + {{ $view_file = "compact" }} + {{ end }} +{{else}} + {{ if templates.Exists (printf "partials/views/%s.html" (lower $view)) }} + {{ $view_file = lower $view }} + {{else}} + {{/* Fallback to compact view */}} + {{ warnf "Failed to locate view at `partials/views/%s.html`. Check you specified a supported `view` in `%s`" $view $page.File.Path }} + {{ $view_file = "compact" }} + {{end}} +{{ end }} + +{{ return (partial (printf "views/%s" $view_file) (dict "page" $page "item" $item "index" $index)) }} diff --git a/wowchemy/layouts/partials/li_citation.html b/wowchemy/layouts/partials/li_citation.html deleted file mode 100644 index 20b68213..00000000 --- a/wowchemy/layouts/partials/li_citation.html +++ /dev/null @@ -1,42 +0,0 @@ -{{ $has_attachments := partial "functions/has_attachments" . }} - -
- - - {{/* APA Style */}} - {{ if eq (site.Params.publications.citation_style | default "apa") "apa" }} - - - {{ partial "page_metadata_authors" . }} - - ({{- .Date.Format "2006" -}}). - {{ .Title }}. - {{ if .Params.publication_short }} - {{- .Params.publication_short | markdownify -}}. - {{ else if .Params.publication }} - {{- .Params.publication | markdownify -}}. - {{ end }} -

{{ partial "page_links" (dict "page" . "is_list" 1) }}

- - {{/* MLA Style */}} - {{ else }} - - - {{ partial "page_metadata_authors" . }}. - - {{ .Title }}. - {{ if .Params.publication_short }} - {{- .Params.publication_short | markdownify -}}, - {{ else if .Params.publication }} - {{- .Params.publication | markdownify -}}, - {{ end }} - {{- .Date.Format "2006" -}}. - - {{ if $has_attachments }} -
- {{ partial "page_links" (dict "page" . "is_list" 1) }} -
- {{ end }} - - {{ end }} -
diff --git a/wowchemy/layouts/partials/li_card.html b/wowchemy/layouts/partials/views/card.html similarity index 96% rename from wowchemy/layouts/partials/li_card.html rename to wowchemy/layouts/partials/views/card.html index b51ec077..8361d7f6 100644 --- a/wowchemy/layouts/partials/li_card.html +++ b/wowchemy/layouts/partials/views/card.html @@ -1,4 +1,4 @@ -{{ $item := . }} +{{ $item := .item }} {{/* Dynamic view adjusts to content type. */}} {{ $has_attachments := partial "functions/has_attachments" . }} @@ -13,7 +13,7 @@ {{ $summary = $item.Summary }} {{ end }} -
+
{{ if eq $item.Type "event" }}
diff --git a/wowchemy/layouts/partials/views/citation.html b/wowchemy/layouts/partials/views/citation.html new file mode 100644 index 00000000..f7dcc151 --- /dev/null +++ b/wowchemy/layouts/partials/views/citation.html @@ -0,0 +1,43 @@ +{{ $item := .item }} +{{ $has_attachments := partial "functions/has_attachments" $item }} + +
+ + + {{/* APA Style */}} + {{ if eq (site.Params.publications.citation_style | default "apa") "apa" }} + + + {{ partial "page_metadata_authors" $item }} + + ({{- $item.Date.Format "2006" -}}). + {{ $item.Title }}. + {{ if $item.Params.publication_short }} + {{- $item.Params.publication_short | markdownify -}}. + {{ else if $item.Params.publication }} + {{- $item.Params.publication | markdownify -}}. + {{ end }} +

{{ partial "page_links" (dict "page" $item "is_list" 1) }}

+ + {{/* MLA Style */}} + {{ else }} + + + {{ partial "page_metadata_authors" $item }}. + + {{ $item.Title }}. + {{ if $item.Params.publication_short }} + {{- $item.Params.publication_short | markdownify -}}, + {{ else if $item.Params.publication }} + {{- $item.Params.publication | markdownify -}}, + {{ end }} + {{- $item.Date.Format "2006" -}}. + + {{ if $has_attachments }} +
+ {{ partial "page_links" (dict "page" $item "is_list" 1) }} +
+ {{ end }} + + {{ end }} +
diff --git a/wowchemy/layouts/partials/views/community/.gitkeep b/wowchemy/layouts/partials/views/community/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/wowchemy/layouts/partials/li_compact.html b/wowchemy/layouts/partials/views/compact.html similarity index 97% rename from wowchemy/layouts/partials/li_compact.html rename to wowchemy/layouts/partials/views/compact.html index dfae14c8..992a61e6 100644 --- a/wowchemy/layouts/partials/li_compact.html +++ b/wowchemy/layouts/partials/views/compact.html @@ -1,4 +1,4 @@ -{{ $item := . }} +{{ $item := .item }} {{/* Dynamic view adjusts to content type. */}} {{ $show_authors_only := false }}{{/* Show authors only or full metadata? */}} @@ -28,7 +28,7 @@ {{ $summary = $item.Summary }} {{ end }} -
+
diff --git a/wowchemy/layouts/partials/li_list.html b/wowchemy/layouts/partials/views/list.html similarity index 96% rename from wowchemy/layouts/partials/li_list.html rename to wowchemy/layouts/partials/views/list.html index 1d9e1e16..7dfca17f 100644 --- a/wowchemy/layouts/partials/li_list.html +++ b/wowchemy/layouts/partials/views/list.html @@ -1,4 +1,4 @@ -{{ $item := . }} +{{ $item := .item }} {{/* Dynamic view adjusts to content type. */}} {{ $icon_pack := "far" }} @@ -24,7 +24,7 @@ {{ $has_attachments := partial "functions/has_attachments" . }} -
+
{{ $item.Title }} diff --git a/wowchemy/layouts/partials/widgets/featured.html b/wowchemy/layouts/partials/widgets/featured.html index c44a7ab4..a01bb93b 100644 --- a/wowchemy/layouts/partials/widgets/featured.html +++ b/wowchemy/layouts/partials/widgets/featured.html @@ -56,16 +56,8 @@ {{ with $st.Content }}{{ . }}{{ end }} - {{ range $post := $query }} - {{ if eq $st.Params.design.view 1 }} - {{ partial "li_list" . }} - {{ else if eq $st.Params.design.view 3 }} - {{ partial "li_card" . }} - {{ else if eq $st.Params.design.view 4 | and (eq $items_type "publication") }} - {{ partial "li_citation" . }} - {{ else }} - {{ partial "li_compact" . }} - {{ end }} + {{ range $index, $post := $query }} + {{ partial "functions/render_view" (dict "page" $st "item" . "view" ($st.Params.design.view | default "compact") "index" $index) }} {{end}} {{/* Archive link */}} diff --git a/wowchemy/layouts/partials/widgets/pages.html b/wowchemy/layouts/partials/widgets/pages.html index fb81edac..58b9f8e1 100644 --- a/wowchemy/layouts/partials/widgets/pages.html +++ b/wowchemy/layouts/partials/widgets/pages.html @@ -75,16 +75,8 @@ {{ with $st.Content }}{{ . }}{{ end }} - {{ range $post := $query }} - {{ if eq $st.Params.design.view 1 }} - {{ partial "li_list" . }} - {{ else if eq $st.Params.design.view 3 }} - {{ partial "li_card" . }} - {{ else if eq $st.Params.design.view 4 | and (eq $items_type "publication") }} - {{ partial "li_citation" . }} - {{ else }} - {{ partial "li_compact" . }} - {{ end }} + {{ range $index, $post := $query }} + {{ partial "functions/render_view" (dict "page" $st "item" . "view" ($st.Params.design.view | default "compact") "index" $index) }} {{end}} {{/* Archive link */}} diff --git a/wowchemy/layouts/section/event.html b/wowchemy/layouts/section/event.html index dfb581a2..e07422c0 100644 --- a/wowchemy/layouts/section/event.html +++ b/wowchemy/layouts/section/event.html @@ -17,15 +17,9 @@
- {{ range .Pages }} - {{ if eq $.Params.view 1 }} - {{ partial "li_list" . }} - {{ else if eq $.Params.view 3 }} - {{ partial "li_card" . }} - {{ else }} - {{ partial "li_compact" . }} - {{ end }} - {{ end }} + {{ range $index, $item := .Pages }} + {{ partial "functions/render_view" (dict "page" $ "item" . "view" ($.Params.view | default "compact") "index" $index) }} + {{end}}
diff --git a/wowchemy/layouts/section/post.html b/wowchemy/layouts/section/post.html index 9c282a76..4edeef6e 100644 --- a/wowchemy/layouts/section/post.html +++ b/wowchemy/layouts/section/post.html @@ -9,15 +9,9 @@ {{ end }} {{ $paginator := .Paginate .Data.Pages }} - {{ range $paginator.Pages }} - {{ if eq $.Params.view 1 }} - {{ partial "li_list" . }} - {{ else if eq $.Params.view 3 }} - {{ partial "li_card" . }} - {{ else }} - {{ partial "li_compact" . }} - {{ end }} - {{ end }} + {{ range $index, $item := $paginator.Pages }} + {{ partial "functions/render_view" (dict "page" $ "item" . "view" ($.Params.view | default "compact") "index" $index) }} + {{end}} {{ partial "pagination" . }} diff --git a/wowchemy/layouts/section/publication.html b/wowchemy/layouts/section/publication.html index f311e084..c4e98e43 100644 --- a/wowchemy/layouts/section/publication.html +++ b/wowchemy/layouts/section/publication.html @@ -48,7 +48,7 @@
- {{ range .Pages.ByDate.Reverse }} + {{ range $index, $item := .Pages.ByDate.Reverse }} {{ if .Params.publication_types }} {{ $.Scratch.Set "pubtype" (index .Params.publication_types 0) }} @@ -57,15 +57,7 @@ {{ end }}
- {{ if eq $.Params.view 1 }} - {{ partial "li_list" . }} - {{ else if eq $.Params.view 3 }} - {{ partial "li_card" . }} - {{ else if eq $.Params.view 4 }} - {{ partial "li_citation" . }} - {{ else }} - {{ partial "li_compact" . }} - {{ end }} + {{ partial "functions/render_view" (dict "page" $ "item" . "view" ($.Params.view | default "compact") "index" $index) }}
{{ end }} diff --git a/wowchemy/layouts/shortcodes/cite.html b/wowchemy/layouts/shortcodes/cite.html index 37e38804..98847914 100644 --- a/wowchemy/layouts/shortcodes/cite.html +++ b/wowchemy/layouts/shortcodes/cite.html @@ -1,17 +1,8 @@ -{{ $page := .Get "page" }} +{{ $item := .Get "page" }} {{/* Default compact view. */}} -{{ $view := (.Get "view") | default 2 }} -{{ $view = int $view }} +{{ $view := (.Get "view") | default "compact" }} -{{ with site.GetPage $page }} - {{ if eq $view 1 }} - {{ partial "li_list" . }} - {{ else if eq $view 3 }} - {{ partial "li_card" . }} - {{ else if eq $view 4 }} - {{ partial "li_citation" . }} - {{ else }} - {{ partial "li_compact" . }} - {{ end }} +{{ with site.GetPage $item }} + {{ partial "functions/render_view" (dict "page" $ "item" . "view" $view "index" 0) }} {{ end }}