From f7598dcf1f057433218bd75bf3df070a65115404 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Sun, 14 May 2023 22:18:49 +0200
Subject: [PATCH] Vervangen van baseURL door absURL, feeds aanpassen en
 nieuwsberichten omzetten naar type 'posts'

---
 config.toml                                   |  4 +--
 ...019-11-05-lening-voor-freedom-internet.rst |  1 +
 .../2023-05-06-nieuwe-website-in-aanbouw.rst  |  1 -
 content/nieuws/_index.rst                     |  4 ++-
 themes/nluug/layouts/index.json               |  6 ++---
 themes/nluug/layouts/index.xml                | 25 ++++++++++---------
 themes/nluug/layouts/partials/head.html       |  6 ++---
 .../{news/single.html => posts/news.html}     |  0
 8 files changed, 25 insertions(+), 22 deletions(-)
 rename themes/nluug/layouts/{news/single.html => posts/news.html} (100%)

diff --git a/config.toml b/config.toml
index 8ba84b0..d42b6e6 100644
--- a/config.toml
+++ b/config.toml
@@ -1,8 +1,8 @@
 # Configuratie voor de website
 
-baseURL = "https://www3.nluug.nl"
+baseURL = "https://www3.nluug.nl/"
 languageCode = "nl"
-defaultcontentlanguage = "nl"
+defaultContentLanguage = "nl"
 title = "NLUUG"
 theme = "nluug"
 enableGitInfo = true
diff --git a/content/nieuws/2019-11-05-lening-voor-freedom-internet.rst b/content/nieuws/2019-11-05-lening-voor-freedom-internet.rst
index a5ead5c..7bef7a6 100644
--- a/content/nieuws/2019-11-05-lening-voor-freedom-internet.rst
+++ b/content/nieuws/2019-11-05-lening-voor-freedom-internet.rst
@@ -12,6 +12,7 @@ related_members:
 - mark-janssen
 - patrick-reijnen
 - ronny-lam
+layout: news
 signed_by: "Koen, Mark, Patrick, Ronny"
 ---
 
diff --git a/content/nieuws/2023-05-06-nieuwe-website-in-aanbouw.rst b/content/nieuws/2023-05-06-nieuwe-website-in-aanbouw.rst
index c854bae..f0d549b 100644
--- a/content/nieuws/2023-05-06-nieuwe-website-in-aanbouw.rst
+++ b/content/nieuws/2023-05-06-nieuwe-website-in-aanbouw.rst
@@ -10,7 +10,6 @@ tags:
 - website
 slug: nieuwe-website-in-aanbouw
 title: "Nieuwe website in aanbouw"
-type: news
 related_members:
 - michael-boelen
 - patrick-reijnen
diff --git a/content/nieuws/_index.rst b/content/nieuws/_index.rst
index f0cee48..0acbdb9 100644
--- a/content/nieuws/_index.rst
+++ b/content/nieuws/_index.rst
@@ -1,7 +1,9 @@
 ---
 cascade:
-  type: news
+  type: posts
+  layout: news
 title: "Nieuwsberichten"
+type: section
 ---
 
 Hier staan alle nieuwsberichten
diff --git a/themes/nluug/layouts/index.json b/themes/nluug/layouts/index.json
index 0e2bb5a..cea02d1 100644
--- a/themes/nluug/layouts/index.json
+++ b/themes/nluug/layouts/index.json
@@ -2,9 +2,9 @@
   "version": "https://jsonfeed.org/version/1",
   "title": "{{ .Site.Title }}",
   "home_page_url": "{{ .Site.BaseURL }}",
-  "feed_url": "{{ .Site.BaseURL }}feed.json",
+  "feed_url": "{{ absURL "feed.json" }}",
   "description": "{{ .Site.Params.description }}",
-  "favicon": "{{ .Site.BaseURL }}/assets/favicon.ico",
+  "favicon": "{{ absURL "assets/favicon.ico" }}",
   "expired": false,
   "author": {
     "name": "{{ .Site.Params.author }}",
@@ -31,4 +31,4 @@
     }{{ if ne (add $index 1) $len }},{{ end }}
     {{ end }}
   ]
