From bdc60d7d56b5384f13feaaccef28e63d77f15933 Mon Sep 17 00:00:00 2001
From: Mitja Felicijan <mitja.felicijan@gmail.com>
Date: Thu, 3 Nov 2022 20:22:26 +0100
Subject: A bunch of fixes for aria and code cleanup

---
 themes/simple/layouts/_default/list.html          | 39 ++++++++---------------
 themes/simple/layouts/_default/single.html        | 21 ++----------
 themes/simple/layouts/partials/comments.html      |  2 +-
 themes/simple/layouts/partials/head.html          |  9 ++++--
 themes/simple/layouts/partials/header.html        | 25 ---------------
 themes/simple/layouts/partials/navigation.html    |  6 ++--
 themes/simple/layouts/partials/read-more.html     | 16 ++++++++++
 themes/simple/layouts/partials/side-projects.html | 10 ++++++
 themes/simple/openring/openring.html              | 12 +++----
 9 files changed, 60 insertions(+), 80 deletions(-)
 delete mode 100755 themes/simple/layouts/partials/header.html
 create mode 100644 themes/simple/layouts/partials/read-more.html
 create mode 100644 themes/simple/layouts/partials/side-projects.html

(limited to 'themes')

diff --git a/themes/simple/layouts/_default/list.html b/themes/simple/layouts/_default/list.html
index 2e66b0d..856abf4 100755
--- a/themes/simple/layouts/_default/list.html
+++ b/themes/simple/layouts/_default/list.html
@@ -1,39 +1,28 @@
 {{ define "main" }}
-<main aria-role="main" class="container-blog mx-auto px-6 md:p-0">
+<main role="main" class="container-blog mx-auto px-6 md:p-0">
 
   <h1 class="text-2xl font-bold mb-6">Blog posts</h1>
 
   <!-- List of all blog posts -->
-  <nav itemscope itemtype="https://schema.org/SiteNavigationElement" class="mb-12">
+  <nav itemscope itemtype="https://schema.org/SiteNavigationElement" class="mb-12" role="feed">
     <meta itemprop="name" content="Article list">
-    <ul>
-      {{ range (where .Site.RegularPages "Section" "posts") }}
-      <li class="mb-5">
-        <time class="block text-gray-400 font-medium text-xs">{{ .Date.Format "Monday Jan 2, 2006" }}</time>
-        <a href="/{{.Params.url}}" itemprop="url" class="hover:bg-yellow-100">
-          {{ if .Params.draft }}
-          <span class="bg-orange-600 text-white px-1.5">Draft</span>
-          {{ end }}
-          {{.Title}}
-        </a>
-      </li>
-      {{end}}
-    </ul>
+    {{ range (where .Site.RegularPages "Section" "posts") }}
+    <article class="mb-5" itemscope itemtype="http://schema.org/Article">
+      <time class="block text-gray-400 font-medium text-xs">{{ .Date.Format "Monday Jan 2, 2006" }}</time>
+      <a href="/{{ .Params.url }}" itemprop="url" class="hover:bg-yellow-100" rel="bookmark noopener" aria-label="Opens URL">
+        {{ if .Params.draft }}
+        <span class="bg-orange-600 text-white px-1.5">Draft</span>
+        {{ end }}
+        {{.Title}}
+      </a>
+    </article>
+    {{ end }}
   </nav>
 
   <hr class="border-2 border-gray-100 mb-10">
 
   <!-- Projects I work on -->
-  <section class="mb-12">
-    <h4 class="text-2xl font-bold mb-6">Side projects I worked on</h4>
-    <ul class="list-disc ml-6">
-      <li><a href="https://git.mitjafelicijan.com/journalctl-proxy.git/" target="_blank" rel="noopener nofollow" class="hover:bg-yellow-100">journalctl-proxy - Exposes your systemd logs to web via web interface</a></li>
-      <li><a href="https://git.mitjafelicijan.com/redis-marshal.git/" target="_blank" rel="noopener nofollow" class="hover:bg-yellow-100">redis-marshal - Lightweight Redis data exploration tool</a></li>
-      <li><a href="https://git.mitjafelicijan.com/dna-encoding.git/" target="_blank" rel="noopener nofollow" class="hover:bg-yellow-100">dna-encoding - Tools for encoding files to DNA sequence</a></li>
-      <li><a href="https://git.mitjafelicijan.com/vertex.git/" target="_blank" rel="noopener nofollow" class="hover:bg-yellow-100">vertex - Create mock API's and add basic logic to simplify prototyping</a></li>
-      <li><a href="https://git.mitjafelicijan.com/scarecrow.git/" target="_blank" rel="noopener nofollow" class="hover:bg-yellow-100">scarecrow - Minimal configuration reverse proxy</a></li>
-    </ul>
-  </section>
+  {{ partial "side-projects.html" . }}
 
   <hr class="border-2 border-gray-100 mb-10">
 
diff --git a/themes/simple/layouts/_default/single.html b/themes/simple/layouts/_default/single.html
index c8e786a..1258a3b 100755
--- a/themes/simple/layouts/_default/single.html
+++ b/themes/simple/layouts/_default/single.html
@@ -1,10 +1,10 @@
 {{ define "main" }}
-<main aria-role="main" class="container-blog mx-auto px-6 md:p-0">
+<main role="main" class="container-blog mx-auto px-6 md:p-0">
 
   <!-- Single article -->
   <article itemtype="http://schema.org/Article" class="single mb-12">
     <header class="mb-6">
-      <h1 itemtype="headline" class="text-4xl font-extrabold mb-6 leading-tight">{{.Title}}</h1>
+      <h1 itemtype="headline" class="text-4xl font-extrabold mb-6 leading-tight">{{ .Title }}</h1>
 
       {{ if in .Type "posts" }}
       <time class="text-gray-400 font-medium text-sm">Published on {{ .Date.Format "Monday Jan 2, 2006" }}</time>
@@ -33,22 +33,7 @@
 
   <!-- Read more -->
   {{ if in .Type "posts" }}
-  <section>
-    <h2 class="text-2xl font-bold mb-6">Read more from this site</h2>
-    <nav itemscope itemtype="https://schema.org/SiteNavigationElement" class="mb-12">
-      <meta itemprop="name" content="Article list">
-      <ul>
-        {{ $randomPosts := shuffle (where .Site.RegularPages "Type" "posts") | first 5 }}
-        {{ range $randomPosts }}
-        <li class="mb-6">
-          <time class="block text-gray-400 font-medium text-xs">{{ .Date.Format "Mon Jan 2, 2006" }}</time>
-          <a href="/{{.Params.url}}" itemprop="url" class="hover:bg-yellow-100 font-medium">{{.Title}}</a>
-          <p class="text-gray-600 text-sm">{{.Summary}}</p>
-        </li>
-        {{end}}
-      </ul>
-    </nav>
-  </section>
+  {{ partial "read-more.html" . }}
   {{ end }}
 
   {{ if in .Type "posts" }}
diff --git a/themes/simple/layouts/partials/comments.html b/themes/simple/layouts/partials/comments.html
index 70b1d94..b905967 100755
--- a/themes/simple/layouts/partials/comments.html
+++ b/themes/simple/layouts/partials/comments.html
@@ -12,7 +12,7 @@
         defaultHomeserverUrl: "https://matrix.cactus.chat:8448",
         serverName: "cactus.chat",
         siteName: "mitjafelicijan.com",
-        commentSectionId: "{{.File}}",
+        commentSectionId: "{{ .File }}",
         pageSize: 50,
         updateInterval: 10,
       });
diff --git a/themes/simple/layouts/partials/head.html b/themes/simple/layouts/partials/head.html
index 9499df6..256608d 100755
--- a/themes/simple/layouts/partials/head.html
+++ b/themes/simple/layouts/partials/head.html
@@ -3,15 +3,20 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 <link rel="alternate" type="application/rss+xml" href="/index.xml" title="{{ .Site.Author.name }}">
-<link rel="alternate" type="application/rss+xml" href="/yap/feed.xml" title="Microblog - {{ .Site.Author.name }}">
 
 <link
   href="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL69vf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv76+/8LBwQkAAAAAAAAAAAAAAAC+vb3/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL+9vf/Bv78JAAAAAAAAAAAAAAAAu7q6/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC7ubr/vr29CAAAAAAAAAAAy8nJAZ6foP8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnqGj/6GipAoAAAAAHLjU/xcXHf/BwsL/I8XY/yPK3v8XGiD/IbjL/yPF2f8XGiD/Fxkf/yLF2f8gnK3/Fxog/62ztv8fwNf/FRcd/x271v8mz93/GRsi/xkXHf8p097/GiIp/xobIv8p0t3/KdPe/xocIv8fYmr/KNPe/xoZH/8aHCL/J87c/xy81/8VFxz/IsPZ/8zS0/8XGiD/Ir/R/yPH2/8XGiD/Fxkf/yPH2/8dd4T/GBog/yPJ3f8jyNr/uru9/xcUGv8cudb/EhITDKi5vRKlvMP/RUpOERwcHRAdOj4QHTk8EBwdHRAdNTgQHTo/EBwcHRAcHB0QSGduEKW4vf+koqQfHzg+EBqz0ewSFRv7EyMr/xq51vsTERb7ExUb+xq41fsau9j7ExUb+xiPp/sZudb7ExUb+xMVG/sZuNX/GKvI/BIUGfMdvdn/IrfL/xcaIP8n1eb/J9Dh/xkcIf8ZGR7/J8/f/xxCSv8ZGyH/J9Dg/ybQ4P8ZHCL/FSQs/yPK3/8UExj/GE1b/ybS5P8ZGB7/Ghwj/ynW5P8p2Ob/Ghwi/yWrtv8p1eH/Ghwi/xocIv8p1uT/J8XT/xkcIv8m1un/Hb7d/xUYH/8hzOr/HtHu/xcaIf8XGB//I8vi/xgxOv8XGSD/I8rg/yPK4P8XGiD/GUFL/yPP6f8SERj/Fhkh/x3A4f8AAAAAJ2f9/ydr//8mZPH/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlYu38J2v//ydo/f8AAAAAAAAAAAd8/fkFqf//Iob8sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMY39awWr//8FfP3/AAAAAAAAAAAFm/7/SfD//wR+/f8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOB/f9B7v//BaX+/wAAAAAAAAAAQ878SAyZ/v9n1v4KAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADu9v8DDJb+/z3N/XgAAAAA3/sAAN/7AADf+wAA3/sAAAAAAAAAAAAAAAAAAN/7AAAAAAAAAAAAAAAAAAAAAAAAj/EAAI/5AACP8QAA3/sAAA=="
   rel="icon" type="image/x-icon" />
 
-<title>{{.Title}}</title>
+<title>{{ .Title }}</title>
 <meta name="description" content="{{ .Site.Params.description }}" />
 
+<meta property="og:type" content="article">
+<meta property="og:title" content="{{ .Title }}">
+<meta property="og:description" content="{{ if .Summary }}{{ .Summary }}{{ else }}{{ .Site.Params.Description }}{{ end }}">
+<meta property="og:url" content="https://mitjafelicijan.com/{{ .Params.url }}">
+<meta property="og:image" content="https://mitjafelicijan.com/general/og.jpg">
+
 <script src="https://cdn.tailwindcss.com"></script>
 
 {{ partial "tailwind.html" . }}
diff --git a/themes/simple/layouts/partials/header.html b/themes/simple/layouts/partials/header.html
deleted file mode 100755
index 1b1f279..0000000
--- a/themes/simple/layouts/partials/header.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="container-blog mx-auto px-6 md:p-0">
-  <header class="flex py-4 mt-4 mb-6">
-    <h3 class="flex-grow">
-      <a href="/" itemprop="url" class="text-xl font-bold hover:bg-yellow-100">Mitja Felicijan</a>
-    </h3>
-
-    <nav itemscope itemtype="http://schema.org/SiteNavigationElement" class="flex items-center gap-1">
-      <meta itemprop="name" content="Main Menu">
-
-      <a href="/yap/feed.xml" rel="noopener nofollow" itemprop="url" class="hidden md:flex items-center gap-1 font-medium px-2 hover:bg-yellow-100">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-3 h-3">
-          <path d="M11.983 1.907a.75.75 0 00-1.292-.657l-8.5 9.5A.75.75 0 002.75 12h6.572l-1.305 6.093a.75.75 0 001.292.657l8.5-9.5A.75.75 0 0017.25 8h-6.572l1.305-6.093z" />
-        </svg>
-        <span>Microblog</span>
-      </a>
-
-      <a href="https://git.mitjafelicijan.com" target="_blank" rel="noopener nofollow" itemprop="url" class="font-medium px-2 hover:bg-yellow-100">Git</a>
-      <a href="https://files.mitjafelicijan.com" target="_blank" rel="noopener nofollow" itemprop="url" class="font-medium px-2 hover:bg-yellow-100">Files</a>
-      <a href="/curriculum-vitae.html" class="font-medium px-2 hover:bg-yellow-100">CV</a>
-      <a href="/books.html" class="font-medium px-2 hover:bg-yellow-100">Books</a>
-
-      <a href="/index.xml" itemprop="url" class="font-medium px-2 hover:bg-yellow-100 hidden md:block">RSS</a>
-    </nav>
-  </header>
-</div>
diff --git a/themes/simple/layouts/partials/navigation.html b/themes/simple/layouts/partials/navigation.html
index 8d83a43..eada2d5 100755
--- a/themes/simple/layouts/partials/navigation.html
+++ b/themes/simple/layouts/partials/navigation.html
@@ -1,10 +1,10 @@
 <div class="container-blog mx-auto px-6 md:p-0">
   <header class="flex py-4 mt-4 mb-6 flex-col md:flex-row items-center ">
-    <h3 class="flex-grow mb-2 md:mb-0">
+    <div class="flex-grow mb-2 md:mb-0">
       <a href="/" itemprop="url" class="text-xl font-bold hover:bg-yellow-100">Mitja Felicijan</a>
-    </h3>
+    </div>
 
