feat: nameplate and more composition

8 files changed, 98 insertions, 51 deletions

diff --git a/layouts/_default/index.html b/layouts/_default/index.html
index 7a3330d..c9c3aae 100644
--- a/layouts/_default/index.html
+++ b/layouts/_default/index.html
@@ -12,25 +12,21 @@ Hey! I'm Michał Sapka, a computer programmer living in Kraków, Poland. This we
 </nav>
 
 <BR>
-<div>
-  <a href="https://nonbot.org/pledged/view/9b37caf2-57c1-4934-9bea-69c54eb46452" target="_blank">
-    <img style="height:128px;margin-top:10px;margin-bottom:10px;" src="https://nonbot.org/images/nonbot_pledged_logo.svg" alt="Human-made Content">
-  </a>
-</div>
 
 <h2>Recent updates and publications </h2>
 
 {{ range first 10 
 .Site.RegularPages.ByDate.Reverse
 }}
-  {{ partial "partials/article_list_item.html" . }}
+{{ partial "partials/article_list_item.html" . }}
 {{ end }}
-<p><a href="/all_updates">&raquo; All updates</a><BR>
-<a href="/blog/">&raquo; Go to blog</a></p>
+<p>
+  <a href="/blog/">&raquo; Go to blog</a></p>
+</p>
 
-   {{ partial "partials/homepage/bsd.html" . }}
-   {{ partial "partials/homepage/emacs.html" . }}
-   {{ partial "partials/homepage/startrek.html" . }}
+{{ partial "partials/homepage/bsd.html" . }}
+{{ partial "partials/homepage/emacs.html" . }}
+{{ partial "partials/homepage/startrek.html" . }}
 <h2>Sections</h2>
 
 <nav>
@@ -38,48 +34,14 @@ Hey! I'm Michał Sapka, a computer programmer living in Kraków, Poland. This we
   <P><a class="sec-link" href="/articles/"><b>Articles</b>: longer publications that don't fit blog or any other category.</a> </p>
   <P><a class="sec-link" href="/funnies/"><b>Funnies</b>: A small, curated collection of things I found funny or ammusing.</a> </p>
   <p><a class="sec-link" href="/git/"><b>Version control system</b> : My little code repository. I don't expect to cooporate on any of those, so it's just stagit.</a></p>
-  <p><a class="sec-link" href="/site/"><b>Site info</b> : you can find site updates, metrics, statics, and legal thingies here.</a></p>
 </nav>
 
 <h2>TOC</h2>
 You can also use <a href="/toc">Table of Contents</a>.
-<br><br>
 
-<h2>Web buttons</h2>
+{{ partial "partials/homepage/buttons.html" . }}
+{{ partial "partials/homepage/nameplate.html" . }}
 
