From 6d0a6fe4db307701c7131e78c476a86dd6edc88b Mon Sep 17 00:00:00 2001 From: Adam Madej <34507800+arahmitz@users.noreply.github.com> Date: Tue, 2 Apr 2024 14:52:43 +0200 Subject: [PATCH] Fixed new update --- config/_default/params.toml | 2 +- content/posts/20240316-squashstretch/index.md | 4 +- .../20240317-squashstretch_blender/index.md | 4 +- .../_default/_markup/render-heading.html | 12 -- .../_default/_markup/render-image.html | 45 ------ .../_default/_markup/render-link.html | 2 - layouts/_default/_default/baseof.html | 42 ----- layouts/_default/_default/index.json | 13 -- layouts/_default/_default/list.html | 144 ------------------ layouts/_default/_default/rss.xml | 49 ------ layouts/_default/_default/simple.html | 18 --- layouts/_default/_default/single.html | 117 -------------- layouts/_default/_default/sitemap.xml | 23 --- layouts/_default/_default/taxonomy.html | 60 -------- layouts/_default/_default/term.html | 131 ---------------- layouts/_default/_markup/render-image.html | 6 +- layouts/_default/index.json | 8 +- layouts/_default/list.html | 12 +- layouts/_default/single.html | 18 ++- themes/blowfish | 2 +- 20 files changed, 38 insertions(+), 674 deletions(-) delete mode 100644 layouts/_default/_default/_markup/render-heading.html delete mode 100644 layouts/_default/_default/_markup/render-image.html delete mode 100644 layouts/_default/_default/_markup/render-link.html delete mode 100644 layouts/_default/_default/baseof.html delete mode 100644 layouts/_default/_default/index.json delete mode 100644 layouts/_default/_default/list.html delete mode 100644 layouts/_default/_default/rss.xml delete mode 100644 layouts/_default/_default/simple.html delete mode 100644 layouts/_default/_default/single.html delete mode 100644 layouts/_default/_default/sitemap.xml delete mode 100644 layouts/_default/_default/taxonomy.html delete mode 100644 layouts/_default/_default/term.html diff --git a/config/_default/params.toml b/config/_default/params.toml index 3481896..5de3526 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -63,7 +63,7 @@ smartTOCHideUnfocusedChildren = false showEdit = false # editURL = editAppendPath = false - seriesOpened = false + seriesOpened = true showHeadingAnchors = true showPagination = false invertPagination = false diff --git a/content/posts/20240316-squashstretch/index.md b/content/posts/20240316-squashstretch/index.md index b1fd229..876fd98 100644 --- a/content/posts/20240316-squashstretch/index.md +++ b/content/posts/20240316-squashstretch/index.md @@ -6,8 +6,8 @@ date = 2024-03-16T21:02:06+01:00 draft = false tags = ['rigging', 'beginner', 'theory'] showRecent = true -# series = ["Volume preserving squash & stretch ball rig in blender"] -# series_order = 1 +series = ["Squash & Stretch ball rig"] +series_order = 1 +++ # Our first rig - a squash & stretch ball diff --git a/content/posts/20240317-squashstretch_blender/index.md b/content/posts/20240317-squashstretch_blender/index.md index b7c340f..70ead35 100644 --- a/content/posts/20240317-squashstretch_blender/index.md +++ b/content/posts/20240317-squashstretch_blender/index.md @@ -6,8 +6,8 @@ date = 2024-03-17T19:40:15+01:00 draft = false tags = ['rigging', 'beginner', 'blender'] showRecent = true -# series = ["Volume preserving squash & stretch ball rig in blender"] -# series_order = 1 +series = ["Squash & Stretch ball rig"] +series_order = 2 +++ # Rigging the squash & stretch ball in blender diff --git a/layouts/_default/_default/_markup/render-heading.html b/layouts/_default/_default/_markup/render-heading.html deleted file mode 100644 index ccc8377..0000000 --- a/layouts/_default/_default/_markup/render-heading.html +++ /dev/null @@ -1,12 +0,0 @@ -{{ $strAnchor := urlize .Anchor }} -{{ $replacedAnchor := replaceRE "%25" "" $strAnchor }} -{{ .Text | safeHTML }} -
- {{ if.Page.Params.showHeadingAnchors | default (.Page.Site.Params.article.showHeadingAnchors | default true) }} - - # - - {{ end }} -
diff --git a/layouts/_default/_default/_markup/render-image.html b/layouts/_default/_default/_markup/render-image.html deleted file mode 100644 index 20b983b..0000000 --- a/layouts/_default/_default/_markup/render-image.html +++ /dev/null @@ -1,45 +0,0 @@ -{{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} -{{ $url := urls.Parse .Destination }} -{{ $altText := .Text }} -{{ $caption := .Title }} -{{ if findRE "^https?" $url.Scheme }} -
- {{ $altText }} - {{ with $caption }}
{{ . | markdownify }}
{{ end }} -
-{{ else }} - {{ $resource := "" }} - {{ if $.Page.Resources.GetMatch ($url.String) }} - {{ $resource = $.Page.Resources.GetMatch ($url.String) }} - {{ else if resources.GetMatch ($url.String) }} - {{ $resource = resources.Get ($url.String) }} - {{ end }} - {{ with $resource }} -
- {{ if $disableImageOptimization }} - {{ $altText }} - {{ else }} - {{ $altText }} - {{ end }} - {{ with $caption }}
{{ . | markdownify }}
{{ end }} -
- {{ else }} -
- {{ $altText }} - {{ with $caption }}
{{ . | markdownify }}
{{ end }} -
- {{ end }} -{{ end }} diff --git a/layouts/_default/_default/_markup/render-link.html b/layouts/_default/_default/_markup/render-link.html deleted file mode 100644 index 8336169..0000000 --- a/layouts/_default/_default/_markup/render-link.html +++ /dev/null @@ -1,2 +0,0 @@ - - {{ .Text | safeHTML }} \ No newline at end of file diff --git a/layouts/_default/_default/baseof.html b/layouts/_default/_default/baseof.html deleted file mode 100644 index 3aaa9f4..0000000 --- a/layouts/_default/_default/baseof.html +++ /dev/null @@ -1,42 +0,0 @@ - - -{{- partial "head.html" . -}} - - -
- {{ i18n - "nav.skip_to_main" }} -
- {{ $header := print "partials/header/" .Site.Params.header.layout ".html" }} - {{ if templates.Exists $header }} - {{ partial $header . }} - {{ else }} - {{ partial "partials/header/basic.html" . }} - {{ end }} -
-
- {{ block "main" . }}{{ end }} - {{ if and (.Site.Params.footer.showScrollToTop | default true) (gt .WordCount 1) }} - {{- partial "scroll-to-top.html" . -}} - {{ end }} -
- {{- partial "footer.html" . -}} - {{ if .Site.Params.enableSearch | default false }} - {{- partial "search.html" . -}} - {{ end }} -
- -{{ if .Site.Params.buymeacoffee.globalWidget | default false }} - -{{ end }} - diff --git a/layouts/_default/_default/index.json b/layouts/_default/_default/index.json deleted file mode 100644 index d431d3d..0000000 --- a/layouts/_default/_default/index.json +++ /dev/null @@ -1,13 +0,0 @@ -{{- $index := slice -}} -{{- range .Site.Pages -}} - {{- $section := .Site.GetPage "section" .Section -}} - {{- $index = $index | append (dict - "date" (.Date | time.Format (.Site.Language.Params.dateFormat | default ":date_long")) - "title" (.Title | emojify | safeJS) - "section" ($section.Title | emojify | safeJS) - "summary" (.Summary | emojify | safeJS) - "content" (.Plain | emojify | safeJS) - "permalink" .RelPermalink - ) -}} -{{- end -}} -{{- $index | jsonify -}} diff --git a/layouts/_default/_default/list.html b/layouts/_default/_default/list.html deleted file mode 100644 index 62843f8..0000000 --- a/layouts/_default/_default/list.html +++ /dev/null @@ -1,144 +0,0 @@ -{{ define "main" }} - -{{ .Scratch.Set "scope" "list" }} -{{ if .Site.Params.list.showHero | default false }} -{{ $heroStyle := print "partials/hero/" .Site.Params.list.heroStyle ".html" }} -{{ if templates.Exists $heroStyle }} -{{ partial $heroStyle . }} -{{ else }} -{{ partial "partials/hero/basic.html" . }} -{{ end }} -{{- end -}} - -{{ $toc := and (.Params.showTableOfContents | default (.Site.Params.list.showTableOfContents | default false)) (in -.TableOfContents " - {{ if .Params.showBreadcrumbs | default (.Site.Params.list.showBreadcrumbs | default false) }} - {{ partial "breadcrumbs.html" . }} - {{ end }} -

{{ .Title }}

-
- {{ partial "article-meta/list.html" (dict "context" . "scope" "single") }} -
- {{ with .File }} - - {{ end }} - {{ $jsPage := resources.Get "js/page.js" }} - {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }} - - -
- {{ if $toc }} -
-
- {{ partial "toc.html" . }} -
-
- {{ end }} -
- {{ .Content | emojify }} -
- - - - -
- {{ if gt .Pages 0 }} - - {{ $cardView := .Params.cardView | default (.Site.Params.list.cardView | default false) }} - {{ $cardViewScreenWidth := .Params.cardViewScreenWidth | default (.Site.Params.list.cardViewScreenWidth | default false) }} - {{ $groupByYear := .Params.groupByYear | default ($.Site.Params.list.groupByYear | default false) }} - - {{ if not $cardView }} - -
- {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} - {{ if $groupByYear }} -

- {{ .Key }} -

- {{ end }} - {{ range .Pages }} - {{ partial "article-link/simple.html" . }} - {{ end }} - {{ end }} -
- - {{ else if and $cardView (not $cardViewScreenWidth) }} - - {{ if $groupByYear }} - - {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} -

- {{ .Key }} -

-
- {{ range .Pages }} - {{ partial "article-link/card.html" . }} - {{ end }} -
- {{ end }} - - {{ else }} - -
- {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} - {{ range .Pages }} - {{ partial "article-link/card.html" . }} - {{ end }} - {{ end }} -
- - {{ end }} - - {{ else if and $cardView $cardViewScreenWidth }} - - {{ if $groupByYear }} - - {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} -
-

- {{ .Key }} -

-
- {{ range .Pages }} - {{ partial "article-link/card.html" . }} - {{ end }} -
-
- {{ end }} - - {{ else }} - -
-
- {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} - {{ range .Pages }} - {{ partial "article-link/card.html" . }} - {{ end }} - {{ end }} -
-
- - {{ end }} - - {{end}} - - {{ else }} -
-

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

-
- {{ end }} - - {{ partial "pagination.html" . }} - - {{ end }} \ No newline at end of file diff --git a/layouts/_default/_default/rss.xml b/layouts/_default/_default/rss.xml deleted file mode 100644 index 741dcd7..0000000 --- a/layouts/_default/_default/rss.xml +++ /dev/null @@ -1,49 +0,0 @@ -{{- $pctx := . -}} -{{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}} -{{- $pages := slice -}} -{{- if or $.IsHome $.IsSection -}} -{{- $pages = $pctx.RegularPages -}} -{{- else -}} -{{- $pages = $pctx.Pages -}} -{{- end -}} -{{- $limit := .Site.Config.Services.RSS.Limit -}} -{{- if ge $limit 1 -}} -{{- $pages = $pages | first $limit -}} -{{- end -}} -{{- printf "" | safeHTML }} - - - {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }} - {{ .Permalink }} - Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }} - Hugo -- gohugo.io - {{ site.LanguageCode }}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} - {{ if .Site.Params.footer.showCopyright | default true -}} - {{ with replace .Site.Params.copyright "{ year }" now.Year }}{{.}}{{ else }}© {{ now.Format "2006" }} {{ .Site.Author.name }}{{- end }} - {{- end }} - {{ if not .Date.IsZero }}{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end }} - {{- with .OutputFormats.Get "RSS" -}} - {{ printf "" .Permalink .MediaType | safeHTML }} - {{- end -}} - {{ range $pages }} - - {{ .Title }} - {{ .Permalink }} - {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} - {{ .Permalink }} - {{ .Summary | html }} - {{ range ( where .Site.RegularPages ".RelPermalink" .RelPermalink | first 1 ) }} - {{- $images := .Resources.ByType "image" -}} - {{- $featured := $images.GetMatch "*feature*" -}} - {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} - {{- with $featured -}} - - {{- end -}} - {{ end }} - - {{ end }} - - diff --git a/layouts/_default/_default/simple.html b/layouts/_default/_default/simple.html deleted file mode 100644 index cc88479..0000000 --- a/layouts/_default/_default/simple.html +++ /dev/null @@ -1,18 +0,0 @@ -{{ define "main" }} -
-
- {{ if .Params.showBreadcrumbs | default (.Site.Params.article.showBreadcrumbs | default false) }} - {{ partial "breadcrumbs.html" . }} - {{ end }} -

