Move site header and footer to the base template, and override the body block in index
This commit is contained in:
		
							parent
							
								
									19d8209cb2
								
							
						
					
					
						commit
						8fadc54a43
					
				
					 3 changed files with 17 additions and 21 deletions
				
			
		| 
						 | 
				
			
			@ -4,13 +4,15 @@
 | 
			
		|||
 | 
			
		||||
  <body>
 | 
			
		||||
    {{ block "body" . -}}
 | 
			
		||||
    {{ block "header" . }}{{ end }}
 | 
			
		||||
    {{ block "header" . }}{{ partial "header.html" .}}{{ end }}
 | 
			
		||||
    <main class="{{ .Type }} {{ .Kind }}{{ if gt (len .Pages) 0 }} list{{ end }}">
 | 
			
		||||
      {{ block "main" . }}{{ end }}
 | 
			
		||||
    </main>
 | 
			
		||||
    {{- partial "development/page_info.html" . -}}
 | 
			
		||||
    {{- block "footer" . -}}{{- end -}}
 | 
			
		||||
    {{- block "footer" . -}}
 | 
			
		||||
      {{ partial "footer.html" . }}
 | 
			
		||||
    {{- end -}}
 | 
			
		||||
    {{- end -}}
 | 
			
		||||
    {{- partial "development/page_info.html" . -}}
 | 
			
		||||
  </body>
 | 
			
		||||
 | 
			
		||||
  {{ with partial "resources/root_css.html" . -}}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,3 @@
 | 
			
		|||
{{ define "header" }}
 | 
			
		||||
  {{ partial "header.html" . }}
 | 
			
		||||
{{ end }}
 | 
			
		||||
 | 
			
		||||
{{ define "main" }}
 | 
			
		||||
  {{ partial "single_main.html" . }}
 | 
			
		||||
{{ end }}
 | 
			
		||||
| 
						 | 
				
			
			@ -27,7 +23,3 @@
 | 
			
		|||
  <script defer {{ if $isModule }}type="module"{{ end }} src="{{ $script.Permalink | relURL }}"></script>
 | 
			
		||||
  {{- end -}}
 | 
			
		||||
{{ end }}
 | 
			
		||||
 | 
			
		||||
{{ define "footer" }}
 | 
			
		||||
  {{ partial "footer.html" . }}
 | 
			
		||||
{{ end }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,16 +1,18 @@
 | 
			
		|||
{{ define "main" }}
 | 
			
		||||
<div class="platter grid">
 | 
			
		||||
  <h1 class="site">{{ .Title }}</h1>
 | 
			
		||||
  <div id="content">
 | 
			
		||||
    {{ .Content }}
 | 
			
		||||
  </div>
 | 
			
		||||
  {{- with site.Menus.main -}}
 | 
			
		||||
{{ define "body" }}
 | 
			
		||||
<main>
 | 
			
		||||
  <div class="platter grid">
 | 
			
		||||
    <h1 class="site">{{ .Title }}</h1>
 | 
			
		||||
    <div id="content">
 | 
			
		||||
      {{ .Content }}
 | 
			
		||||
    </div>
 | 
			
		||||
    {{- with site.Menus.main -}}
 | 
			
		||||
    {{- $url := $.RelPermalink -}}
 | 
			
		||||
    <nav class="site bulleted">
 | 
			
		||||
      {{- range . -}}
 | 
			
		||||
        <li><a class="{{ if eq .URL $url }}active{{ end }}" href="{{ .URL }}"><span>{{ i18n .Identifier | default .Name }}</span></a></li>
 | 
			
		||||
      <li><a class="{{ if eq .URL $url }}active{{ end }}" href="{{ .URL }}"><span>{{ i18n .Identifier | default .Name }}</span></a></li>
 | 
			
		||||
      {{- end -}}
 | 
			
		||||
    </nav>
 | 
			
		||||
  {{ end }}
 | 
			
		||||
</div>
 | 
			
		||||
    {{ end }}
 | 
			
		||||
  </div>
 | 
			
		||||
</main>
 | 
			
		||||
{{ end }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue