From d0c32c5d082c4fa6b09690e60ebf06a4c59713a2 Mon Sep 17 00:00:00 2001 From: alex bezek Date: Sat, 24 Oct 2020 22:07:18 -0400 Subject: [PATCH] Fix the single template to use the authors avatar correctly (#107) * Fix the single template to use the authors avatar correctly * Replace absURL with relURL and .Site.X with site.X Co-authored-by: Emruz Hossain --- README.md | 6 ++-- exampleSite/config.yaml | 8 ++--- layouts/404.html | 2 +- layouts/_default/baseof.html | 2 +- layouts/_default/list.html | 2 +- layouts/_default/single.html | 12 ++++---- layouts/index.html | 9 +++--- layouts/partials/cards/project.html | 2 +- layouts/partials/cards/skill.html | 2 +- layouts/partials/disqus.html | 2 +- layouts/partials/footer.html | 18 +++++------ layouts/partials/header.html | 2 +- .../partials/helpers/get-author-image.html | 13 +++++--- layouts/partials/helpers/get-author-name.html | 6 ++-- .../navigators/floating-lang-selector.html | 4 +-- .../partials/navigators/lang-selector-2.html | 4 +-- .../partials/navigators/lang-selector.html | 4 +-- layouts/partials/navigators/navbar-2.html | 10 +++---- layouts/partials/navigators/navbar.html | 30 +++++++++---------- layouts/partials/sections/about.html | 2 +- .../partials/sections/achievements/entry.html | 2 +- layouts/partials/sections/home.html | 24 +++++++-------- 22 files changed, 86 insertions(+), 80 deletions(-) diff --git a/README.md b/README.md index 5067719..fbdcc21 100644 --- a/README.md +++ b/README.md @@ -98,9 +98,9 @@ params: # transparent navbar and the main logo will be used in the non-transparent navbar. # It will be default to the theme logos if not provided. logo: - main: assets/images/main-logo.png - inverted: assets/images/inverted-logo.png - favicon: assets/images/favicon.png + main: /assets/images/main-logo.png + inverted: /assets/images/inverted-logo.png + favicon: /assets/images/favicon.png # GitHub repo URL of your site gitRepo: https://github.com/hossainemruz/toha-example-site diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index b549904..4b5c584 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -15,7 +15,7 @@ languages: bn: languageName: বাংলা weight: 3 - de: + de: languageName: Deutsch weight: 4 id: @@ -54,9 +54,9 @@ params: # transparent navbar and the main logo will be used in the non-transparent navbar. # It will be default to the theme logos if not provided. logo: - main: assets/images/main-logo.png - inverted: assets/images/inverted-logo.png - favicon: assets/images/favicon.png + main: /assets/images/main-logo.png + inverted: /assets/images/inverted-logo.png + favicon: /assets/images/favicon.png # GitHub repo URL of your site gitRepo: https://github.com/hossainemruz/toha-example-site diff --git a/layouts/404.html b/layouts/404.html index bcf8eab..941ecc1 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -3,7 +3,7 @@ {{ end }} {{ define "navbar" }} - {{ partial "navigators/navbar-2.html" (dict "baseURL" .Site.BaseURL "title" .Site.Title "hasToggleButton" false) }} + {{ partial "navigators/navbar-2.html" (dict "baseURL" site.BaseURL "title" site.Title "hasToggleButton" false) }} {{ end }} {{ define "content" }} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index e47c959..2a5935f 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -9,7 +9,7 @@ {{ block "header" . }} {{ end }} - {{ if .Site.GoogleAnalytics }} + {{ if site.GoogleAnalytics }} {{ template "_internal/google_analytics_async.html" . }} {{ end }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index cccfd77..3ce168c 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -21,7 +21,7 @@ diff --git a/layouts/_default/single.html b/layouts/_default/single.html index e54de46..af03ec1 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -21,7 +21,7 @@ @@ -35,13 +35,13 @@
-
+
- +
{{ partial "helpers/get-author-name.html" . }}

{{ .Page.Date.Format "January 2, 2006" }}

@@ -55,9 +55,9 @@
- {{ if .Site.Params.GitRepo }} + {{ if site.Params.GitRepo }}
- + Improve This Page @@ -69,7 +69,7 @@ {{ partial "navigators/next-prev-navigator.html" . }}
- {{ if .Site.DisqusShortname }} + {{ if site.DisqusShortname }} {{ partial "disqus.html" . }} {{ end }}
diff --git a/layouts/index.html b/layouts/index.html index e82e7f3..17cab83 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -10,6 +10,7 @@ {{ end }} {{ end }} + {{- partial "header.html" . -}} @@ -23,7 +24,7 @@ - {{ if .Site.GoogleAnalytics }} + {{ if site.GoogleAnalytics }} {{ template "_internal/google_analytics_async.html" . }} {{ end }} @@ -36,9 +37,9 @@ {{- partial "sections/home.html" . -}} - {{ $sections:= .Site.Data.sections }} - {{ if (index .Site.Data .Site.Language.Lang).sections }} - {{ $sections = (index .Site.Data .Site.Language.Lang).sections }} + {{ $sections:= site.Data.sections }} + {{ if (index site.Data site.Language.Lang).sections }} + {{ $sections = (index site.Data site.Language.Lang).sections }} {{ end }} {{ if $sections }} diff --git a/layouts/partials/cards/project.html b/layouts/partials/cards/project.html index a56dbf7..3f21d31 100644 --- a/layouts/partials/cards/project.html +++ b/layouts/partials/cards/project.html @@ -8,7 +8,7 @@
{{ if .logo }} - {{ .name }} + {{ .name }} {{ end }}
{{ .name }}
diff --git a/layouts/partials/cards/skill.html b/layouts/partials/cards/skill.html index b911405..4478e1e 100644 --- a/layouts/partials/cards/skill.html +++ b/layouts/partials/cards/skill.html @@ -3,7 +3,7 @@
{{ if .icon }} - {{ .name }} + {{ .name }} {{ end }}
{{ .name }}
diff --git a/layouts/partials/disqus.html b/layouts/partials/disqus.html index 9c47b63..57eb960 100644 --- a/layouts/partials/disqus.html +++ b/layouts/partials/disqus.html @@ -8,7 +8,7 @@ var dsq = document.createElement("script"); dsq.type = "text/javascript"; dsq.async = true; - var disqus_shortname = "{{ .Site.DisqusShortname }}"; + var disqus_shortname = "{{ site.DisqusShortname }}"; dsq.src = "//" + disqus_shortname + ".disqus.com/embed.js"; ( document.getElementsByTagName("head")[0] || diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index d707663..baefb6f 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,16 +1,16 @@ -{{ $author:= .Site.Data.author }} -{{ if (index .Site.Data .Site.Language.Lang).author }} - {{ $author = (index .Site.Data .Site.Language.Lang).author }} +{{ $author:= site.Data.author }} +{{ if (index site.Data site.Language.Lang).author }} + {{ $author = (index site.Data site.Language.Lang).author }} {{ end }} -{{ $sections:= .Site.Data.sections }} -{{ if (index .Site.Data .Site.Language.Lang).sections }} - {{ $sections = (index .Site.Data .Site.Language.Lang).sections }} +{{ $sections:= site.Data.sections }} +{{ if (index site.Data site.Language.Lang).sections }} + {{ $sections = (index site.Data site.Language.Lang).sections }} {{ end }} {{ $copyrightNotice := "© 2020 Copyright."}} -{{ if (index .Site.Data .Site.Language.Lang).site }} - {{ $siteConfig := (index .Site.Data .Site.Language.Lang).site }} +{{ if (index site.Data site.Language.Lang).site }} + {{ $siteConfig := (index site.Data site.Language.Lang).site }} {{ if $siteConfig.copyright }} {{ $copyrightNotice = $siteConfig.copyright }} {{ end }} @@ -48,7 +48,7 @@
{{ end }} - {{ if .Site.Params.newsletter.enable }} + {{ if site.Params.newsletter.enable }}

{{ i18n "newsletter_text" }}

diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 5d9e40f..a1f34dc 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -13,7 +13,7 @@ - + diff --git a/layouts/partials/helpers/get-author-image.html b/layouts/partials/helpers/get-author-image.html index 9ab6360..8142ddc 100644 --- a/layouts/partials/helpers/get-author-image.html +++ b/layouts/partials/helpers/get-author-image.html @@ -1,7 +1,12 @@ -{{ $authorImage:= "/assets/images/default-avatar.png"}} -{{ if .Site.Data.site.author}} - {{ $authorImage = .Site.Data.site.author.image | relURL }} -{{ end}} +{{ $author:= site.Data.author }} +{{ if (index site.Data site.Language.Lang).author }} + {{ $author = (index site.Data site.Language.Lang).author }} +{{ end }} +{{ $authorImage:= "/assets/images/default-avatar.png" }} +{{ if $author.image }} + {{ $authorImage = $author.image }} +{{ end }} + {{ if eq (printf "%T" .Params.author ) "maps.Params" }} {{ with .Params.author }} {{ if .image }} diff --git a/layouts/partials/helpers/get-author-name.html b/layouts/partials/helpers/get-author-name.html index 1ad3612..63c0846 100644 --- a/layouts/partials/helpers/get-author-name.html +++ b/layouts/partials/helpers/get-author-name.html @@ -1,6 +1,6 @@ -{{ $authorName:= .Site.Params.author.name }} -{{ if .Site.Data.site.author}} - {{ $authorName = .Site.Data.site.author.name }} +{{ $authorName:= site.Params.author.name }} +{{ if site.Data.site.author}} + {{ $authorName = site.Data.site.author.name }} {{ end}} {{ if eq (printf "%T" .Params.author ) "maps.Params" }} {{ with .Params.author }} diff --git a/layouts/partials/navigators/floating-lang-selector.html b/layouts/partials/navigators/floating-lang-selector.html index 6c59479..ec891d6 100644 --- a/layouts/partials/navigators/floating-lang-selector.html +++ b/layouts/partials/navigators/floating-lang-selector.html @@ -1,12 +1,12 @@ {{ $pageURL:= .RelPermalink }} -{{ if .Site.IsMultiLingual }} +{{ if site.IsMultiLingual }} {{ $pageURL = strings.TrimPrefix (path.Join "/" .Language.Lang) $pageURL }} {{ end }}
{{ range .Translations }} diff --git a/layouts/partials/navigators/lang-selector-2.html b/layouts/partials/navigators/lang-selector-2.html index a900573..d94bd05 100644 --- a/layouts/partials/navigators/lang-selector-2.html +++ b/layouts/partials/navigators/lang-selector-2.html @@ -1,12 +1,12 @@ {{ $pageURL:= .RelPermalink }} -{{ if .Site.IsMultiLingual }} +{{ if site.IsMultiLingual }} {{ $pageURL = strings.TrimPrefix (path.Join "/" .Language.Lang) $pageURL }} {{ end }}
  • {{ range .Translations }} diff --git a/layouts/partials/navigators/lang-selector.html b/layouts/partials/navigators/lang-selector.html index 0c73196..395cbb1 100644 --- a/layouts/partials/navigators/lang-selector.html +++ b/layouts/partials/navigators/lang-selector.html @@ -1,10 +1,10 @@
  • - {{ range $.Site.Home.AllTranslations }} + {{ range site.Home.AllTranslations }} {{ .Language.LanguageName }} diff --git a/layouts/partials/navigators/navbar-2.html b/layouts/partials/navigators/navbar-2.html index 7bb845b..e057e21 100644 --- a/layouts/partials/navigators/navbar-2.html +++ b/layouts/partials/navigators/navbar-2.html @@ -1,5 +1,5 @@ -{{ $mainLogo:="assets/images/main-logo.png" }} -{{ $invertedLogo:="assets/images/inverted-logo.png" }} +{{ $mainLogo:="/assets/images/main-logo.png" }} +{{ $invertedLogo:="/assets/images/inverted-logo.png" }} {{ if site.Params.logo.main }} {{ $mainLogo = site.Params.logo.main }} {{ end }} @@ -13,7 +13,7 @@ - + {{- site.Title -}}
    • - - + + diff --git a/layouts/partials/navigators/navbar.html b/layouts/partials/navigators/navbar.html index 26b7848..03f68c0 100644 --- a/layouts/partials/navigators/navbar.html +++ b/layouts/partials/navigators/navbar.html @@ -1,22 +1,22 @@ -{{ $mainLogo:="assets/images/main-logo.png" }} -{{ $invertedLogo:="assets/images/inverted-logo.png" }} -{{ if .Site.Params.logo.main }} - {{ $mainLogo = .Site.Params.logo.main }} +{{ $mainLogo:="/assets/images/main-logo.png" }} +{{ $invertedLogo:="/assets/images/inverted-logo.png" }} +{{ if site.Params.logo.main }} + {{ $mainLogo = site.Params.logo.main }} {{ end }} -{{ if .Site.Params.logo.inverted }} - {{ $invertedLogo = .Site.Params.logo.inverted }} +{{ if site.Params.logo.inverted }} + {{ $invertedLogo = site.Params.logo.inverted }} {{ end }} -{{ $sections:= .Site.Data.sections }} -{{ if (index .Site.Data .Site.Language.Lang).sections }} - {{ $sections = (index .Site.Data .Site.Language.Lang).sections }} +{{ $sections:= site.Data.sections }} +{{ if (index site.Data site.Language.Lang).sections }} + {{ $sections = (index site.Data site.Language.Lang).sections }} {{ end }}
    - - + + diff --git a/layouts/partials/sections/about.html b/layouts/partials/sections/about.html index 914fea0..df9702d 100644 --- a/layouts/partials/sections/about.html +++ b/layouts/partials/sections/about.html @@ -38,7 +38,7 @@
    {{ if .resume }} - {{ end }} diff --git a/layouts/partials/sections/achievements/entry.html b/layouts/partials/sections/achievements/entry.html index 51621f0..4f665ce 100644 --- a/layouts/partials/sections/achievements/entry.html +++ b/layouts/partials/sections/achievements/entry.html @@ -1,6 +1,6 @@

    {{ .title }}

    diff --git a/layouts/partials/sections/home.html b/layouts/partials/sections/home.html index 76715f7..4bf85e2 100644 --- a/layouts/partials/sections/home.html +++ b/layouts/partials/sections/home.html @@ -1,6 +1,6 @@ -{{ $author:= .Site.Data.author }} -{{ if (index .Site.Data .Site.Language.Lang).author }} - {{ $author = (index .Site.Data .Site.Language.Lang).author }} +{{ $author:= site.Data.author }} +{{ if (index site.Data site.Language.Lang).author }} + {{ $author = (index site.Data site.Language.Lang).author }} {{ end }} {{ $name:="Jane Doe" }} @@ -10,17 +10,17 @@ {{ $name = $author.name }} {{ end }} -{{ $sections:= .Site.Data.sections }} -{{ if (index .Site.Data .Site.Language.Lang).sections }} - {{ $sections = (index .Site.Data .Site.Language.Lang).sections }} +{{ $sections:= site.Data.sections }} +{{ if (index site.Data site.Language.Lang).sections }} + {{ $sections = (index site.Data site.Language.Lang).sections }} {{ end }} -{{ $backgroundImage:= "assets/images/default-background.jpg" }} -{{ if .Site.Params.background }} - {{ $backgroundImage = .Site.Params.background }} +{{ $backgroundImage:= "/assets/images/default-background.jpg" }} +{{ if site.Params.background }} + {{ $backgroundImage = site.Params.background }} {{ end }} -{{ $authorImage:= "assets/images/default-avatar.png" }} +{{ $authorImage:= "/assets/images/default-avatar.png" }} {{ if $author.image }} {{ $authorImage = $author.image }} {{ end }} @@ -28,10 +28,10 @@
    -

    {{ $author.greeting }} {{ $name }}