Update Hugo

* Update Hugo
* Move more templates and partials into the project
* Keep the existing theme version with modifications
* Update instructions for AGENTS

Author: w0rp

AGENTS.md

@@ -12,13 +12,14 @@ Set up the project with the templates for development site like so:
 
 ```sh
 git submodule update --init
+go install github.com/gohugoio/hugo@latest
 ```
 
 You can run Hugo to build the HTML and other content for the site to test
 changes like so:
 
 ```
-docker compose run --remove-orphans site hugo
+hugo
 ```
 
 With Docker compose running validate pages rendered with the HTML validator for

compose.yml

@@ -3,7 +3,7 @@
 services:
   site:
     container_name: '${COMPOSE_PROJECT_NAME}-site'
-    image: hugomods/hugo:reg-0.126.0
+    image: hugomods/hugo:reg-0.147.9
     ports:
       - "1313:1313"
     volumes:

config.toml

@@ -11,7 +11,7 @@ pygmentsCodefencesGuessSyntax = true
 #disqusShortname = "XXX"
 #googleAnalytics = "XXX"
 
-[Params]
+[params]
   homeTitle = "Dense Analysis"
   subtitle = "\"Dense Analysis trumps speculation\""
   mainSections = ["post","posts"]
@@ -42,12 +42,10 @@ pygmentsCodefencesGuessSyntax = true
 #  src = "img/hexagon.jpg"
 #  desc = "Hexagon"
 
-[Author]
-  # There are many built in options.
-  # See: themes/beautifulhugo/data/beautifulhugo/social.toml
-
+[params.author]
   # Set only your "username" for default hosts and full URLs otherwise (e.g., "https://MyGitLab.org/username")
-  website = "yourwebsite.com"
+  name = "Andrew Wray"
+  website = "denseanalysis.org"
   email = "[email protected]"
   github = "dense-analysis"
   youtube = "@DenseAnalysis"

layouts/_default/single.html

@@ -42,7 +42,7 @@ <h4 class="see-also">{{ i18n "seeAlso" }}</h4>
 
 
       {{ if (.Params.comments) | or (and (or (not (isset .Params "comments")) (eq .Params.comments nil)) (and .Site.Params.comments (ne .Type "page"))) }}
-        {{ if .Site.DisqusShortname }}
+        {{ if isset .Site.Params "disqusShortname" }}
           {{ if .Site.Params.delayDisqus }}
           <div class="disqus-comments">
             <button id="show-comments" class="btn btn-default" type="button">{{ i18n "show" }} <span class="disqus-comment-count" data-disqus-url="{{ trim .Permalink "/" }}">{{ i18n "comments" }}</span></button>
@@ -57,7 +57,7 @@ <h4 class="see-also">{{ i18n "seeAlso" }}</h4>
           </div>
           {{ else }}
           <div class="disqus-comments">
-            {{ template "_internal/disqus.html" . }}
+            {{ partial "disqus.html" . }}
           </div>
           {{ end }}
         {{ end }}

layouts/partials/disqus.html

@@ -0,0 +1,7 @@
+{{ if (.Params.comments) | or (and (or (not (isset .Params "comments")) (eq .Params.comments nil)) (.Site.Params.comments)) }}
+  {{ if isset .Site.Params "disqusShortname" }}
+    <div class="comments">
+      {{ partial "disqus.html" . }}
+    </div>
+  {{ end }}
+{{ end }}

layouts/partials/footer.html

@@ -7,12 +7,12 @@
       <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
         <ul class="list-inline text-center footer-links">
           {{ range .Site.Data.beautifulhugo.social.social_icons }}
-            {{- if isset $.Site.Author .id }}
+            {{- if isset $.Site.Params.author .id }}
               <li>
-		{{ if or ( hasPrefix ( index $.Site.Author .id ) "http://" ) ( hasPrefix ( index $.Site.Author .id ) "https://" ) }}
-		  <a {{ if .rel }}rel="{{ .rel }}"{{- end -}} href="{{ printf "%s" (index $.Site.Author .id) }}" title="{{ .title }}">
+		{{ if or ( hasPrefix ( index $.Site.Params.author .id ) "http://" ) ( hasPrefix ( index $.Site.Params.author .id ) "https://" ) }}
+		  <a {{ if .rel }}rel="{{ .rel }}"{{- end -}} href="{{ printf "%s" (index $.Site.Params.author .id) }}" title="{{ .title }}">
 		{{ else }}
