Layout cleanup in preparation of title format change (#691)

kedacore · Mar 7, 2022 · da9ad98 · da9ad98
1 parent 1368885
commit da9ad98
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 33 deletions.
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -4,8 +4,8 @@
   <head>
     {{ partial "meta.html" . }}
     <title>
-      {{ block "title" . }}
-      {{ site.Title }}
+      {{ block "title" . -}}
+        {{ site.Title }} | {{ .Title -}}
       {{ end }}
     </title>
     {{ partial "css.html" . }}

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -1,7 +1,3 @@
-{{ define "title" }}
-{{ site.Title }} | {{ .Title }}
-{{ end }}
-
 {{ define "main" }}
 {{ partial "hero.html" . }}
 {{ partial "content.html" . }}

diff --git a/layouts/blog/list.html b/layouts/blog/list.html
@@ -1,8 +1,4 @@
-{{ define "title" }}
-{{ site.Title }} | {{ .Title }}
-{{ end }}
-
-{{ define "main" }}
-{{ partial "blog/list-hero.html" . }}
-{{ partial "blog/posts.html" . }}
-{{ end }}
+{{ define "main" -}}
+  {{ partial "blog/list-hero.html" . }}
+  {{ partial "blog/posts.html" . }}
+{{ end -}}
diff --git a/layouts/docs/list.html b/layouts/docs/list.html
@@ -1,7 +1,3 @@
-{{ define "title" }}
-{{ site.Title }} | {{ .Title }}
-{{ end }}
-
-{{ define "main" }}
-{{ partial "article.html" . }}
-{{ end }}
+{{ define "main" -}}
+  {{ partial "article.html" . }}
+{{ end -}}
diff --git a/layouts/docs/single.html b/layouts/docs/single.html
@@ -1,7 +1,3 @@
-{{ define "title" }}
-{{ site.Title }} | {{ .Title }}
-{{ end }}
-
-{{ define "main" }}
-{{ partial "article.html" . }}
-{{ end }}
+{{ define "main" -}}
+  {{ partial "article.html" . }}
+{{ end -}}
diff --git a/layouts/index.html b/layouts/index.html
@@ -1,4 +1,4 @@
-{{ define "title" }}
+{{ define "title" -}}
 {{ site.Title }} | {{ site.Params.tagline }}
 {{ end }}
 
@@ -17,4 +17,4 @@
 
 {{ partial "home/get-involved.html" . }}
 {{ partial "home/cncf.html" . }}
-{{ end }}
+{{ end -}}
diff --git a/layouts/partials/home/hero.html b/layouts/partials/home/hero.html
@@ -1,5 +1,4 @@
 {{ $logo   := printf "img/logos/%s" site.Params.logos.hero | relURL }}
-{{ $title  := site.Title }}
 {{ $desc   := site.Params.description | markdownify }}
 {{ $btns   := site.Menus.buttons }}
 {{ $sect   := .Section }}
@@ -9,7 +8,7 @@
     <div class="container">
       <div class="columns is-vcentered is-variable is-8">
         <div class="column is-one-third">
-          <img class="is-hero-logo" src="{{ $logo }}" alt="{{ $title }} home hero logo">
+          <img class="is-hero-logo" src="{{ $logo }}" alt="{{ site.Title }} home hero logo">
         </div>
 
         <div class="column">

diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
@@ -1,6 +1,5 @@
 {{ $home     := site.BaseURL }}
 {{ $here     := .RelPermalink }}
-{{ $title    := site.Title }}
 {{ $logo     := site.Params.logos.navbar }}
 {{ $menu     := site.Menus.main }}
 {{ $docs     := site.Menus.docs }}