-<nav>
-  {{ partial "button-15" (dict "button" . "file" "open-bsd.png" "alt" "Powered by OpenBSD" "href" "https://openbsd.org") }}
-  {{ partial "button-15" (dict "button" . "file" "gnu-emacs.png" "alt" "Powered by GNU Emacs" "href" "https://www.gnu.org/software/emacs/") }}
-  {{ partial "button-15" (dict "button" . "file" "star-trek.gif" "alt" "I am a trekkie" "href" "/star-trek/") }}
-  {{ partial "button-15" (dict "button" . "file" "rss-20.gif" "alt" "RSS Feed" "href" "/index.xml") }}
-  {{ partial "button-15" (dict "button" . "file" "self-hosted.gif" "alt" "Self hosted on OpenBSD Amsterdam" "href" "https://openbsd.amsterdam/") }}
-  {{ partial "button-15" (dict "button" . "file" "text-powered.gif" "alt" "Text powered" ) }}
-  {{ partial "button-15" (dict "button" . "file" "freebsd.gif" "alt" "Freebsd" "href" "https://freebsd.org" ) }}
-  {{ partial "button-15" (dict "button" . "file" "coffee.gif" "alt" "Powered by cofee") }}
-  {{ partial "button-15" (dict "button" . "file" "firefox.png" "alt" "Gef Firefox" "href" "https://www.mozilla.org/firefox/") }}
-  {{ partial "button-15" (dict "button" . "file" "http-11.png" "alt" "Served with HTTP 1.1") }}
-  {{ partial "button-15" (dict "button" . "file" "jabber.gif" "alt" "Use Jabber") }}
-  {{ partial "button-15" (dict "button" . "file" "lisp.png" "alt" "Use Lisp") }}
-  {{ partial "button-15" (dict "button" . "file" "ruby-lang.png" "alt" "Use Ruby" "href" "https://www.ruby-lang.org/") }}
-  {{ partial "button-15" (dict "button" . "file" "evangelion.png" "alt" "Neon Genesis Evangelion 4 Life" ) }}
-  {{ partial "button-15" (dict "button" . "file" "lain.png" "alt" "Serial Experiments Lain 4 Life" ) }}
-  {{ partial "button-15" (dict "button" . "file" "2600.gif" "alt" "Read 2600" "href" "https://2600.com") }}
-  {{ partial "button-15" (dict "button" . "file" "digitial-freedom.png" "alt" "Digital Freedom") }}
-  {{ partial "button-15" (dict "button" . "file" "about-me.gif" "alt" "about me" "href" "/about" ) }}
-  {{ partial "button-15" (dict "button" . "file" "archive-rg.png" "alt" "Archive.org" ) }}
-  {{ partial "button-15" (dict "button" . "file" "bash.png" "alt" "bash nerd" ) }}
-  {{ partial "button-15" (dict "button" . "file" "cc-sa.png" "alt" "CC-by-SA" ) }}
-  {{ partial "button-15" (dict "button" . "file" "gpg.png" "alt" "gpg" "href" "/me/contact/" ) }}
-  {{ partial "button-15" (dict "button" . "file" "knoppix.gif" "alt" "knoppix" ) }}
-  {{ partial "button-15" (dict "button" . "file" "mp3.png" "alt" "mp3" ) }}
-  {{ partial "button-15" (dict "button" . "file" "no-win.gif" "alt" "No windows" ) }}
-  {{ partial "button-15" (dict "button" . "file" "opensource.png" "alt" "Open Source" "href" "/git" ) }}
-  {{ partial "button-15" (dict "button" . "file" "quake.gif" "alt" "Quake" ) }} 
-  {{ partial "button-15" (dict "button" . "file" "seinfeld.gif" "alt" "Seinfeld" ) }}
-  {{ partial "button-15" (dict "button" . "file" "st-voy.gif" "alt" "Voyager" ) }}
-  {{ partial "button-15" (dict "button" . "file" "thinkpad.gif" "alt" "IBM Thinkpad" ) }}
-  {{ partial "button-15" (dict "button" . "file" "torrent.png" "alt" "Torrent" ) }}
-</nav>
 {{ end }}
 
 
diff --git a/layouts/partials/homepage/.#nameplate.html b/layouts/partials/homepage/.#nameplate.html
new file mode 120000
index 0000000..5fa0764
--- /dev/null
+++ b/layouts/partials/homepage/.#nameplate.html
@@ -0,0 +1 @@
+mms@voyager.63297:1712135685
\ No newline at end of file
diff --git a/layouts/partials/homepage/bsd.html b/layouts/partials/homepage/bsd.html
index 5882379..b04610d 100644
--- a/layouts/partials/homepage/bsd.html
+++ b/layouts/partials/homepage/bsd.html
@@ -5,7 +5,7 @@
 {{- $img2x := $img.Resize "300x webp" }}
 
 <section class="bsd" style="display: flow-root">
-  <h2 id="bsd">Berkeley Software Distribution</h2>
+  <h2 id="bsd"><a href="#bsd">Berkeley Software Distribution</a></h2>
 
   <img 
     style="float: right; max-width: 20%;"
