ViMaSter/hackertours-theme
Watch
0
0
Fork
You've already forked hackertours-theme
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge partials for head and add logic so they can be added once in baseof instead of in each single and list template.

Browse source
This commit is contained in:
Fredrik Jonsson 2019-07-05 13:14:02 +02:00
commit 9eea6f46a9
13 changed files with 31 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

16
layouts/_default/baseof.html
View file

@ -4,11 +4,11 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<title>{{ block "title" . }}{{ .Title }} – {{ .Site.Title }}{{ end }}</title>
{{ block "meta" . }}{{ end }}
{{- partial "meta.html" . -}}
{{- partialCached "styles.html" . -}}
{{ block "header" . }}{{ end }}
{{ partial "scripts.html" . -}}
{{ partial "meta.html" . }}
{{ partialCached "styles.html" . }}
{{- block "head" . }}{{ end }}
{{ partial "meta_json_ld.html" . }}
{{ partial "scripts.html" . }}
{{ if and .Site.Params.piwikTrackerUrl .Site.Params.piwikSiteID }}{{ partialCached "matomo.html" . }}{{ end -}}
</head>
@ -20,8 +20,8 @@
<a href="{{ "/" | relLangURL }}" title="Home" class="header__site-link" rel="home"><span>{{ .Site.Title }}</span></a>
</h1>
<div class="region header__region">
{{ if .Site.IsMultiLingual }}{{ partial "language-selector.html" . }}{{ end }}
{{ if $.Param "search" }}{{ partialCached "search.html" . }}{{ end }}
{{ if .Site.IsMultiLingual }}{{ partial "language-selector.html" . }}{{ end -}}
{{ if $.Param "search" }}{{ partialCached "search.html" . }}{{ end -}}
</div>
</header>
@ -29,7 +29,7 @@
{{ block "main" . }}{{ end }}
{{ if $.Param "sidebar" | default true }}{{ partial "sidebar.html" . -}}{{ end }}
{{ if $.Param "sidebar" | default true }}{{ partial "sidebar.html" . }}{{ end -}}
<footer class="footer layout__footer">
{{ if $.Param "feedlinks" }}{{ partial "feedlinks.html" . }}{{ end -}}

9
layouts/_default/list.html
View file

@ -1,12 +1,3 @@
{{ define "meta" }}
{{- partial "section_meta.html" . -}}
{{- partial "opengraph_meta.html" . -}}
{{ end }}
{{ define "header" }}
{{- partial "section_json_ld.html" . -}}
{{ end }}
{{ define "main" -}}
<main class="main layout__main">
<h1 class="title">{{ .Title }}</h1>

9
layouts/_default/single.html
View file

@ -1,12 +1,3 @@
{{ define "meta" }}
{{- partial "single_meta.html" . -}}
{{- partial "opengraph_meta.html" . -}}
{{ end }}
{{ define "header" }}
{{- partial "single_json_ld.html" . -}}
{{ end }}
{{ define "main" -}}
<main class="main layout__main">
<article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">

10
layouts/index.html
View file

@ -1,15 +1,5 @@
{{ define "title" }}{{ .Site.Title }}{{ end }}
{{ define "meta" }}
{{- partial "section_meta.html" . -}}
{{- partial "single_meta.html" . -}}
{{- partial "opengraph_meta.html" . -}}
{{ end }}
{{ define "header" }}
{{- partial "section_json_ld.html" . -}}
{{ end }}
{{ define "main" -}}
<main class="main layout__main">
<article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">

9
layouts/micro/list.html
View file

@ -1,12 +1,3 @@
{{ define "meta" }}
{{- partial "section_meta.html" . -}}
{{- partial "opengraph_meta.html" . -}}
{{ end }}
{{ define "header" }}
{{- partial "section_json_ld.html" . -}}
{{ end }}
{{ define "main" -}}
<main class="main layout__main">
<h1 class="title">Micro posts</h1>

8
layouts/micro/single.html
View file

@ -1,11 +1,3 @@
{{ define "meta" }}
{{- partial "single_meta.html" . -}}
{{ end }}
{{ define "header" }}
{{- partial "single_json_ld.html" . -}}
{{ end }}
{{ define "main" -}}
<main class="main layout__main">
<article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">