-    <nav itemscope itemtype="http://schema.org/SiteNavigationElement" class="flex items-center gap-1">
+    <nav itemscope itemtype="http://schema.org/SiteNavigationElement" class="flex items-center gap-1" role="toolbar">
       <meta itemprop="name" content="Main Menu">
 
       <a href="https://git.mitjafelicijan.com" target="_blank" rel="noopener nofollow" itemprop="url" class="font-medium px-2 hover:bg-yellow-100">Git</a>
diff --git a/themes/simple/layouts/partials/read-more.html b/themes/simple/layouts/partials/read-more.html
new file mode 100644
index 0000000..d604bfc
--- /dev/null
+++ b/themes/simple/layouts/partials/read-more.html
@@ -0,0 +1,16 @@
+<section>
+  <h2 class="text-2xl font-bold mb-6">Read more from this site</h2>
+  <nav itemscope itemtype="https://schema.org/SiteNavigationElement" class="mb-12">
+    <meta itemprop="name" content="Article list">
+    <ul>
+      {{ $randomPosts := shuffle (where .Site.RegularPages "Type" "posts") | first 5 }}
+      {{ range $randomPosts }}
+      <li class="mb-6">
+        <time class="block text-gray-400 font-medium text-xs">{{ .Date.Format "Mon Jan 2, 2006" }}</time>
+        <a href="/{{ .Params.url }}" itemprop="url" class="hover:bg-yellow-100 font-medium">{{ .Title }}</a>
+        <p class="text-gray-600 text-sm">{{ .Summary }}</p>
+      </li>
+      {{ end }}
+    </ul>
+  </nav>
+</section>
diff --git a/themes/simple/layouts/partials/side-projects.html b/themes/simple/layouts/partials/side-projects.html
new file mode 100644
index 0000000..5cca9b6
--- /dev/null
+++ b/themes/simple/layouts/partials/side-projects.html
@@ -0,0 +1,10 @@
+<section class="mb-12">
+  <h2 class="text-2xl font-bold mb-6">Side projects I worked on</h2>
+  <ul class="list-disc ml-6">
+    <li><a href="https://git.mitjafelicijan.com/journalctl-proxy.git/" target="_blank" rel="noopener nofollow" class="hover:bg-yellow-100">journalctl-proxy - Exposes your systemd logs to web via web interface</a></li>
+    <li><a href="https://git.mitjafelicijan.com/redis-marshal.git/" target="_blank" rel="noopener nofollow" class="hover:bg-yellow-100">redis-marshal - Lightweight Redis data exploration tool</a></li>
+    <li><a href="https://git.mitjafelicijan.com/dna-encoding.git/" target="_blank" rel="noopener nofollow" class="hover:bg-yellow-100">dna-encoding - Tools for encoding files to DNA sequence</a></li>
+    <li><a href="https://git.mitjafelicijan.com/vertex.git/" target="_blank" rel="noopener nofollow" class="hover:bg-yellow-100">vertex - Create mock API's and add basic logic to simplify prototyping</a></li>
+    <li><a href="https://git.mitjafelicijan.com/scarecrow.git/" target="_blank" rel="noopener nofollow" class="hover:bg-yellow-100">scarecrow - Minimal configuration reverse proxy</a></li>
+  </ul>
+</section>
diff --git a/themes/simple/openring/openring.html b/themes/simple/openring/openring.html
index 48444f8..577ec5c 100755
--- a/themes/simple/openring/openring.html
+++ b/themes/simple/openring/openring.html
@@ -1,16 +1,16 @@
 <section class="mb-10">
-  <h4 class="text-2xl font-bold mb-6">Articles from blogs I follow around the net</h4>
+  <h2 class="text-2xl font-bold mb-6">Articles from blogs I follow around the net</h2>
 
   <section>
-    {{range .Articles}}
+    {{ range .Articles }}
     <article class="mb-6">
-      <a href="{{.Link}}" target="_blank" rel="noopener" class="font-semibold mb-1 hover:bg-yellow-100">{{.Title}}</a>
-      <p class="mb-1 text-gray-600 text-sm">{{.Summary}}</p>
+      <a href="{{ .Link }}" target="_blank" rel="noopener" class="font-semibold mb-1 hover:bg-yellow-100">{{ .Title }}</a>
+      <p class="mb-1 text-gray-600 text-sm">{{ .Summary }}</p>
       <div class="text-gray-400 text-xs">
-        Via <a href="{{.SourceLink}}" class="underline">{{.SourceTitle}}</a> on {{.Date | datef "January 2, 2006"}}
+        Via <a href="{{ .SourceLink }}" class="underline">{{ .SourceTitle }}</a> on {{ .Date | datef "January 2, 2006" }}
       </div>
     </article>
-    {{end}}
+    {{ end }}
   </section>
 
   <p class="text-sm text-gray-600">
-- 
cgit v1.2.3