diff --git a/layouts/partials/homepage/buttons.html b/layouts/partials/homepage/buttons.html
new file mode 100644
index 0000000..39fd0c4
--- /dev/null
+++ b/layouts/partials/homepage/buttons.html
@@ -0,0 +1,36 @@
+<section class="buttons">
+  <h2 id="buttons">Buttons</h2>
+  <nav>
+    {{ partial "button-15" (dict "button" . "file" "open-bsd.png" "alt" "Powered by OpenBSD" "href" "https://openbsd.org") }}
+    {{ partial "button-15" (dict "button" . "file" "gnu-emacs.png" "alt" "Powered by GNU Emacs" "href" "https://www.gnu.org/software/emacs/") }}
+    {{ partial "button-15" (dict "button" . "file" "star-trek.gif" "alt" "I am a trekkie" "href" "/star-trek/") }}
+    {{ partial "button-15" (dict "button" . "file" "rss-20.gif" "alt" "RSS Feed" "href" "/index.xml") }}
+    {{ partial "button-15" (dict "button" . "file" "self-hosted.gif" "alt" "Self hosted on OpenBSD Amsterdam" "href" "https://openbsd.amsterdam/") }}
+    {{ partial "button-15" (dict "button" . "file" "text-powered.gif" "alt" "Text powered" ) }}
+    {{ partial "button-15" (dict "button" . "file" "freebsd.gif" "alt" "Freebsd" "href" "https://freebsd.org" ) }}
+    {{ partial "button-15" (dict "button" . "file" "coffee.gif" "alt" "Powered by cofee") }}
+    {{ partial "button-15" (dict "button" . "file" "firefox.png" "alt" "Gef Firefox" "href" "https://www.mozilla.org/firefox/") }}
+    {{ partial "button-15" (dict "button" . "file" "http-11.png" "alt" "Served with HTTP 1.1") }}
+    {{ partial "button-15" (dict "button" . "file" "jabber.gif" "alt" "Use Jabber") }}
+    {{ partial "button-15" (dict "button" . "file" "lisp.png" "alt" "Use Lisp") }}
+    {{ partial "button-15" (dict "button" . "file" "ruby-lang.png" "alt" "Use Ruby" "href" "https://www.ruby-lang.org/") }}
+    {{ partial "button-15" (dict "button" . "file" "evangelion.png" "alt" "Neon Genesis Evangelion 4 Life" ) }}
+    {{ partial "button-15" (dict "button" . "file" "lain.png" "alt" "Serial Experiments Lain 4 Life" ) }}
+    {{ partial "button-15" (dict "button" . "file" "2600.gif" "alt" "Read 2600" "href" "https://2600.com") }}
+    {{ partial "button-15" (dict "button" . "file" "digitial-freedom.png" "alt" "Digital Freedom") }}
+    {{ partial "button-15" (dict "button" . "file" "about-me.gif" "alt" "about me" "href" "/about" ) }}
+    {{ partial "button-15" (dict "button" . "file" "archive-rg.png" "alt" "Archive.org" ) }}
+    {{ partial "button-15" (dict "button" . "file" "bash.png" "alt" "bash nerd" ) }}
+    {{ partial "button-15" (dict "button" . "file" "cc-sa.png" "alt" "CC-by-SA" ) }}
+    {{ partial "button-15" (dict "button" . "file" "gpg.png" "alt" "gpg" "href" "/me/contact/" ) }}
+    {{ partial "button-15" (dict "button" . "file" "knoppix.gif" "alt" "knoppix" ) }}
+    {{ partial "button-15" (dict "button" . "file" "mp3.png" "alt" "mp3" ) }}
+    {{ partial "button-15" (dict "button" . "file" "no-win.gif" "alt" "No windows" ) }}
+    {{ partial "button-15" (dict "button" . "file" "opensource.png" "alt" "Open Source" "href" "/git" ) }}
+    {{ partial "button-15" (dict "button" . "file" "quake.gif" "alt" "Quake" ) }} 
+    {{ partial "button-15" (dict "button" . "file" "seinfeld.gif" "alt" "Seinfeld" ) }}
+    {{ partial "button-15" (dict "button" . "file" "st-voy.gif" "alt" "Voyager" ) }}
+    {{ partial "button-15" (dict "button" . "file" "thinkpad.gif" "alt" "IBM Thinkpad" ) }}
+    {{ partial "button-15" (dict "button" . "file" "torrent.png" "alt" "Torrent" ) }}
+  </nav>
+</section>
diff --git a/layouts/partials/homepage/emacs.html b/layouts/partials/homepage/emacs.html
index 0b5f42e..807185e 100644
--- a/layouts/partials/homepage/emacs.html
+++ b/layouts/partials/homepage/emacs.html
@@ -5,7 +5,7 @@
 {{- $img2x := $img.Resize "100x webp" }}
 
 <section class="emacs">