11
layouts/partials/meta.html
View file

@ -1,3 +1,14 @@
{{ range .AlternativeOutputFormats -}}
<link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" title="{{ .Name }}" href="{{ .Permalink | safeURL }}">
{{ end -}}
<meta name="description" content="{{ if .IsPage }}{{ .Description | default (replaceRE "\n" " " .Summary) }}{{ else }}{{ $.Param "description" }}{{ end }}">
<meta name="created" content="{{ .Date.Format "2006-01-02T15:04:05-0700" }}">
<meta name="modified" content="{{ .Lastmod.Format "2006-01-02T15:04:05-0700" }}">
{{ with $.Param "author" }}<meta name="author" content="{{ . }}">{{ end }}
<meta property="og:site_name" content="{{ .Site.Title }}">
<meta property="og:title" content="{{ .Title }}">
<meta property="og:url" content="{{ .Permalink }}">
{{ with $.Param "image" }}<meta name="og:image" content="{{ . | absURL }}">{{ end }}
{{ hugo.Generator }}
{{ with $.Param "contact" }}<meta name="contact" content="{{ . }}">{{ end }}
<meta name="msapplication-TileColor" content="{{ $.Param "themecolor" | default "#ffffff" }}">

16
layouts/partials/section_json_ld.html → layouts/partials/meta_json_ld.html
View file

@ -1,12 +1,24 @@
<script type="application/ld+json">
{
"@context": "http://schema.org",
"@context": "https://schema.org",
{{ if .IsPage -}}
"@type": {{ if or (eq .Section "blog") (eq .Section "post") }}"BlogPosting"{{ else }}"WebPage"{{ end }},
"headline": {{ .Title }},
"datePublished": {{ .Date.Format "2006-01-02T15:04:05Z07:00" }},
"dateModified": {{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }},
"url" : {{ .Permalink }},
"description": {{ with (.Description | default (replaceRE "\n" " " .Summary)) }}{{ . }}{{ end }},
{{ with .Params.tags -}}
"keywords": {{ . }},
{{ end -}}
{{ else -}}
"@type": "WebPage",
"url" : {{ .Permalink }},
"name": {{ .Title }},
{{ with $.Param "description" -}}
"description": {{ . }},
{{ end -}}
{{ end -}}
{{ with $.Param "image" -}}
"image" : {{ . | absURL }},
{{ end -}}
@ -22,7 +34,7 @@
},
"publisher": {
"@type": "Organization",
"name": {{ .Site.Title }},
"name": {{ .Site.Title }},
{{ with $.Param "icon" -}}
"logo" : {
"@type": "ImageObject",

9
layouts/partials/opengraph_meta.html
View file

@ -1,9 +0,0 @@
{{ if .IsPage -}}
<meta name="description" content="{{ .Description | default (replaceRE "\n" " " .Summary) }}">
{{ else -}}
<meta name="description" content="{{ $.Param "description" }}">
{{ end -}}
<meta property="og:site_name" content="{{ .Site.Title }}">
<meta property="og:title" content="{{ .Title }}">
<meta property="og:url" content="{{ .Permalink }}">
{{ with $.Param "image" }}<meta name="og:image" content="{{ . | absURL }}">{{ end }}

3
layouts/partials/section_meta.html
View file

@ -1,3 +0,0 @@
{{ range .AlternativeOutputFormats -}}
<link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" title="{{ .Name }}" href="{{ .Permalink | safeURL }}">
{{ end -}}

3
layouts/partials/single_meta.html
View file

@ -1,3 +0,0 @@
<meta name="created" content="{{ .Date.Format "2006-01-02T15:04:05-0700" }}">
<meta name="modified" content="{{ .Lastmod.Format "2006-01-02T15:04:05-0700" }}">
{{ with $.Param "author" }}<meta name="author" content="{{ . }}">{{ end }}

9
layouts/podcast/single.html
View file

@ -1,12 +1,3 @@
{{ define "meta" }}
{{- partial "single_meta.html" . -}}
{{- partial "opengraph_meta.html" . -}}
{{ end }}
{{ define "header" }}
{{- partial "single_json_ld.html" . -}}
{{ end }}
{{ define "main" -}}
<main class="main layout__main">
<article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">