Simplify template logic

Some of the logic in the templates can be simplified by replacing `if` actions with `with` actions and Hugo functions. This reduces code repetition.
author: Alexander Zhang <zhangalexy@gmail.com> 2022-06-18 01:39:18 +0300
committer: Alexander Zhang <zhangalexy@gmail.com> 2022-06-18 01:39:18 +0300
commit: 37a749ce7981b2ae45ec2e164349a5ebcf41ea8d (patch)
tree: 3ab4813af2d63ecd36d47b611206559e7c70f81c
parent: 6e5f538484b2be9c6034381ddbe58ef4c5305a43 (diff)
5 files changed, 21 insertions, 52 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 90b2e77..1b38f2e 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -4,7 +4,7 @@
 <head>
   <meta charset="utf-8">
   <meta http-equiv="x-ua-compatible" content="ie=edge">
-  <title>{{ block "title" . }}{{ if .Params.meta_title }}{{ .Params.meta_title }}{{ else }}{{ .Title }} - {{ .Site.Title }}{{ end }}{{ end }}</title>
+  <title>{{ block "title" . }}{{ .Params.meta_title | default (printf "%s - %s" .Title .Site.Title) }}{{ end }}</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/png" href="{{ "favicon-32x32.svg" | relURL }}">
 
@@ -22,15 +22,15 @@
   {{ block "header_css" . }}{{ end }}
 
   {{ block "meta_tags" . }}
-    {{ if .Params.description }}<meta name="description" content="{{ .Params.description }}"/>{{ end }}
-    {{ if .Params.meta_title }}<meta property="og:title" content="{{ .Params.meta_title }}"/>{{ else }}<meta property="og:title" content="{{ .Title }}"/>{{ end }}
+    {{ with .Params.description }}<meta name="description" content="{{ . }}"/>{{ end }}
+    <meta property="og:title" content="{{ .Params.meta_title | default .Title }}"/>
     <meta property="og:type" content="website"/>
     <meta property="og:url" content="{{ .Permalink }}"/>
-    {{ if .Params.image }}<meta property="og:image" content="{{ .Params.image | absURL }}"/>{{ else if .Site.Params.seo.meta_og_image }}<meta property="og:image" content="{{ .Site.Params.seo.meta_og_image | absURL }}"/>{{ end }}
-    {{ if .Params.description }}<meta property="og:description" content="{{ .Params.description }}"/>{{ end }}
+    {{ with .Params.image | default .Site.Params.seo.meta_og_image }}<meta property="og:image" content="{{ . | absURL }}"/>{{ end }}
+    {{ with .Params.description }}<meta property="og:description" content="{{ . }}"/>{{ end }}
     <meta name="twitter:card" content="summary"/>
-    {{ if .Site.Params.seo.meta_twitter_site }}<meta name="twitter:site" content="{{ .Site.Params.seo.meta_twitter_site }}"/>{{ end }}
-    {{ if .Site.Params.seo.meta_twitter_creator }}<meta name="twitter:creator" content="{{ .Site.Params.seo.meta_twitter_creator }}"/>{{ end }}
+    {{ with .Site.Params.seo.meta_twitter_site }}<meta name="twitter:site" content="{{ . }}"/>{{ end }}
+    {{ with .Site.Params.seo.meta_twitter_creator }}<meta name="twitter:creator" content="{{ . }}"/>{{ end }}
   {{ end }}
 
 </head>
diff --git a/layouts/partials/google-analytics.html b/layouts/partials/google-analytics.html
index 296d4af..cf29915 100644
--- a/layouts/partials/google-analytics.html
+++ b/layouts/partials/google-analytics.html
@@ -1,10 +1,7 @@
-{{- if .Site.IsServer -}}
-<!-- Dont add Google analytics to localhost -->
-{{ else }}
-{{ $gid := (getenv "HUGO_GOOGLE_ANALYTICS_ID") }}
-{{ if $gid }}
+{{- if not .Site.IsServer -}}
+{{ with getenv "HUGO_GOOGLE_ANALYTICS_ID" | default .Site.Params.google_analytics_id }}
 <!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id={{- $gid -}}"></script>
+<script async src="https://www.googletagmanager.com/gtag/js?id={{- . -}}"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
 
@@ -12,21 +9,7 @@
     dataLayer.push(arguments);
   }
   gtag('js', new Date());
