diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 2a5935f..f733092 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -30,7 +30,8 @@ - {{- partial "footer.html" . -}} + {{ $footerTemplate:= site.Params.footer.template | default "footer.html" }} + {{- partial $footerTemplate . -}} {{ partial "scripts.html" . }} diff --git a/layouts/index.html b/layouts/index.html index e960ebd..9a5d5dd 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -66,7 +66,8 @@ {{ end }} - {{- partial "footer.html" . -}} + {{ $footerTemplate:= site.Params.footer.template | default "footer.html" }} + {{- partial $footerTemplate . -}} {{ partial "scripts.html" . }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index ca2c7ff..a20f226 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -2,9 +2,14 @@ {{ $footerEnabled := site.Params.footer.enable | default true }} {{ $navigationEnabled := site.Params.footer.navigation.enable | default true }} {{ $contactMeEnabled := site.Params.footer.contactMe.enable | default true }} -{{ $newsLetterEnabled := site.Params.newsletter.enable | default false }} +{{ $newsletterEnabled := site.Params.footer.newsletter.enable | default true }} {{ $credentialsEnabled := site.Params.footer.credentials.enable | default true }} +{{/* Keep backward compatibility for the newsletter function */}} +{{ if site.Params.newsletter.enable }} + {{ $newsletterEnabled = true }} +{{ end }} + {{ if $footerEnabled }} {{ $author:= site.Data.author }} {{ if (index site.Data site.Language.Lang).author }} @@ -16,7 +21,7 @@ {{ $sections = (index site.Data site.Language.Lang).sections }} {{ end }} - {{ $copyrightNotice := "© 2020 Copyright."}} + {{ $copyrightNotice := "© 2021 Copyright."}} {{ if (index site.Data site.Language.Lang).site }} {{ $siteConfig := (index site.Data site.Language.Lang).site }} {{ if $siteConfig.copyright }} @@ -74,7 +79,7 @@ {{ end }} - {{ if $newsLetterEnabled }} + {{ if $newsletterEnabled }}
{{ i18n "newsletter_text" }}