-		  <a {{ if .rel }}rel="{{ .rel }}"{{- end -}} href="{{ printf .url (index $.Site.Author .id) }}" title="{{ .title }}">
+		  <a {{ if .rel }}rel="{{ .rel }}"{{- end -}} href="{{ printf .url (index $.Site.Params.author .id) }}" title="{{ .title }}">
 		{{ end }}
                   <span class="fa-stack fa-lg">
                     <i class="fas fa-circle fa-stack-2x"></i>
@@ -115,12 +115,12 @@
 <!-- End Piwik Code -->
 {{ end }}
 
-{{ if and .Site.Params.delayDisqus .Site.DisqusShortname }}
+{{ if isset .Site.Params "disqusShortname" }}{{ if .Site.Params.delayDisqus }}
 <!-- Delayed Disqus -->
 <script type="text/javascript">
 $(function(){
   $('#show-comments').on('click', function(){
-    var disqus_shortname = '{{ .Site.DisqusShortname }}';
+    var disqus_shortname = '{{ .Site.Params.DisqusShortname }}';
 
     (function() {
       var disqus = document.createElement('script');
@@ -135,8 +135,8 @@
   });
 
 </script>
-<script id="dsq-count-scr" src="//{{ .Site.DisqusShortname }}.disqus.com/count.js" async></script>
+<script id="dsq-count-scr" src="//{{ .Site.Params.DisqusShortname }}.disqus.com/count.js" async></script>
 <!-- End Delayed Disqus -->
-{{ end }}
+{{ end }}{{ end }}
 
 {{- partial "footer_custom.html" . }}

layouts/partials/head.html

@@ -42,7 +42,7 @@
 {{- with ($.Scratch.Get "Description") }}
   <meta name="description" content="{{ . }}">
 {{- end }}
-{{- with .Site.Author.name }}
+{{- with .Site.Params.author.name }}
   <meta name="author" content="{{ . }}"/>
 {{- end }}
 {{- partial "seo/main.html" . }}
@@ -97,6 +97,6 @@
   {{- end -}}
 
 {{- partial "head_custom.html" . }}
-{{- if not .Site.IsServer -}}
+{{- if not hugo.IsServer -}}
   {{ template "_internal/google_analytics.html" . }}
 {{- end -}}

layouts/partials/nav.html

@@ -29,29 +29,6 @@
           {{ end }}
         {{ end }}
 
-        {{ if .Site.IsMultiLingual }}
-          {{ if ge (len .Site.Languages) 3 }}
-            <li class="navlinks-container">
-              <a class="navlinks-parent">{{ i18n "languageSwitcherLabel" }}</a>
-              <div class="navlinks-children">
-                {{ range .Site.Languages }}
-                  {{ if not (eq .Lang $.Site.Language.Lang) }}
-                  <a href="/{{ .Lang }}" lang="{{ .Lang }}">{{ default .Lang .LanguageName }}</a>
-                  {{ end }}
-                {{ end }}
-              </div>
-            </li>
-          {{ else }}
-            <li>
-              {{ range .Site.Languages }}
-                {{ if not (eq .Lang $.Site.Language.Lang) }}
-                  <a href="/{{ .Lang }}" lang="{{ .Lang }}">{{ default .Lang .LanguageName }}</a>
-                {{ end }}
-              {{ end }}
-            </li>
-          {{ end }}
-        {{ end }}
-
         {{ if isset .Site.Params "gcse" }}
           <li>
             <a href="#modalSearch" data-toggle="modal" data-target="#modalSearch" style="outline: none;">

layouts/partials/seo/twitter.html

@@ -8,7 +8,7 @@
   <meta name="twitter:image" content="{{ . | absURL }}">
 {{- end }}
   <meta name="twitter:card" content="summary_large_image">
-{{- with .Site.Author.twitter }}
+{{- with .Site.Params.author.twitter }}
   <meta name="twitter:site" content="@{{ . }}">
   <meta name="twitter:creator" content="@{{ . }}">
 {{- end }}