From 5cc1f9b3670f06431775e026e5f9ea334e5a1e47 Mon Sep 17 00:00:00 2001 From: MadeByMike Date: Mon, 1 Jan 2018 22:46:28 +1100 Subject: Add baseof template --- site/layouts/_default/baseof.html | 9 ++++++++ site/layouts/_default/li.html | 5 +---- site/layouts/_default/list.html | 5 ++--- site/layouts/_default/single.html | 9 ++++---- site/layouts/index.html | 6 ++--- site/layouts/partials/head.html | 46 +++++++++++++++++--------------------- site/layouts/post/single.html | 6 ++--- site/layouts/section/contact.html | 6 ++--- site/layouts/section/products.html | 5 ++--- site/layouts/section/values.html | 6 ++--- 10 files changed, 50 insertions(+), 53 deletions(-) create mode 100644 site/layouts/_default/baseof.html (limited to 'site/layouts') diff --git a/site/layouts/_default/baseof.html b/site/layouts/_default/baseof.html new file mode 100644 index 0000000..c068832 --- /dev/null +++ b/site/layouts/_default/baseof.html @@ -0,0 +1,9 @@ + + + {{ partial "head" . }} + + {{ partial "nav" . }} + {{ block "main" . }}{{ end }} + {{ partial "footer" . }} + + \ No newline at end of file diff --git a/site/layouts/_default/li.html b/site/layouts/_default/li.html index e5fca8e..e3d57de 100644 --- a/site/layouts/_default/li.html +++ b/site/layouts/_default/li.html @@ -1,9 +1,6 @@ - -

- diff --git a/site/layouts/_default/list.html b/site/layouts/_default/list.html index 33d722a..c23fa0c 100644 --- a/site/layouts/_default/list.html +++ b/site/layouts/_default/list.html @@ -1,5 +1,4 @@ -{{ partial "head" . }} -{{ partial "nav" . }} +{{ define "main" }} {{ partial "jumbotron" (dict "imageUrl" "/img/blog-index.jpg" "title" "Latest stories") }} @@ -13,4 +12,4 @@ -{{ partial "footer" . }} +{{end}} \ No newline at end of file diff --git a/site/layouts/_default/single.html b/site/layouts/_default/single.html index 2126d61..159e454 100644 --- a/site/layouts/_default/single.html +++ b/site/layouts/_default/single.html @@ -1,5 +1,6 @@ -{{ partial "head" . }} -{{ partial "nav" . }} +{{ define "main" }} + {{ partial "jumbotron" (dict "imageUrl" "/img/7.jpg" "title" "This is where the heading goes" "subtitle" "This is where the subtitle goes") }} - {{ .Content }} -{{ partial "footer" . }} +{{ .Content }} + +{{ end }} diff --git a/site/layouts/index.html b/site/layouts/index.html index a21df24..d4e1902 100644 --- a/site/layouts/index.html +++ b/site/layouts/index.html @@ -1,6 +1,4 @@ -{{ partial "head" . }} - -{{ partial "nav" . }} +{{ define "main" }} {{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title "subtitle" .Params.subtitle) }} @@ -12,4 +10,4 @@ {{ partial "blog" . }} -{{ partial "footer" . }} +{{ end }} diff --git a/site/layouts/partials/head.html b/site/layouts/partials/head.html index 9e75f44..f65ee56 100644 --- a/site/layouts/partials/head.html +++ b/site/layouts/partials/head.html @@ -1,31 +1,27 @@ - - - + - {{ .Title }} | Kaldi - + {{ .Title }} | Kaldi + - - - + + + - + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + \ No newline at end of file diff --git a/site/layouts/post/single.html b/site/layouts/post/single.html index 75a355f..bc34c45 100644 --- a/site/layouts/post/single.html +++ b/site/layouts/post/single.html @@ -1,5 +1,5 @@ -{{ partial "head" . }} -{{ partial "nav" . }} +{{ define "main" }} +

@@ -12,4 +12,4 @@ {{ .Content }}

-{{ partial "footer" . }} +{{ end }} diff --git a/site/layouts/section/contact.html b/site/layouts/section/contact.html index 205d92e..8b5d45c 100644 --- a/site/layouts/section/contact.html +++ b/site/layouts/section/contact.html @@ -1,6 +1,4 @@ -{{ partial "head" . }} - -{{ partial "nav" . }} +{{ define "main" }}

@@ -23,4 +21,4 @@

-{{ partial "footer" . }} +{{ end }} diff --git a/site/layouts/section/products.html b/site/layouts/section/products.html index bf430ca..6a1243b 100644 --- a/site/layouts/section/products.html +++ b/site/layouts/section/products.html @@ -1,5 +1,4 @@ -{{ partial "head" . }} -{{ partial "nav" . }} +{{ define "main" }} {{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title) }} @@ -29,4 +28,4 @@ {{ partial "table" .Params.pricing }} -{{ partial "footer" . }} +{{ end }} diff --git a/site/layouts/section/values.html b/site/layouts/section/values.html index 9b6fa13..93913e5 100644 --- a/site/layouts/section/values.html +++ b/site/layouts/section/values.html @@ -1,5 +1,5 @@ -{{ partial "head" . }} -{{ partial "nav" . }} +{{ define "main" }} + {{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title) }}

@@ -14,4 +14,4 @@

-{{ partial "footer" . }} +{{ end }} -- cgit v1.3

{{ .Title }}

{{ .Title }}

{{.Title}}