-}
\ No newline at end of file
+}
diff --git a/themes/nluug/layouts/index.xml b/themes/nluug/layouts/index.xml
index 5f448ef..4ccf207 100644
--- a/themes/nluug/layouts/index.xml
+++ b/themes/nluug/layouts/index.xml
@@ -1,23 +1,24 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <!-- Required channel elements -->
+    {{- $author := or (.Site.Params.author) (.Site.Author.name) -}}
+    {{- $language := or (.Site.LanguageCode) (.Site.Language.Lang) -}}
     <title>{{ .Site.Title }}</title>
     <description>{{ .Site.Params.description }}</description>
-    <link>{{ .Site.BaseURL }}</link>
-    <!-- Optional channel elements -->
-    <language>en</language>
-    <copyright>Copyright {{ now.Format "2006"}}, Calvin Tran</copyright>
-    <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>
-    <generator>Hugo - gohugo.io</generator>
+    <link>{{ absURL "" }}</link>
+    <language>{{ $language | default "en" }}</language>
+    <copyright>Copyright {{ now.Format "2006"}}, {{ $author }}</copyright>
+    <lastBuildDate>{{ .Site.LastChange.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>
+    {{ with .Site.Params.webmaster }}
+      <webMaster>{{ . }}</webMaster>
+    {{ end }}
     <docs>http://cyber.harvard.edu/rss/rss.html</docs>
-    <atom:link href="{{ .Site.BaseURL }}/atom.xml" rel="self" type="application/atom+xml"/>
-    {{ $author :=  or (.Site.Params.author) (.Site.Author.name) }}
-    {{ range where .Site.RegularPages "Section" "posts" }}
+    <atom:link href="{{ absURL "atom.xml" }}" rel="self" type="application/atom+xml"/>
+    {{ range where .Site.RegularPages "Type" "posts" }}
     <item>
       <title>{{ .Title }}</title>
       <link>{{ .Permalink }}</link>
-      <description>{{ .Content | html }}</description>
-      <author>{{ $author }}</author>
+      <description>{{ .Content | plainify }}</description>
+      <author>{{ .Params.Author | default $author }}</author>
       <guid>{{ .Permalink }}</guid>
       <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
     </item>
diff --git a/themes/nluug/layouts/partials/head.html b/themes/nluug/layouts/partials/head.html
index d19dc8e..d9c7ade 100644
--- a/themes/nluug/layouts/partials/head.html
+++ b/themes/nluug/layouts/partials/head.html
@@ -8,9 +8,9 @@
     {{ template "_internal/opengraph.html" . }}
     {{ template "_internal/twitter_cards.html" . }}
     <link rel="canonical" href="{{ .Permalink }}">
-    <link rel="icon" href="{{ .Site.BaseURL }}/assets/favicon.ico">
-    <link rel="alternate" type="application/atom+xml" title="{{ .Site.Title }}" href="{{ .Site.BaseURL }}/atom.xml" />
-    <link rel="alternate" type="application/json" title="{{ .Site.Title }}" href="{{ .Site.BaseURL }}/feed.json" />
+    <link rel="icon" href="{{ absURL "assets/favicon.ico" }} ">
+    <link rel="alternate" type="application/atom+xml" title="{{ .Site.Title }}" href="{{ absURL "atom.xml" }}" />
+    <link rel="alternate" type="application/json" title="{{ .Site.Title }}" href="{{ absURL "feed.json" }}" />
     <link rel="shortcut icon" type="image/png" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=">
     {{ $styles := resources.Get "scss/styles.scss" | toCSS (dict "outputStyle" "compressed") | minify }}
     {{ $styles_extra := resources.Get "scss/_extra.scss" | toCSS (dict "outputStyle" "compressed") | minify }}
diff --git a/themes/nluug/layouts/news/single.html b/themes/nluug/layouts/posts/news.html
similarity index 100%
rename from themes/nluug/layouts/news/single.html
rename to themes/nluug/layouts/posts/news.html