From 3722c7d41319d44dec166fc481a5c99e8ba5aa2c Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Thu, 23 Apr 2020 12:15:24 +0000 Subject: [PATCH] Wrap .File.Dir in conditionals to prevent warning Fixes: #728 --- exampleSite/config-dev.toml | 3 +++ layouts/_default/list.html | 4 ++-- layouts/partials/fragments/editor.html | 16 +++++++++------- layouts/partials/fragments/graph.html | 16 +++++++++------- layouts/partials/fragments/hero.html | 20 +++++++++++--------- 5 files changed, 34 insertions(+), 25 deletions(-) diff --git a/exampleSite/config-dev.toml b/exampleSite/config-dev.toml index b426e0fb..3903ae3a 100644 --- a/exampleSite/config-dev.toml +++ b/exampleSite/config-dev.toml @@ -9,6 +9,9 @@ enableGitInfo = true version = "0.16.2" disableKinds = ["RSS", "taxonomy", "taxonomyTerm"] +RelativeURLs = true +CanonifyURLs = true + # Google Analytics tracking googleAnalytics = "" diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 4ec3df1e..8317c461 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,6 +1,6 @@ {{- define "main" -}} - {{/* In some edge cases, .CurrentSection is not available. If it's not - available the build would break since we need .CurrentSection.File.Dir later on. */}} + {{- /* In some edge cases, .CurrentSection is not available. If it's not + available the build would break since we need .CurrentSection.File.Dir later on. */ -}} {{- if .CurrentSection -}} {{- $list_page := .Site.GetPage "page" (printf "%s%s" .CurrentSection.File.Dir "_index") -}} {{/* real_page is the _index.md file which indicates the page that is diff --git a/layouts/partials/fragments/editor.html b/layouts/partials/fragments/editor.html index de379dda..0a4620c2 100644 --- a/layouts/partials/fragments/editor.html +++ b/layouts/partials/fragments/editor.html @@ -6,10 +6,12 @@ {{- partial "helpers/container.html" (dict "start" true "in_slot" .in_slot "bg" $bg "Name" .Name "Params" .Params) -}}
{{- partial "helpers/container.html" (dict "end" true "in_slot" .in_slot) -}} - +{{- if .page.File.Dir -}} + +{{- end -}} diff --git a/layouts/partials/fragments/graph.html b/layouts/partials/fragments/graph.html index 92b22819..efe18664 100644 --- a/layouts/partials/fragments/graph.html +++ b/layouts/partials/fragments/graph.html @@ -11,10 +11,12 @@ {{- partial "helpers/container.html" (dict "end" true "in_slot" .in_slot) -}} - +{{- if .page.File.Dir -}} + +{{- end -}} diff --git a/layouts/partials/fragments/hero.html b/layouts/partials/fragments/hero.html index c1cd0c9f..3fc6228a 100644 --- a/layouts/partials/fragments/hero.html +++ b/layouts/partials/fragments/hero.html @@ -103,12 +103,14 @@ {{- if .Params.particles }} - -{{ end -}} +{{- if .page.File.Dir -}} + + {{ end -}} +{{ end -}} \ No newline at end of file