X-Git-Url: https://www.kengrimes.com/gitweb/?p=kengrimes.com%2Ftheme.git;a=blobdiff_plain;f=layouts%2F_default%2Fbaseof.html;h=96e0c133651984b2ee3d5b763c82586476256572;hp=3f7a35d4e36e18385069779302c04c4879a17eae;hb=89599f9d5c5e4e5b8fa50c39e34dd502293fa1f7;hpb=f9e1ed5e957f44d6cc608156ed922d0c08da7d73

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 3f7a35d..96e0c13 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -12,17 +12,17 @@
     <header>
       {{- $sp := .Site.GetPage "section" .Section }}
       {{- $sh := cond (or (not $sp.Params.header) (not (fileExists (printf "static/%s" $sp.Params.header)))) (cond (or (not .Site.Home.Params.header) (not (fileExists (printf "static/%s" .Site.Home.Params.header)))) "/img/speedy.png" .Site.Home.Params.header) $sp.Params.header }}
-      {{- $sc := cond (or (not $sp.Params.caption)) (cond (not .Site.Home.Params.caption) .Site.Title .Site.Home.Params.caption) $sp.Params.caption }}
       {{- $ph := cond (or (not .Params.header) (not (fileExists (printf "static/%s" .Params.header)))) $sh .Params.header }}
       <img src="{{ $ph }}">
       <div>
-        {{ $caption := cond (not .Params.caption) $sc .Params.caption }}
-        {{- if (eq (printf "%T" $caption) "string") }}
-        {{- $caption -}}
+        {{- if not .Page.Params.heading }}
+        {{ .Page.Title }}
+        {{- else if eq (printf "%T" .Page.Params.heading) "string" }}
+        {{ .Page.Params.heading }}
         {{- else }}
-        {{- index $caption 0 }}
-        {{- if (gt (len $caption) 1) }}
-        {{- range after 1 $caption -}}
+        {{- index .Page.Params.heading 0 }}
+        {{- if (gt (len .Page.Params.heading) 1) }}
+        {{- range after 1 .Page.Params.heading -}}
         <br>
         {{ . }}
         {{- end -}}
@@ -35,15 +35,15 @@
         {{- $pg := . }}
         {{- range .Site.Menus.main }}
         <a href="{{ absURL .URL }}">
-          <summary>{{ .Name }}</summary>
+          <summary>{{ .Title }}</summary>
           <svg{{- if or ($pg.InSection .Page) (eq .Page $pg) }} class="selected"{{ end }}>
-            <use xlink:href="{{ relURL `/img/nav.svg` | safeHTML }}#{{ .Name }}"/>
+            <use xlink:href="{{ relURL `/img/nav.svg` | safeHTML }}#{{ .Title }}"/>
           </svg>
         </a>
         {{- end }}
       </div>
       <footer>
-        {{ cond (not .Page.Title) .Page.Name .Page.Title }}
+        {{ cond (not $sp.Params.menu.main.title) $sp.Title $sp.Params.menu.main.title }}
       </footer>
     </nav>
     <main>