From f4568a45894f302b368e52fe82958ee0964dca9a Mon Sep 17 00:00:00 2001 From: Dmitry Verkhoturov Date: Sun, 25 Mar 2018 18:08:39 +0300 Subject: [PATCH] set default if no configuration is set for variables which require that (#36) --- layouts/_default/list.html | 4 ++-- layouts/_default/taxonomy.html | 4 ++-- layouts/blog/list.html | 8 ++++---- layouts/blog/single.html | 6 +++--- layouts/index.html | 4 ++-- layouts/partials/blogsection.html | 4 ++-- layouts/partials/header.html | 4 ++-- layouts/partials/li.html | 4 ++-- layouts/partials/projects.html | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 856a388..98f56b9 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -29,7 +29,7 @@ {{ range .Data.Pages.ByPublishDate }} {{ if not (eq .Section "blog") }}
  • - {{.Date.Format .Site.Params.dateForm }} | {{.Title}} + {{.Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }} | {{.Title}}
  • {{ end }} {{ end }} @@ -62,4 +62,4 @@ }) - \ No newline at end of file + diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index 4130450..383bc3f 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -29,7 +29,7 @@ {{ range .Data.Pages.ByPublishDate }}
  • - {{.Date.Format .Site.Params.dateForm }} | {{.Title}} + {{.Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }} | {{.Title}}
  • {{ end }} @@ -62,4 +62,4 @@ }) - \ No newline at end of file + diff --git a/layouts/blog/list.html b/layouts/blog/list.html index 6597d86..8da589e 100644 --- a/layouts/blog/list.html +++ b/layouts/blog/list.html @@ -4,7 +4,7 @@
    -

    {{ .Site.Params.blogHead }}

    +

    {{ .Site.Params.blogHead | default "Blog" }}

    @@ -13,13 +13,13 @@
    {{ partial "nav-list.html" . }}
    - +
    {{ if .Site.Params.showLatest }}

    Latest Post

    - {{ range first 1 (where .Data.Pages.ByPublishDate.Reverse "Section" "blog") }} -
    {{ .Date.Format .Site.Params.dateForm }} + {{ range first 1 (where .Data.Pages.ByPublishDate.Reverse "Section" "blog") }} +
    {{ .Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }}

    {{ .Title }}

    {{ .Summary }} diff --git a/layouts/blog/single.html b/layouts/blog/single.html index 09600c2..fe9565b 100644 --- a/layouts/blog/single.html +++ b/layouts/blog/single.html @@ -4,7 +4,7 @@
    -

    {{ .Site.Params.blogHead }}

    +

    {{ .Site.Params.blogHead | default "Blog" }}

    @@ -17,7 +17,7 @@

    {{ .Title }}

    - {{ .Date.Format .Site.Params.dateForm }} | + {{ .Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }} | {{ if eq 1 .ReadingTime }}{{ .ReadingTime }} minute read{{ else }}{{ .ReadingTime }} minutes read{{ end }}
    @@ -87,4 +87,4 @@ $('a[href^="{{ .Permalink }}#"]').click(function(e) { }) - \ No newline at end of file + diff --git a/layouts/index.html b/layouts/index.html index ffa2a2d..5d922c1 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -3,14 +3,14 @@
    -
    +

    - Hi, I'm {{ .Site.Params.firstName }}. + Hi, I'm {{ .Site.Params.firstName | default "Introduction" }}.

    {{ .Site.Params.tagLine }} diff --git a/layouts/partials/blogsection.html b/layouts/partials/blogsection.html index 4b5377e..886cdf7 100644 --- a/layouts/partials/blogsection.html +++ b/layouts/partials/blogsection.html @@ -2,8 +2,8 @@ {{ if .Site.Params.showLatest }}

    Latest Post

    - {{ range first 1 (where .Data.Pages.ByPublishDate.Reverse "Section" "blog") }} -
    {{ .Date.Format .Site.Params.dateForm }} + {{ range first 1 (where .Data.Pages.ByPublishDate.Reverse "Section" "blog") }} +
    {{ .Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }}

    {{ .Title }}

    {{ .Summary }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 951bfc7..c8eb9ee 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -46,14 +46,14 @@ crossorigin="anonymous"> {{ if .Site.Params.cacheBuster }} {{ $t := now.Unix }} - + {{range .Site.Params.extraCSSFiles}} {{ end }} {{ else }} - + {{range .Site.Params.extraCSSFiles}} {{end}} diff --git a/layouts/partials/li.html b/layouts/partials/li.html index 8761d7c..1e26736 100644 --- a/layouts/partials/li.html +++ b/layouts/partials/li.html @@ -1,3 +1,3 @@
  • - {{ .Title }} - {{ .Date.Format .Site.Params.dateForm }} -
  • \ No newline at end of file + {{ .Title }} - {{ .Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }} + diff --git a/layouts/partials/projects.html b/layouts/partials/projects.html index eca447e..74539af 100644 --- a/layouts/partials/projects.html +++ b/layouts/partials/projects.html @@ -5,8 +5,8 @@
    {{ range sort .Pages }} {{ if eq .Section "projects" }} - {{ if eq .Site.Params.projectColumns "2" }} -
    {{ else if eq .Site.Params.projectColumns "3" }} + {{ if eq (.Site.Params.projectColumns | default "3") "2" }} +
    {{ else if eq (.Site.Params.projectColumns | default "3") "3" }}
    {{ end }}