- {{ .Title | emojify }} -

-
-
- {{ .Content | emojify }} -
-
- {{ partial "sharing-links.html" . }} -
-
-{{ end }} diff --git a/layouts/_default/_default/single.html b/layouts/_default/_default/single.html deleted file mode 100644 index 026954c..0000000 --- a/layouts/_default/_default/single.html +++ /dev/null @@ -1,117 +0,0 @@ -{{ define "main" }} -{{ .Scratch.Set "scope" "single" }} - -
- {{ if .Params.showHero | default (.Site.Params.article.showHero | default false) }} - {{ $heroStyle := .Params.heroStyle }} - {{ if not $heroStyle }}{{ $heroStyle = .Site.Params.article.heroStyle }}{{ end }} - {{ $heroStyle := print "partials/hero/" $heroStyle ".html" }} - {{ if templates.Exists $heroStyle }} - {{ partial $heroStyle . }} - {{ else }} - {{ partial "partials/hero/basic.html" . }} - {{ end }} - {{ end }} - -
- {{ if .Params.showBreadcrumbs | default (.Site.Params.article.showBreadcrumbs | default false) }} - {{ partial "breadcrumbs.html" . }} - {{ end }} -

- {{ .Title | emojify }} -

-
- {{ partial "article-meta/basic.html" (dict "context" . "scope" "single") }} -
- - {{ $authorsData := .Site.Data.authors }} - {{ $taxonomies := .Site.Taxonomies.authors }} - {{ $baseURL := .Site.BaseURL }} - {{ $taxonomyLink := 0 }} - {{ $showAuthor := 0 }} - - {{ if .Params.showAuthor | default (.Site.Params.article.showAuthor | default true) }} - {{ $showAuthor = 1 }} - {{ partial "author.html" . }} - {{ end }} - - {{ if not (strings.HasSuffix $baseURL "/") }} - {{ $baseURL = delimit (slice $baseURL "/") "" }} - {{ end }} - - {{ range $author := .Page.Params.authors }} - {{ $authorData := index $authorsData $author }} - {{- if $authorData -}} - - {{ range $taxonomyname, $taxonomy := $taxonomies }} - {{ if (eq $taxonomyname $author) }} - {{ $taxonomyLink = delimit (slice $baseURL "/authors/" $author) "" }} - {{ end }} - {{ end }} - - {{ partial "author-extra.html" (dict "context" . "data" $authorData "link" $taxonomyLink) }} - {{- end -}} - {{ end }} - - {{ if or $taxonomyLink $showAuthor }} -
- {{ end }} - -
- -
- - {{ if or (and (.Params.showTableOfContents | default (.Site.Params.article.showTableOfContents | default false)) (in - .TableOfContents " -
- - {{ if and (.Params.showTableOfContents | default (.Site.Params.article.showTableOfContents | default false)) (in - .TableOfContents " -
- {{ end }} - -
- - {{ partial "series.html" . }} - -
- {{ .Content | emojify }} -
- - {{ partial "series-closed.html" . }} - {{ partial "sharing-links.html" . }} - {{ partial "related.html" . }} -
- - {{ with .File }} - - {{ end }} - {{ $jsPage := resources.Get "js/page.js" }} - {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }} - - -
-
- - {{ partial "article-pagination.html" . }} - {{ if .Params.showComments | default (.Site.Params.article.showComments | default false) }} - {{ if templates.Exists "partials/comments.html" }} -
-
-
- {{ partial "comments.html" . }} -
-
- {{ else }} - {{ warnf "[BLOWFISH] Comments are enabled for %s but no comments partial exists." .File.Path }} - {{ end }} - {{ end }} -
-
-{{ end }} \ No newline at end of file diff --git a/layouts/_default/_default/sitemap.xml b/layouts/_default/_default/sitemap.xml deleted file mode 100644 index 94c04d5..0000000 --- a/layouts/_default/_default/sitemap.xml +++ /dev/null @@ -1,23 +0,0 @@ -{{ printf "" | safeHTML }} - -{{ range .Data.Pages }}{{ if not (in .Site.Params.sitemap.excludedKinds .Kind) }}{{ if and (.Param "xml" | default true) (or (not .Params.externalUrl) (and (.Params.externalUrl) (and (not (hasPrefix .Params.externalUrl "http://")) (not (hasPrefix .Params.externalUrl "https://"))))) }} -{{- if .Permalink -}}{{ $link := .Permalink }}{{ if .Params.externalUrl }}{{ $link = printf "%s%s" .Site.BaseURL (substr .Params.externalUrl 1) }}{{ end }} - - {{ $link }}{{ if not .Lastmod.IsZero }} - {{ safeHTML ( .Lastmod.Format "2006-01-02T15:04:05-07:00" ) }}{{ end }}{{ with .Sitemap.ChangeFreq }} - {{ . }}{{ end }}{{ if ge .Sitemap.Priority 0.0 }} - {{ .Sitemap.Priority }}{{ end }}{{ if .IsTranslated }}{{ range .Translations }} - {{ end }} - {{ end }} - -{{- end -}}{{ end }}{{ end }}{{ end }} - diff --git a/layouts/_default/_default/taxonomy.html b/layouts/_default/_default/taxonomy.html deleted file mode 100644 index aa8e4b1..0000000 --- a/layouts/_default/_default/taxonomy.html +++ /dev/null @@ -1,60 +0,0 @@ -{{ define "main" }} - -{{ .Scratch.Set "scope" "list" }} -{{ if .Site.Params.taxonomy.showHero | default false }} -{{ $heroStyle := print "partials/hero/" .Site.Params.taxonomy.heroStyle ".html" }} -{{ if templates.Exists $heroStyle }} -{{ partial $heroStyle . }} -{{ else }} -{{ partial "partials/hero/basic.html" . }} -{{ end }} -{{- end -}} - -{{ $toc := and (.Params.showTableOfContents | default (.Site.Params.taxonomy.showTableOfContents | default false)) (in -.TableOfContents " - {{ if .Params.showBreadcrumbs | default (.Site.Params.taxonomy.showBreadcrumbs | default false) }} - {{ partial "breadcrumbs.html" . }} - {{ end }} -

{{ .Title }}

-
- {{ partial "article-meta/taxonomy.html" (dict "context" . "scope" "single") }} -
- - {{ if .Content }} -
-
- {{ .Content | emojify }} -
-
- {{ end }} - - {{ $jsPage := resources.Get "js/page.js" }} - {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }} - - - - {{ if .Site.Params.taxonomy.cardView }} - -
- {{ range .Data.Terms }} - {{ partial "term-link/card.html" . }} - {{ end }} -
- - {{ else }} - -
- {{ range .Data.Terms }} - {{ partial "term-link/text.html" . }} - {{ end }} -
- - {{ end }} - - -{{ end }} diff --git a/layouts/_default/_default/term.html b/layouts/_default/_default/term.html deleted file mode 100644 index dcaed10..0000000 --- a/layouts/_default/_default/term.html +++ /dev/null @@ -1,131 +0,0 @@ -{{ define "main" }} - -{{ .Scratch.Set "scope" "list" }} -{{ if .Site.Params.term.showHero | default false }} -{{ $heroStyle := print "partials/hero/" .Site.Params.term.heroStyle ".html" }} -{{ if templates.Exists $heroStyle }} -{{ partial $heroStyle . }} -{{ else }} -{{ partial "partials/hero/basic.html" . }} -{{ end }} -{{- end -}} - -{{ $toc := and (.Params.showTableOfContents | default (.Site.Params.term.showTableOfContents | default false)) (in -.TableOfContents " - {{ if .Params.showBreadcrumbs | default (.Site.Params.term.showBreadcrumbs | default false) }} - {{ partial "breadcrumbs.html" . }} - {{ end }} -

{{ .Title }}

-
- {{ partial "article-meta/term.html" (dict "context" . "scope" "single") }} -
- - -
- {{ if .Content }} -
- {{ .Content | emojify }} -
- {{ end }} - - {{ $jsPage := resources.Get "js/page.js" }} - {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }} - -
- - - {{ if gt .Pages 0 }} - - {{ $cardView := .Params.cardView | default (.Site.Params.list.cardView | default false) }} - {{ $cardViewScreenWidth := .Site.Params.list.cardViewScreenWidth | default false }} - {{ $groupByYear := .Params.groupByYear | default ($.Site.Params.list.groupByYear | default false) }} - - {{ if not $cardView }} - -
- {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} - {{ if $groupByYear }} -

- {{ .Key }} -

- {{ end }} - {{ range .Pages }} - {{ partial "article-link/simple.html" . }} - {{ end }} - {{ end }} -
- - {{ else if and $cardView (not $cardViewScreenWidth) }} - - {{ if $groupByYear }} - - {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} -

- {{ .Key }} -

-
- {{ range .Pages }} - {{ partial "article-link/card.html" . }} - {{ end }} -
- {{ end }} - - {{ else }} - -
- {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} - {{ range .Pages }} - {{ partial "article-link/card.html" . }} - {{ end }} - {{ end }} -
- - {{ end }} - - {{ else if and $cardView $cardViewScreenWidth }} - - {{ if $groupByYear }} - - {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} -
-

- {{ .Key }} -

-
- {{ range .Pages }} - {{ partial "article-link/card.html" . }} - {{ end }} -
-
- {{ end }} - - {{ else }} - -
-
- {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} - {{ range .Pages }} - {{ partial "article-link/card.html" . }} - {{ end }} - {{ end }} -
-
- - {{ end }} - - {{end}} - - {{ else }} -
-

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

-
- {{ end }} - - {{ partial "pagination.html" . }} - - {{ end }} \ No newline at end of file diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html index 20b983b..db9ebd2 100644 --- a/layouts/_default/_markup/render-image.html +++ b/layouts/_default/_markup/render-image.html @@ -4,7 +4,7 @@ {{ $caption := .Title }} {{ if findRE "^https?" $url.Scheme }}
- {{ $altText }} + {{ $altText }} {{ with $caption }}
{{ . | markdownify }}
{{ end }}
{{ else }} @@ -19,12 +19,14 @@ {{ if $disableImageOptimization }} {{ $altText }} {{ else }} {{ else }}
- {{ $altText }} + {{ $altText }} {{ with $caption }}
{{ . | markdownify }}
{{ end }}
{{ end }} diff --git a/layouts/_default/index.json b/layouts/_default/index.json index d431d3d..0f44c53 100644 --- a/layouts/_default/index.json +++ b/layouts/_default/index.json @@ -1,5 +1,9 @@ {{- $index := slice -}} -{{- range .Site.Pages -}} +{{ $pages := .Site.Pages }} +{{ range .Site.Home.Translations }} +{{ $pages = $pages | lang.Merge .Site.Pages }} +{{ end }} +{{- range $pages -}} {{- $section := .Site.GetPage "section" .Section -}} {{- $index = $index | append (dict "date" (.Date | time.Format (.Site.Language.Params.dateFormat | default ":date_long")) @@ -8,6 +12,8 @@ "summary" (.Summary | emojify | safeJS) "content" (.Plain | emojify | safeJS) "permalink" .RelPermalink + "externalUrl" .Params.externalUrl + "type" .Type ) -}} {{- end -}} {{- $index | jsonify -}} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 62843f8..ef35de8 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -19,10 +19,16 @@

{{ .
{{ partial "article-meta/list.html" (dict "context" . "scope" "single") }}
+ {{ $translations := .AllTranslations }} {{ with .File }} + {{ $path := .Path }} + {{range $translations}} + {{ $lang := print "." .Lang ".md" }} + {{ $path = replace $path $lang ".md" }} + {{end}} {{ end }} {{ $jsPage := resources.Get "js/page.js" }} @@ -141,4 +147,4 @@

- {{ partial "series.html" . }} + {{ partial "series/series.html" . }}
{{ .Content | emojify }}
- {{ partial "series-closed.html" . }} + {{ partial "series/series-closed.html" . }} {{ partial "sharing-links.html" . }} {{ partial "related.html" . }}
- {{ with .File }} - {{ end }} {{ $jsPage := resources.Get "js/page.js" }} diff --git a/themes/blowfish b/themes/blowfish index 65956f1..92c13bd 160000 --- a/themes/blowfish +++ b/themes/blowfish @@ -1 +1 @@ -Subproject commit 65956f10b96b43350cf387f5d45c0cabe759e0cb +Subproject commit 92c13bdc8514fa9e8c0238d14e9d2e71a2ebe4a5