8 files changed, 52 insertions, 56 deletions
diff --git a/v2/src/lib/base-conf.in b/v2/src/lib/base-conf.in
index a33755a..c065807 100644
--- a/v2/src/lib/base-conf.in
+++ b/v2/src/lib/base-conf.in
@@ -1,9 +1,9 @@
-site_name="EuAndreh's website"
 domain='@DOMAIN@'
 email='@EMAIL@'
 base_url=''
-lang=en
 list_addr='~euandreh/public-inbox@lists.sr.ht'
 mailto_uri_prefix="mailto:$list_addr?Subject=Re%3A%20"
 discussions_url_prefix="https://lists.sr.ht/~euandreh/public-inbox?search="
 sourcecode_url_prefix="https://$domain/git/$domain/tree/"
+author='EuAndreh'
+lang='en'
diff --git a/v2/src/lib/base.en.conf b/v2/src/lib/base.en.conf
index 89344fb..6090d54 100644
--- a/v2/src/lib/base.en.conf
+++ b/v2/src/lib/base.en.conf
@@ -1,3 +1,7 @@
 date_fmt='%B %-d, %Y'
 
 site_name="EuAndreh's website"
+
+about='About'
+
+about_url_name='about.html'
diff --git a/v2/src/lib/base.pt.conf b/v2/src/lib/base.pt.conf
index 89344fb..6090d54 100644
--- a/v2/src/lib/base.pt.conf
+++ b/v2/src/lib/base.pt.conf
@@ -1,3 +1,7 @@
 date_fmt='%B %-d, %Y'
 
 site_name="EuAndreh's website"
+
+about='About'
+
+about_url_name='about.html'
diff --git a/v2/src/lib/postamble.en.html b/v2/src/lib/postamble.en.html
deleted file mode 100644
index 485d81c..0000000
--- a/v2/src/lib/postamble.en.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>
-  <a href="@mailto_uri@">Comment</a>
-  and see
-  <a href="@discussions_url@">existing discussions</a>
-  |
-  <a href="@sourcecode_url@">view source</a>
-</p>
diff --git a/v2/src/lib/postamble.html b/v2/src/lib/postamble.html
new file mode 100644
index 0000000..ada5524
--- /dev/null
+++ b/v2/src/lib/postamble.html
@@ -0,0 +1,36 @@
+<p>
+  <a href="@mailto_uri@">Comment</a>
+  and see
+  <a href="@discussions_url@">existing discussions</a>
+  |
+  <a href="@sourcecode_url@">view source</a>
+</p>
+
+
+        <p class="post-footer">
+          <a href="mailto:~euandreh/public-inbox@lists.sr.ht?Subject=Re%3A%20$URI_TITLE">Comment</a>
+          and see
+          <a href="https://lists.sr.ht/~euandreh/public-inbox?search=$URI_TITLE">existing discussions</a>
+          |
+          <a href="https://euandre.org/git/euandre.org/tree/$FILENAME">view source</a>
+        </p>
+      </article>
+    </main>
+    <footer>
+      <hr />
+      <ul>
+        <li>
+          <img class="svg-icon" src="$(url-for 'static/envelope.svg')" alt="a envelope icon representing an email address" />
+          <a href="mailto:$email">$email</a>
+        </li>
+        <li>
+          <img class="svg-icon" src="$(url-for 'static/lock.svg')" alt="a lock icon representing a GPG public key" />
+          <a href="$(url-for 'static/public.asc.txt')">81F90EC3CD356060</a>
+        </li>
+      </ul>
+      <p>
+        The content for this site is licensed under <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.  The <a href="https://euandre.org/git/euandre.org">code</a> is <a rel="license" href="https://euandre.org/git/euandre.org/tree/COPYING">AGPLv3 or later</a>.  Patches welcome.
+      </p>
+    </footer>
+  </body>
+</html>
diff --git a/v2/src/lib/postamble.pt.html b/v2/src/lib/postamble.pt.html
deleted file mode 100644
index 2e65735..0000000
--- a/v2/src/lib/postamble.pt.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>
-  <a href="@mailto_uri@">Comment</a> and see <a
-href="@discussions_url@">existing discussions</a> | <a
-href="@sourcecode_url@">view source</a>
-</p>
diff --git a/v2/src/lib/preamble.en.html b/v2/src/lib/preamble.html
index 9ea6780..3eac6ea 100644
--- a/v2/src/lib/preamble.en.html
+++ b/v2/src/lib/preamble.html
@@ -6,9 +6,9 @@
     <link rel="stylesheet" type="text/css"      href="$style_url" />
     <link rel="icon"       type="image/svg+xml" href="$favicon_url" />
 
-    <title>$(htmlesc "$title")</title>
+    <title>$title_html</title>
 
-    <meta name="author" content="EuAndreh" />
+    <meta name="author" content="$author" />
     <meta property="og:site_name" content="$site_name" />
     <meta property="og:locale"    content="$lang" />
     <meta property="og:title"     content="$title_html" />
@@ -20,18 +20,18 @@
     <header>
       <nav>
         <ul>
-          <a href="$lang_url">EuAndreh</a>
-          <a href="$(url-for 'about.html')">About</a>
+          <a href="$homepage_url">$author</a>
+          <a href="$about_url">$about</a>
         </ul>
       </nav>
       <hr />
     </header>
     <main>
       <article>
+        dollar emit_body
         <h1>
           $title_html
         </h1>
         <p class="timestamp">
-          Posted on <time datetime="$date">$date_formatted</time>
+          FIXME Posted on <time datetime="$date">$date_formatted</time>
         </p>
-EOF
diff --git a/v2/src/lib/preamble.pt.html b/v2/src/lib/preamble.pt.html
deleted file mode 100644
index 9800470..0000000
--- a/v2/src/lib/preamble.pt.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html lang="$lang">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="stylesheet" type="text/css"      href="$style_url" />
-    <link rel="icon"       type="image/svg+xml" href="$favicon_url" />
-
-    <title>$(htmlesc "$title")</title>
-
-    <meta name="author" content="EuAndreh" />
-    <meta property="og:site_name" content="$site_name" />
-    <meta property="og:locale"    content="$lang" />
-    <meta property="og:title"     content="$title_html" />
-
-    <link rel="canonical"      href="$url" />
-    <meta property="og:url" content="$url" />
-  </head>
-  <body>
-    <header>
-      <nav>
-        <ul>
-          <a href="$lang_url">EuAndreh</a> <a href="$(url-for 'about.html')">About</a>
-        </ul>
-      </nav>
-      <hr />
-    </header>
-    <main>
-      <article>
-        <h1>
-          $title_html
-        </h1>
-        <p class="timestamp">
-          Posted on <time datetime="$date">$date_formatted</time>
-        </p>
-EOF