config + html base changes

jerdog · jerdog · commit 4edd2afe6b15 · 2024-09-30T17:41:07.000-05:00
- move favicon and description to parameters in config
- simplify generation of page title and opengraph titles based on page
diff --git a/config.toml b/config.toml
@@ -2,6 +2,10 @@ baseURL = "https://ethicalsource.dev"
 languageCode = "en-us"
 title = "Organization for Ethical Source"
 
+[params]
+description = "The Organization for Ethical Source is a global, multidisciplinary community devoted to centering justice, equity, and human rights in the practice of open source."
+favicon = "/images/favicon.ico"
+
 DefaultContentLanguage = "en"
 hasCJKLanguage = true
 EnableMissingTranslationPlaceholders = true
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -9,25 +9,31 @@
 <!doctype html>
 <html lang="{{ .Site.LanguageCode }}">
   <head>
-    <meta charset="utf-8">
-    <title>{{ .Site.Title }} | {{ .Title }}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>
+      {{/* If not home page, add use site title + page title */}}
+      {{ if ne page.IsHome true }}
+        {{ .Site.Title }} | {{ .Page.Title }}{{ else }}
+        {{ .Page.Title }}
+      {{ end }}
+    </title>
 
-    {{ if .Params.title }}
-      <meta property="og:title" content="{{ .Params.Title }}">
-    {{ else }}
-      <meta property="og:title" content="{{ .Site.Title }}">
-    {{ end }}
+    {{/* setup base meta tags */}}
+    <meta charset="utf-8" />
+    <meta name="description" content="{{ if .Params.Summary }}{{ .Params.Summary }}{{ else }}{{ .Site.Params.Description }}{{ end }}">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    {{/* setup opengraph meta tags - https://ogp.me/ */}} 
+    <meta property="og:type" content="website">
+    <meta property="og:site_name" content="Organization for Ethical Source">
+    <meta property="og:locale" content="en_US">
     <meta property="og:image" content="https://ethicalsource.dev/images/oes-logo-color.jpg">
+    <meta property-="og:title" content="{{ if ne page.IsHome true }}{{ .Site.Title }} | {{ .Page.Title }}{{ else }}{{ .Page.Title }}{{ end }}">
     <meta property="og:url" content="{{ .Permalink }}">
-    {{ if .Params.Summary }}
-      <meta property="og:description" content="{{ .Params.Summary }}">
-    {{ else }}
-      <meta property="og:description" content="The Organization for Ethical Source is a global, multidisciplinary community devoted to centering justice, equity, and human rights in the practice of open source.">
-    {{ end }}
+    <meta property="og:description" content="{{ if .Params.Summary }}{{ .Params.Summary }}{{ else }}{{ .Site.Params.Description }}{{ end }}">
 
+    {{/* setup link tags for stylesheets and icons */}}
     <link rel="stylesheet" href="{{ $css.RelPermalink }}" integrity="{{ $css.Data.Integrity }}">
-    <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
+    <link rel="shortcut icon" type="image/x-icon" href="{{ .Site.Params.favicon }}" />
+    <link rel="icon" hreg="{{ .Site.Params.favicon }}">
  </head>
 
   <body{{ with .Section }} id="{{ . }}"{{ end }}>
