aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortdro <tdro@noreply.example.com>2022-07-22 00:36:28 -0400
committertdro <tdro@noreply.example.com>2022-07-22 00:36:28 -0400
commited919681f324ed070445cfae8f1dd662b09f81b8 (patch)
tree7f0af59b4021907b24f77e9966e7a7145dc227a6
parent19a6a9bef26c6c41f3f9b6f3ceda375a8a045a30 (diff)
downloadcanory-ed919681f324ed070445cfae8f1dd662b09f81b8.tar.gz
canory-ed919681f324ed070445cfae8f1dd662b09f81b8.tar.bz2
canory-ed919681f324ed070445cfae8f1dd662b09f81b8.zip
themes/default/layouts: Name spacing and template clean up
Diffstat
-rw-r--r--themes/default/layouts/_default/baseof.html8
-rw-r--r--themes/default/layouts/_default/home.archive-messages.html4
-rw-r--r--themes/default/layouts/_default/home.archive-tags.html4
-rw-r--r--themes/default/layouts/_default/rss.xml6
-rw-r--r--themes/default/layouts/_default/summary.html4
-rw-r--r--themes/default/layouts/_default/taxonomy.html4
-rw-r--r--themes/default/layouts/partials/archive-link.html2
-rw-r--r--themes/default/layouts/partials/base-csp.html (renamed from themes/default/layouts/partials/head-csp.html)0
-rw-r--r--themes/default/layouts/partials/base-description.html (renamed from themes/default/layouts/partials/site-description.html)2
-rw-r--r--themes/default/layouts/partials/base-footer.html (renamed from themes/default/layouts/partials/footer.html)0
-rw-r--r--themes/default/layouts/partials/base-head.html (renamed from themes/default/layouts/partials/head.html)18
-rw-r--r--themes/default/layouts/partials/base-manifest.html (renamed from themes/default/layouts/partials/head-manifest.html)0
-rw-r--r--themes/default/layouts/partials/base-search.html (renamed from themes/default/layouts/partials/head-search.html)0
-rw-r--r--themes/default/layouts/partials/base-title.html (renamed from themes/default/layouts/partials/site-title.html)0
-rw-r--r--themes/default/layouts/partials/meta-tags.html (renamed from themes/default/layouts/partials/tags.html)0
-rw-r--r--themes/default/layouts/partials/meta-title.html (renamed from themes/default/layouts/partials/title.html)0
16 files changed, 25 insertions, 27 deletions
diff --git a/themes/default/layouts/_default/baseof.html b/themes/default/layouts/_default/baseof.html
index 3ee2e03..b85497e 100644
--- a/themes/default/layouts/_default/baseof.html
+++ b/themes/default/layouts/_default/baseof.html
@@ -3,10 +3,10 @@
<head>
<title>
{{- block "title" . -}}{{- end -}}
- {{- partial "site-title.html" . -}}
+ {{- partial "base-title.html" . -}}
</title>
- <meta name="description" content="{{- partial "site-description.html" . -}}">
- {{- partial "head.html" . -}}
+ <meta name="description" content="{{- partial "base-description.html" . -}}">
+ {{- partial "base-head.html" . -}}
{{- block "styles" . -}}{{- end -}}
</head>
<body>
@@ -21,7 +21,7 @@
<column-middle>
<main id="main">
{{- block "middle" . -}}{{- end -}}
- {{- partial "footer.html" . -}}
+ {{- partial "base-footer.html" . -}}
</main>
</column-middle>
diff --git a/themes/default/layouts/_default/home.archive-messages.html b/themes/default/layouts/_default/home.archive-messages.html
index d97694f..3ca1673 100644
--- a/themes/default/layouts/_default/home.archive-messages.html
+++ b/themes/default/layouts/_default/home.archive-messages.html
@@ -30,9 +30,9 @@
<ul>
{{ range .Pages }}
<li>
- <a title="{{ partial "title.html" . }}" href="{{ .RelPermalink }}#{{ partial "card-id.html" . }}">
+ <a title="{{ partial "meta-title.html" . }}" href="{{ .RelPermalink }}#{{ partial "card-id.html" . }}">
<span><code>{{ .Date.Format "02 Jan" }}</code></span>
- <span>{{ partial "title.html" . }}</span>
+ <span>{{ partial "meta-title.html" . }}</span>
<span>@{{ partial "author-user.html" . }}</span>
</a>
</li>
diff --git a/themes/default/layouts/_default/home.archive-tags.html b/themes/default/layouts/_default/home.archive-tags.html
index 7fec925..9e915ba 100644
--- a/themes/default/layouts/_default/home.archive-tags.html
+++ b/themes/default/layouts/_default/home.archive-tags.html
@@ -32,10 +32,10 @@
{{- $count = add $count 1 -}}
<li>
<a
- title="{{ partial "title.html" . }}"
+ title="{{ partial "meta-title.html" . }}"
href="{{ .Site.BaseURL }}/tags/{{ $tag }}/{{ if gt $page 1 }}page/{{ $page }}/{{ end }}#{{ partial "card-id.html" . }}">
<span><code>{{ .Date.Format "02 Jan 2006" }}</code></span>
- <span>{{ partial "title.html" . }}</span>
+ <span>{{ partial "meta-title.html" . }}</span>
<span>@{{ partial "author-user.html" . }}</span>
</a>
</li>
diff --git a/themes/default/layouts/_default/rss.xml b/themes/default/layouts/_default/rss.xml
index 17334bf..1628b56 100644
--- a/themes/default/layouts/_default/rss.xml
+++ b/themes/default/layouts/_default/rss.xml
@@ -10,13 +10,13 @@
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
<channel>
- <title>{{ partial "site-title" . }}</title>
+ <title>{{ partial "base-title" . }}</title>
<link>{{ .Permalink }}</link>
- <description>Recent from {{ partial "site-title" . }}</description>
+ <description>Recent from {{ partial "base-title" . }}</description>
<language>{{ .Site.LanguageCode }}</language>
<category>{{ partial "author-user" . }}</category>
<image>
- <title>{{ partial "site-title" . }}</title>
+ <title>{{ partial "base-title" . }}</title>
<url>{{ .Site.BaseURL }}/{{ partial "author-media-path.html" . }}/profile/picture.png</url>
<link>{{ .Permalink }}</link>
</image>
diff --git a/themes/default/layouts/_default/summary.html b/themes/default/layouts/_default/summary.html
index 542da20..86fb8d5 100644
--- a/themes/default/layouts/_default/summary.html
+++ b/themes/default/layouts/_default/summary.html
@@ -1,6 +1,6 @@
<micro-card {{ if .Weight }}pinned{{ end }} id="{{ partial "card-id.html" . }}">
{{ if .ExpiryDate }}<micro-expires>{{ end }}
- <micro-summary {{ if .Draft }}draft{{ end }} title="{{- partial "title.html" . -}}">
+ <micro-summary {{ if .Draft }}draft{{ end }} title="{{- partial "meta-title.html" . -}}">
<micro-thumbnail>
{{ partial "profile-picture.html" . }}
</micro-thumbnail>
@@ -11,7 +11,7 @@
{{ if .Params.unsafe }}{{ partial "card-unsafe.html" "begin" }}{{ end }}
{{- partial "function-content.html" .Content | safeHTML -}}
{{ if .Params.unsafe }}{{ partial "card-unsafe.html" "end" }}{{ end }}
- <micro-tags>{{ partial "tags.html" . }}</micro-tags>
+ <micro-tags>{{ partial "meta-tags.html" . }}</micro-tags>
</micro-content>
</micro-summary>
{{ if .ExpiryDate }}</micro-expires>{{ end }}
diff --git a/themes/default/layouts/_default/taxonomy.html b/themes/default/layouts/_default/taxonomy.html
index 97b9bd1..47a771a 100644
--- a/themes/default/layouts/_default/taxonomy.html
+++ b/themes/default/layouts/_default/taxonomy.html
@@ -34,10 +34,10 @@
{{- $count = add $count 1 -}}
<li>
<a
- title="{{ partial "title.html" . }}"
+ title="{{ partial "meta-title.html" . }}"
href="{{ .Site.BaseURL }}/tags/{{ $title }}/{{ if gt $page 1 }}page/{{ $page }}/{{ end }}#{{ partial "card-id.html" . }}">
<span><code>{{ .Date.Format "02 Jan 2006" }}</code></span>
- <span>{{ partial "title.html" . }}</span>
+ <span>{{ partial "meta-title.html" . }}</span>
<span>@{{ partial "author-user.html" . }}</span>
</a>
</li>
diff --git a/themes/default/layouts/partials/archive-link.html b/themes/default/layouts/partials/archive-link.html
deleted file mode 100644
index 8b08ba3..0000000
--- a/themes/default/layouts/partials/archive-link.html
+++ /dev/null
@@ -1,2 +0,0 @@
-/archives/{{ .Type }}/
-{{- /* Strip newline. */ -}}
diff --git a/themes/default/layouts/partials/head-csp.html b/themes/default/layouts/partials/base-csp.html
index 9519e14..9519e14 100644
--- a/themes/default/layouts/partials/head-csp.html
+++ b/themes/default/layouts/partials/base-csp.html
diff --git a/themes/default/layouts/partials/site-description.html b/themes/default/layouts/partials/base-description.html
index 8d021de..94b10c2 100644
--- a/themes/default/layouts/partials/site-description.html
+++ b/themes/default/layouts/partials/base-description.html
@@ -4,5 +4,5 @@
{{ .Summary }}
{{- else -}}
{{- block "description" . -}}{{- end -}}
- {{- partial "site-title.html" . -}}
+ {{- partial "base-title.html" . -}}
{{- end -}}
diff --git a/themes/default/layouts/partials/footer.html b/themes/default/layouts/partials/base-footer.html
index 6cac939..6cac939 100644
--- a/themes/default/layouts/partials/footer.html
+++ b/themes/default/layouts/partials/base-footer.html
diff --git a/themes/default/layouts/partials/head.html b/themes/default/layouts/partials/base-head.html
index 509b177..f24e7d4 100644
--- a/themes/default/layouts/partials/head.html
+++ b/themes/default/layouts/partials/base-head.html
@@ -14,20 +14,20 @@
<meta name="robots" content="index,follow">
{{- end }}
<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="keywords" content="{{- partial "site-title.html" . -}}">
+<meta name="keywords" content="{{- partial "base-title.html" . -}}">
{{ hugo.Generator }}
{{ with .Site.Params.site.refresh -}}
<meta http-equiv="refresh" content="{{ . }}">
{{- end }}
<!-- Search Engine Tags -->
-<meta itemprop="name" content="{{ partial "site-title.html" . -}}">
+<meta itemprop="name" content="{{ partial "base-title.html" . -}}">
<meta itemprop="description" content="{{ if .Params.summary }}{{ .Params.summary }}{{ else }}{{ .Summary }}{{ end }}">
<meta itemprop="image" content="{{ .Site.BaseURL }}/{{ partial "author-user.html" (dict "Data" $data) -}}/media/profile/picture.png">
<!-- Open Graph Meta Tags -->
-<meta property="og:title" content="{{ partial "site-title.html" . -}}">
-<meta property="og:description" content="{{- partial "site-description.html" . -}}">
+<meta property="og:title" content="{{ partial "base-title.html" . -}}">
+<meta property="og:description" content="{{- partial "base-description.html" . -}}">
<meta property="og:url" content="{{ .Permalink }}">
<meta property="og:image" content="{{ .Site.BaseURL }}/{{ partial "author-user.html" (dict "Data" $data) -}}/media/profile/picture.png">
<meta property="og:type" content="website">
@@ -36,12 +36,12 @@
<!-- Twitter Meta Tags -->
<meta name="twitter:card" content="summary_large_image">
-<meta name="twitter:title" content="{{ partial "site-title.html" . -}}">
-<meta name="twitter:description" content="{{- partial "site-description.html" . -}}">
+<meta name="twitter:title" content="{{ partial "base-title.html" . -}}">
+<meta name="twitter:description" content="{{- partial "base-description.html" . -}}">
<meta name="twitter:image" content="{{ .Site.BaseURL }}/{{ partial "author-user.html" (dict "Data" $data) -}}/media/profile/picture.png">
<!-- Search Verification -->
-{{- partial "head-search.html" . -}}
+{{- partial "base-search.html" . -}}
<!-- Link Tags -->
<link rel="home" href="{{ .Site.BaseURL }}/{{ partial "author-user.html" (dict "Data" $data) }}">
@@ -64,10 +64,10 @@
{{ end }}
<!-- Progressive Enhancement -->
-{{- partial "head-manifest.html" . -}}
+{{- partial "base-manifest.html" . -}}
<!-- Content Security Policy -->
-{{- partial "head-csp.html" . -}}
+{{- partial "base-csp.html" . -}}
<!-- No Scripts -->
<noscript>
diff --git a/themes/default/layouts/partials/head-manifest.html b/themes/default/layouts/partials/base-manifest.html
index 6c154ed..6c154ed 100644
--- a/themes/default/layouts/partials/head-manifest.html
+++ b/themes/default/layouts/partials/base-manifest.html
diff --git a/themes/default/layouts/partials/head-search.html b/themes/default/layouts/partials/base-search.html
index 1bfed6c..1bfed6c 100644
--- a/themes/default/layouts/partials/head-search.html
+++ b/themes/default/layouts/partials/base-search.html
diff --git a/themes/default/layouts/partials/site-title.html b/themes/default/layouts/partials/base-title.html
index afa17fa..afa17fa 100644
--- a/themes/default/layouts/partials/site-title.html
+++ b/themes/default/layouts/partials/base-title.html
diff --git a/themes/default/layouts/partials/tags.html b/themes/default/layouts/partials/meta-tags.html
index d601b27..d601b27 100644
--- a/themes/default/layouts/partials/tags.html
+++ b/themes/default/layouts/partials/meta-tags.html
diff --git a/themes/default/layouts/partials/title.html b/themes/default/layouts/partials/meta-title.html
index 988167f..988167f 100644
--- a/themes/default/layouts/partials/title.html
+++ b/themes/default/layouts/partials/meta-title.html
generated by cgit v1.2.3 (git 2.39.0) at 2024-05-12 11:51:44 +0000