simplify title logic

[~bandali/bndl.org] / contact.html

diff --git a/contact.html b/contact.html
index b80b4a9..0776021 100644 (file)
--- a/contact.html
+++ b/contact.html
@@ -1,70 +1,63 @@
-<!--# include virtual="common/header.html" -->
-<meta
-  name="description"
-  content="Amin Bandali&rsquo;s contact information"/>
-<title>Contact - Amin Bandali</title>
-<!--#set var="bpage" value="Contact" -->
-<!--# include virtual="common/banner.html" -->
-<main>
-  <section>
-    <h2 id="contact">Contact</h2>
-    <p>
-      Email is my preferred method of communication.  Feel free to
-      write to me at any of the addresses listed on either of my
-      <a href="./#contact">home</a> or <a href="gpg.html">gpg</a>
-      pages.  Besides email, you could also try reaching me via
-    </p>
+<!--# set var="title" value="Contact Information" -->
+<!--# include virtual="/ssi/pre.html" -->
+<article>
+<h1>Contact information</h1>
+<p>Email is by far my preferred method of communication.  I may be
+contacted at any of the following addresses (choose the one most
+closely related):</p>

 
 

-    <table class="btable">
-      <tbody>
-        <tr>
-          <td>irc</td>
-          <td>
-            <code>bandali</code> on
-            <a href="https://freenode.net">freenode</a> and
-            <a href="https://wiki.mozilla.org/IRC">moznet</a>
-          </td>
-        </tr>
-        <tr>
-          <td>xmpp</td>
-          <td><a href="xmpp:bandali@member.fsf.org">
-            <code>bandali@member.fsf.org</code></a>
-          </td>
-        </tr>
-        <tr>
-          <td>matrix</td>
-          <td><a href="https://matrix.to/#/@bandali:matrix.org">
-            <code>@bandali:matrix.org</code></a>
-          </td>
-        </tr>
-        <tr>
-          <td>fediverse</td>
-          <td><a href="https://pleroma.site/bandali">
-            <code>@bandali@pleroma.site</code></a>
-          </td>
-        </tr>
-      </tbody>
-    </table>
+<ul>
+<li>bandali@gnu.org</li>
+<li>bandali@uwaterloo.ca</li>
+<li>bandali@csclub.uwaterloo.ca</li>
+</ul>

 
 

-    <p>
-      You can also find me at a few other places online.  Stricken
-      through accounts are those I don&rsquo;t use anymore, unless
-      absolutely necessary.
-    </p>
-    <ul>
-      <li><a href="https://libreplanet.org/wiki/User:Bandali">Bandali</a> on LibrePlanet</li>
-      <li><a href="https://savannah.gnu.org/users/bandali">bandali</a> on Savannah</li>
-      <li><a href="https://git.sr.ht/~bandali">bandali</a> on Sourcehut</li>
-      <li><a href="https://lobste.rs/u/bandali">bandali</a> on Lobsters</li>
-      <li><a href="https://hackage.haskell.org/user/bandali">bandali</a> on Hackage</li>
-      <li><a href="https://gitlab.com/bandali">bandali</a> on GitLab</li>
-      <li><a href="https://news.ycombinator.com/user?id=bandali">bandali</a> on HN</li>
-      <li><a href="https://keybase.io/bandali">bandali</a> on Keybase</li>
-      <li><a href="https://www.reddit.com/u/bandali">bandali</a> on reddit</li>
-      <li><strike><a href="https://www.reddit.com/u/aminb">aminb</a> on reddit</strike></li>
-      <li><strike><a href="https://github.com/aminbandali">aminbandali</a> on GitHub</strike></li>
-      <li><strike><a href="https://twitter.com/bandaliamin">bandaliamin</a> on Twitter</strike></li>
-    </ul>
-  </section>
-</main>
-<!--# include virtual="common/footer.html" -->
+<p>If you want to send me GPG-encrypted mail, you can use my
+<a href="bandali-pubkey.txt">public key</a> with the
+fingerprint&nbsp;<code>BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103</code>.</p>
+
+<table>
+<tbody>
+<tr>
+<td>IRC</td>
+<td>bandali on <a href="//freenode.net">freenode</a> and
+<a href="//www.oftc.net">oftc</a></td>
+</tr>
+
+<tr>
+<td>XMPP</td>
+<td><a href="xmpp:bandali@member.fsf.org">bandali@member.fsf.org</a></td>
+</tr>
+
+<tr>
+<td>Matrix</td>
+<td><a href="//matrix.to/#/@bandali:matrix.org">@bandali:matrix.org</a></td>
+</tr>
+
+<tr>
+<td>Fediverse</td>
+<td><a href="//pleroma.site/bandali">@bandali@pleroma.site</a></td>
+</tr>
+</tbody>
+</table>
+
+<h2>Elsewhere</h2>
+<p>You may also find me at a few other places online.  Stricken
+through accounts are those I don't use anymore, unless absolutely
+necessary.</p>
+
+<ul>
+<li><a href="//savannah.gnu.org/users/bandali">bandali</a> on GNU Savannah</li>
+<li><a href="//libreplanet.org/wiki/User:Bandali">bandali</a> on LibrePlanet</li>
+<li><a href="//emacsconf.org/bandali">bandali</a> on EmacsConf</li>
+<li><a href="//git.sr.ht/~bandali">bandali</a> on Sourcehut</li>
+<li><a href="//gitlab.com/bandali">bandali</a> on GitLab</li>
+<li><a href="//lobste.rs/u/bandali">bandali</a> on Lobsters</li>
+<li><a href="//hackage.haskell.org/user/bandali">bandali</a> on Hackage</li>
+<li><a href="//news.ycombinator.com/user?id=bandali">bandali</a> on HN</li>
+<li><a href="//www.reddit.com/u/bandali">bandali</a> on reddit</li>
+<li><del><a href="//github.com/notbandali">notbandali</a> on GitHub</del></li>
+<li><del><a href="//twitter.com/notbandali">notbandali</a> on Twitter</del></li>
+</ul>
+</article>
+<!--# include virtual="/ssi/post.html" -->