-  <h2 id="emacs">Emacs</h2>
+  <h2 id="emacs"><a href="#emacs">Emacs</a></h2>
   <div style="display: flow-root; vertical-align: middle;">
     <img 
       style="float: left; max-width: 20%; margin-right: 10px;"
diff --git a/layouts/partials/homepage/nameplate.html b/layouts/partials/homepage/nameplate.html
new file mode 100644
index 0000000..9cc0a21
--- /dev/null
+++ b/layouts/partials/homepage/nameplate.html
@@ -0,0 +1,49 @@
+<section class="nameplate">
+  <h2 id="nameplate"><a href="#nameplate">Nameplate</a></h2>
+
+  <a
+    href="https://nonbot.org/pledged/view/9b37caf2-57c1-4934-9bea-69c54eb46452"
+    target="_blank">
+    <img
+      style="height:128px;
+             margin-top:10px;
+             float: left;
+             margin-bottom:10px;"
+      src="https://nonbot.org/images/nonbot_pledged_logo.svg"
+      alt="Human-made Content">
+  </a>
+
+  <div style="float: center">
+    <table class="small">
+      <tr>
+        <td> Name </td>
+        <td> Michal's Sapka Website </td>
+      </tr>
+      <tr>
+        <td> Established </td>
+        <td> 2022-04-05 </td>
+      </tr>
+      <tr>
+        <td>Subpage count</td>
+        <td>{{  len .Page.Site.RegularPages }} </td>
+      </tr>
+      <tr>
+        <td> Generator </td>
+        <td> <a href="https://gohugo.io/">Hugo</a> with a custom theme </td>
+      </tr>
+      <tr>
+        <td> Running on </td>
+        <td> <a href="https://www.openbsd.org/">OpenBSD</a></td>
+      </tr>
+      <tr>
+        <td> Hosted on </td>
+        <td> <a href="https://openbsd.amsterdam/">OpenBSD Amsterdam</a> </td>
+      </tr>
+      <tr>
+        <td> Web stack </td>
+        <td> Pf + Relayd + Httpd </td>
+      </tr>
+    </table>
+  </div>
+  <a href="/stat">Statistics</a>
+</section>
diff --git a/layouts/partials/homepage/startrek.html b/layouts/partials/homepage/startrek.html
index 296be4b..845c07a 100644
--- a/layouts/partials/homepage/startrek.html
+++ b/layouts/partials/homepage/startrek.html
@@ -5,7 +5,7 @@
 {{- $img2x := $img.Resize "300x webp" }}
 
 <section class="star-trek" style="display: flow-root">
-  <h2 id="star-trek">Star Trek</h2>
+  <h2 id="star-trek"><a href="#star-trek">Star Trek</a></h2>
   <img
     class="vert-move"
     style="float: right; max-width: 20%;"
diff --git a/layouts/shortcodes/post-count.html b/layouts/shortcodes/post-count.html
deleted file mode 100644
index bbe1a3f..0000000
--- a/layouts/shortcodes/post-count.html
+++ /dev/null
@@ -1 +0,0 @@
-{{  len .Page.Site.RegularPages }}