-  gtag('config', '{{- $gid -}}');
-</script>
-{{ else }}
-{{ if .Site.Params.google_analytics_id }}
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id={{- .Site.Params.google_analytics_id -}}"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-
-  function gtag() {
-    dataLayer.push(arguments);
-  }
-  gtag('js', new Date());
-  gtag('config', '{{- .Site.Params.google_analytics_id -}}');
+  gtag('config', '{{ . }}');
 </script>
 {{ end }}
-{{ end}}
-{{ end }}
-\ No newline at end of file
+{{ end }}
diff --git a/layouts/partials/google-tag-manager-noscript.html b/layouts/partials/google-tag-manager-noscript.html
index 0292e6e..cf75eb9 100644
--- a/layouts/partials/google-tag-manager-noscript.html
+++ b/layouts/partials/google-tag-manager-noscript.html
@@ -1,12 +1,5 @@
-{{- if .Site.IsServer -}}
-<!-- Dont add Google Tag Manager to localhost -->
-{{ else }}
-{{ $gid := (getenv "HUGO_GTM_ID") }}
-{{ if $gid }}
-<!-- Google Tag Manager (noscript) --> <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{- $gid -}}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <!-- End Google Tag Manager (noscript) -->
-{{ else }}
-{{ if .Site.Params.google_tag_manager_id }}
-<!-- Google Tag Manager (noscript) --> <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{- .Site.Params.google_tag_manager_id -}}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <!-- End Google Tag Manager (noscript) -->
-{{ end }}
+{{- if not .Site.IsServer -}}
+{{ with getenv "HUGO_GTM_ID" | default .Site.Params.google_tag_manager_id }}
+<!-- Google Tag Manager (noscript) --> <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ . }}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <!-- End Google Tag Manager (noscript) -->
 {{ end }}
 {{ end }}
diff --git a/layouts/partials/google-tag-manager.html b/layouts/partials/google-tag-manager.html
index 950eac8..a72c490 100644
--- a/layouts/partials/google-tag-manager.html
+++ b/layouts/partials/google-tag-manager.html
@@ -1,12 +1,5 @@
-{{- if .Site.IsServer -}}
-<!-- Dont add Google Tag Manager to localhost -->
-{{ else }}
-{{ $gid := (getenv "HUGO_GTM_ID") }}
-{{ if $gid }}
-<!-- Google Tag Manager --> <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','{{- $gid -}}');</script> <!-- End Google Tag Manager -->
-{{ else }}
-{{ if .Site.Params.google_tag_manager_id }}
-<!-- Google Tag Manager --> <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','{{- .Site.Params.google_tag_manager_id -}}');</script> <!-- End Google Tag Manager -->
-{{ end }}
+{{- if not .Site.IsServer -}}
+{{ with getenv "HUGO_GTM_ID" | default .Site.Params.google_tag_manager_id }}
+<!-- Google Tag Manager --> <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','{{ . }}');</script> <!-- End Google Tag Manager -->
 {{ end }}
 {{ end }}
diff --git a/layouts/partials/sub-footer.html b/layouts/partials/sub-footer.html
index 297b782..3e56837 100644
--- a/layouts/partials/sub-footer.html
+++ b/layouts/partials/sub-footer.html
@@ -6,11 +6,11 @@
           {{ if .Site.Data.social }}
             {{ partial "social.html" . }}
           {{ end }}
-          {{ if .Site.Params.footer.copyright_text }}
-            <div class="copyright">{{ .Site.Params.footer.copyright_text | safeHTML }}</div>
+          {{ with .Site.Params.footer.copyright_text }}
+            <div class="copyright">{{ . | safeHTML }}</div>
           {{ end }}
         </div>
       </div>
     </div>
   </div>
-</div>
-\ No newline at end of file
+</div>
author	Alexander Zhang <zhangalexy@gmail.com>	2022-06-18 01:39:18 +0300
committer	Alexander Zhang <zhangalexy@gmail.com>	2022-06-18 01:39:18 +0300
commit	37a749ce7981b2ae45ec2e164349a5ebcf41ea8d (patch)
tree	3ab4813af2d63ecd36d47b611206559e7c70f81c
parent	6e5f538484b2be9c6034381ddbe58ef4c5305a43 (diff)