Merge branch 'main' of ssh://git.hadan-it.com:222/stiebke/hugo-internet-weblog

CHANGELOG.md

@@ -0,0 +1,11 @@
+## [v1.1](https://git.hadan-it.com/stiebke/hugo-internet-weblog/releases/tag/v1.1) - 2025-01-29
+
+* BUGFIXES
+  * Fix not valid RSS-Feed (#27)
+  * Eliminate ´s in specific file (#7)
+* ENHANCEMENTS
+  * Configurable statuspage-link in footer (#28)
+  * Rework Umami Integration (#12)
+  * Update documentation (#10)
+  * Rework favicon integration (#5)
+  * Create demo page repository (#4)

README.md

@@ -4,7 +4,7 @@
 
 The theme features a customizable bio-section and flickr-based photo stream in it's footer, unique layouts for displaying all posts sorted by year, and support for partials to customize style and javascript loaded.
 
-To see more, [check out my blog which is rendered with this theme](https://reaktionsfaehig.net) and see it's [configuration on my Forgejo instance](https://git.hadan-it.com/web/reaktionsfaehig.net).
+To see more, [check out a sample site which is rendered with this theme](https://preview.hadan-it.com/hugo-internet-weblog-demo/) and see it's [configuration on my Forgejo instance](https://git.hadan-it.com/stiebke/hugo-internet-weblog-demo).
 
 ![internet-weblog showing a Micropost.](https://git.hadan-it.com/stiebke/hugo-internet-weblog/raw/branch/main/images/screenshot.png)
 
@@ -35,7 +35,8 @@ To see more, [check out my blog which is rendered with this theme](https://reakt
 Inside the folder of your Hugo site run:
 
     $ mkdir themes
-    $ git submodule add https://git.hadan-it.com/web/reaktionsfaehig.net.git themes/internet-weblog
+    $ git submodule add https://git.hadan-it.com/stiebke/hugo-internet-weblog.git themes/internet-weblog
+    $ echo "theme = 'internet-weblog'" >> hugo.toml
 
 For more information read the official [setup guide](https://gohugo.io/installation/) for Hugo.
 
@@ -170,6 +171,9 @@ If you want to enable a dark appearance, there is limited support for that. Curr
 | `[params]`- `umamiurl` | `Your Umami-URL`| No. i.e. `https://analytics.example.com/`. Please add the trailing slash at the end. |
 | `[params]`- `umamisrihash` | `SRI hash` | No. Generate your SRI hash for your complete Umami-URL (incl. script.js). You can do this here: [https://www.srihash.org/](https://www.srihash.org/). |
 | `[params]`- `umamiid` | `Umami Website ID` | No. Add Your Umami-Website ID to this variable |
+| `[params]`- `statuspageenabled` | `true` or `false` | No. If true an all parameters are set a link to your status page is shown in the page_footer. |
+| `[params]`- `statuspage` | `Your Statuspage-URL`| No. i.e. `https://status.example.com`. |
+| `[params]`- `statuspagename` | `Name your Statuspage` | No. Set a specific name for your statuspage in de page_footer. |
 
 Here is an example `hugo.toml`:
 
@@ -198,6 +202,9 @@ SectionPagesMenu = "main"
    umamiurl = "https://analytics.example.com"
    umamisrihash = "xyz"
    umamiid = "xxxxxxxxxxxxxxxxxxx-yyyyyyyyyy-zzzzzzzzzzzzz"
+   statuspageenabled = true
+   statuspage = "https://status.example.com/status/preview-demo"
+	statuspagename = "Statusseite"
 
 [taxonomies]
    tag = "tags"

layouts/partials/bio.html

@@ -1,2 +1,2 @@
 Here you can place a short bio about yourself. Place a `bio.html` file in your
-project directory under `layout/partials`. That will override this message.
+project directory under `layouts/partials`. That will override this message.

layouts/partials/page_footer.html

@@ -1,7 +1,7 @@
 <footer>
   <div class="footer_text">
       <div>
-        <h3>Hi, <a href="{{ .Site.Params.Author.aboutpage }}">ich bin {{ .Site.Params.Author.firstname }}</a></h3>
+        <h3>Hi, <a href="{{.Site.BaseURL}}{{ .Site.Params.Author.aboutpage }}">ich bin {{ .Site.Params.Author.firstname }}!</a></h3>
         <p>
           {{ partial "bio.html" . }}
         </p>
@@ -18,7 +18,7 @@
   {{ if .Site.Params.showcopyright }}
     <div class="footer_copyright">
       &copy; {{ now.Format "2006" }} <a href="{{ .Site.Params.Author.aboutpage }}">{{ .Site.Params.Author.firstname }} {{ .Site.Params.Author.lastname }}</a>
-      {{ with .Site.Params.Author.location }} - Made in {{ . }}{{ end }} | <a href="{{ .Site.Params.statuspage }}" target="_blank">{{ .Site.Params.statuspagename }}</a>
+      {{ with .Site.Params.Author.location }} - Made in {{ . }}{{ end }} {{ if .Site.Params.statuspageenabled }}| <a href="{{ .Site.Params.statuspage }}" target="_blank">{{ .Site.Params.statuspagename }}</a>{{ end }}
     </div>
   {{ end }}
 </footer>

layouts/partials/page_header.html

@@ -1,6 +1,6 @@
 <header>
   <nav>
-    <h1><a href="/">@{{ .Site.Params.Author.handle }}</a> {{ .Site.Title }}.</h1>
+    <h1><a href="{{.Site.BaseURL}}">@{{ .Site.Params.Author.handle }}</a> {{ .Site.Title }}.</h1>
     <div class="menu">
 		{{ if isset .Site.Params "rsssections" }}
 			{{ $.Scratch.Add "sections" .Site.Params.rsssections }}
@@ -13,7 +13,7 @@
 					{{ end }}
 				</li>
 				{{ end }}
-				{{ with .Site.Params.Author.aboutpage }}<li><a href="{{ . }}">Über</a></li>{{ end }}
+				<li><a href="{{.Site.BaseURL}}{{ with .Site.Params.Author.aboutpage }}{{ . }}{{ end }}">Über</a></li>
 			</ul>
 		{{ else }}
 			<ul>
@@ -22,7 +22,7 @@
 					<a href="{{.URL}}">{{ .Name }}</a>
 				</li>
 				{{ end }}
-				{{ with .Site.Params.Author.aboutpage }}<li><a href="{{ . }}">Über</a></li>{{ end }}
+				<li><a href="{{.Site.BaseURL}}{{ with .Site.Params.Author.aboutpage }}{{ . }}{{ end }}">Über</a></li>
 			</ul>
       	{{ end }}
     </div>

layouts/partials/site_footer.html

@@ -1,4 +1,4 @@
-    <script type="text/javascript" src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha384-1H217gwSVyLSIfaLxHbE7dRb3v4mYCKbpQvzx0cegeju1MVsGrX5xXxAvs/HgeFs" crossorigin="anonymous"></script>></script>
+    <script type="text/javascript" src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha384-1H217gwSVyLSIfaLxHbE7dRb3v4mYCKbpQvzx0cegeju1MVsGrX5xXxAvs/HgeFs" crossorigin="anonymous"></script></script>
     <script type="text/javascript" src="{{.Site.BaseURL}}lightbox2-2.11.4/js/lightbox.min.js" charset="utf-8" integrity="sha384-jN3Qe7xtdnQxdyZWXD9gn2Z4oRyiFuU03xQATriSicCq2SKDikN9UEJMCx+9nsJM" crossorigin="anonymous"></script>
     <script src="{{.Site.BaseURL}}js/weblog.js" charset="utf-8" integrity="sha384-aosjEU4mvKU8ONpJImVqClx3r34rc9fegKgyAKyJ3uizf8YWbLUr4mOw2WWcvO4E" crossorigin="anonymous"></script>
     {{ partial "custom_javascript.html" . }}

layouts/partials/site_header.html

@@ -20,10 +20,10 @@
     {{ $.Scratch.Add "title" .Site.Title }}
     <title>{{ with .Title }}{{ if ne . ($.Scratch.Get "title") }}{{ . }} &middot; {{ end }}{{ end }}@{{ .Site.Params.Author.handle }} {{ .Site.Title }}</title>
 
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ .Site.BaseURL }}apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ .Site.BaseURL }}favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="{{ .Site.BaseURL }}favicon-16x16.png">
-    <link rel="manifest" href="/site.webmanifest">
+    <link rel="manifest" href="{{ .Site.BaseURL }}site.webmanifest">
 
     <link rel="stylesheet" href="{{.Site.BaseURL}}css/joshin-color-palette.css" media="screen" charset="utf-8" />
     <link rel="stylesheet" href="{{.Site.BaseURL}}css/joshin-color-light.css" media="screen" charset="utf-8" />

layouts/rss.xml

@@ -1,20 +1,20 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
     <title>@{{ .Site.Params.Author.handle }} {{ .Site.Title }}{{ with .Title }} - {{ . }}{{ end }}</title>
-    <link>{{ .Site.BaseURL }}{{ .Permalink }}</link>
+    <link>{{ .Permalink }}</link>
     <description>All entries {{ with .Title }}in {{.}} {{ end }}on {{ .Site.Title }}</description>
     <generator>Hugo -- gohugo.io</generator>
     {{ with .Site.LanguageCode }}<language>{{.}}</language>{{end}}
     {{ with .Site.Copyright }}<copyright>{{.}}</copyright>{{end}}
     {{ if not .Date.IsZero }}<lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
-    <atom:link href="{{.Permalink}}" rel="self" type="application/rss+xml" />
+    <atom:link href="{{.Permalink}}index.xml" rel="self" type="application/rss+xml" />
     {{ range .Site.RegularPages }}
       {{ if ne .Type "page" }}
       <item>
         <title>{{ .Title }}</title>
         <link>{{ .Permalink }}</link>
         <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
-        <author>{{ with .Site.Params.Author.email }}{{.}} - {{end}}{{ with .Site.Params.Author.firstname }}{{.}}{{ end }} {{ with .Site.Params.Author.lastname }}{{.}}{{end}}</author>
+        <author>{{ with .Site.Params.Author.email }}{{.}} {{end}}{{ with .Site.Params.Author.firstname }}({{.}}{{ end }} {{ with .Site.Params.Author.lastname }}{{.}}){{end}}</author>
         <guid>{{ .Permalink }}</guid>
         <description>{{ .Content | html }}</description>
       </item>