projects / ~bandali / bndl.org / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: dc20106)
enable and use SSI for ‘common’ bits used in all pages
authorAmin Bandali <bandali@gnu.org>
Mon, 10 Jun 2019 06:32:10 +0000 (02:32 -0400)
committerAmin Bandali <bandali@gnu.org>
Mon, 10 Jun 2019 06:33:01 +0000 (02:33 -0400)
common/banner.html [new file with mode: 0644] patch | blob
common/footer.html [new file with mode: 0644] patch | blob
common/head.html [new file with mode: 0644] patch | blob
common/header.html [new file with mode: 0644] patch | blob
contact.html patch | blob | blame | history
gpg.html patch | blob | blame | history
index.html patch | blob | blame | history

diff --git a/common/banner.html b/common/banner.html
new file mode 100644 (file)
index 0000000..a6cd2c3
--- /dev/null
+++ b/common/banner.html
@@ -0,0 +1,19 @@
+</head>
+<body>
+<header>
+  <h1>
+    <!--# if expr="$bpage = Home" -->
+    <a href="images/amin-with-rms.png">Amin Bandali</a>&rsquo;s personal site
+    <!--# else -->
+    Amin Bandali&rsquo;s personal site
+    <!--# endif -->
+  </h1>
+  <span id="sub">
+    <!--# if expr="$bpage = Home" -->
+    Graduate student at University of Waterloo supervised by
+    <a href="https://cs.uwaterloo.ca/~nday/">Nancy Day</a>
+    <!--# else -->
+    <a href="/">Home</a> &rarr; <!--# echo var="bpage" -->
+    <!--# endif -->
+  </span>
+</header>
diff --git a/common/footer.html b/common/footer.html
new file mode 100644 (file)
index 0000000..6ad61c8
--- /dev/null
+++ b/common/footer.html
@@ -0,0 +1,9 @@
+<footer>
+  <p>
+    Copyright (c) 2016&ndash;2019 Amin Bandali<br>
+    Verbatim copying and redistribution of this entire page are
+    permitted provided this notice is preserved.
+  </p>
+</footer>
+</body>
+</html>
diff --git a/common/head.html b/common/head.html
new file mode 100644 (file)
index 0000000..af72609
--- /dev/null
+++ b/common/head.html
@@ -0,0 +1,3 @@
+<meta charset="utf-8">
+<meta name=viewport content="width=device-width, initial-scale=1">
+<link rel="stylesheet" href="/style.css" />
diff --git a/common/header.html b/common/header.html
new file mode 100644 (file)
index 0000000..29f878d
--- /dev/null
+++ b/common/header.html
@@ -0,0 +1,4 @@
+<!doctype html>
+<html lang="en">
+<head>
+<!--# include virtual="/common/head.html" -->
diff --git a/contact.html b/contact.html
index e3abab6..18ed4ed 100644 (file)
--- a/contact.html
+++ b/contact.html
@@ -1,88 +1,69 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name=viewport content="width=device-width, initial-scale=1">
-    <meta name="description"
-          content="Amin Bandali&rsquo;s contact information"/>
-    <title>Contact - Amin Bandali</title>
-    <link rel="stylesheet" href="/style.css" />
-  </head>
-  <body>
-    <header>
-      <h1>Amin Bandali&rsquo;s personal site</h1>
-      <span id="sub">
-        <a href="/">Home</a> &rarr; Contact
-      </span>
-    </header>
+<!--# 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 my academic or personal address listed on my
+      <a href="/#contact">home page</a>.  Besides email, you could
+      try reaching me via
+    </p>
 
 
-    <main>
-      <section>
-        <h2 id="contact">Contact</h2>
-        <p>
-          Email is my preferred method of communication.  Feel free to
-          write to me at my academic or personal address listed on my
-          <a href="/#contact">home page</a>.  Besides email, you could
-          try reaching me via
-        </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/aminb">
+            <code>aminb@pleroma.site</code></a>
+          </td>
+        </tr>
+      </tbody>
+    </table>
 
 
-        <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/aminb">
-                <code>aminb@pleroma.site</code></a>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-
-        <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://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://keybase.io/bandali">bandali</a> on Keybase</li>
-          <li><a href="https://news.ycombinator.com/user?id=bandali">bandali</a> on HN</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/aminb">aminb</a> on GitHub</strike></li>
-          <li><strike><a href="https://twitter.com/aminban">aminban</a> on Twitter</strike></li>
-        </ul>
-      </section>
-    </main>
-    <footer>
-      <p>
-        Copyright (c) 2018 Amin Bandali<br>
-        Verbatim copying and redistribution of this entire page are
-        permitted provided this notice is preserved.
-      </p>
-    </footer>
-  </body>
-</html>
+    <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://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://keybase.io/bandali">bandali</a> on Keybase</li>
+      <li><a href="https://news.ycombinator.com/user?id=bandali">bandali</a> on HN</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/aminb">aminb</a> on GitHub</strike></li>
+      <li><strike><a href="https://twitter.com/aminban">aminban</a> on Twitter</strike></li>
+    </ul>
+  </section>
+</main>
+<!--# include virtual="/common/footer.html" -->
diff --git a/gpg.html b/gpg.html
index fbd1f95..b548081 100644 (file)
--- a/gpg.html
+++ b/gpg.html
@@ -1,29 +1,19 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name=viewport content="width=device-width, initial-scale=1">
-    <meta name="description" content="Amin Bandali&rsquo;s GPG keys,
-                for sending him GPG-encrypted mail."/>
-    <title>GPG Keys - Amin Bandali</title>
-    <link rel="stylesheet" href="/style.css" />
-  </head>
-  <body>
-    <header>
-      <h1>Amin Bandali&rsquo;s personal site</h1>
-      <span id="sub">
-        <a href="/">Home</a> &rarr; GPG Keys
-      </span>
-    </header>
-
-    <main>
-      <section>
-        <h2 id="gpg">GPG Keys</h2>
-        <p>
-          If you want to send me GPG-encrypted mail, you can use my
-          <a href="bandali-pubkey.txt">current key</a>: 
-        </p>
-        <pre>
+<!--# include virtual="/common/header.html" -->
+<meta
+  name="description"
+  content="Amin Bandali&rsquo;s GPG keys, for sending him
+        GPG-encrypted mail."/>
+<title>GPG Keys - Amin Bandali</title>
+<!--#set var="bpage" value="GPG Keys" -->
+<!--# include virtual="/common/banner.html" -->
+<main>
+  <section>
+    <h2 id="gpg">GPG Keys</h2>
+    <p>
+      If you want to send me GPG-encrypted mail, you can use my
+      <a href="bandali-pubkey.txt">current key</a>:
+    </p>
+    <pre>
 pub   rsa4096 2018-10-17 [C] [expires: 2020-10-16]
       BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103
 uid           [ultimate] Amin Bandali &lt;bandali@gnu.org&gt;
 pub   rsa4096 2018-10-17 [C] [expires: 2020-10-16]
       BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103
 uid           [ultimate] Amin Bandali &lt;bandali@gnu.org&gt;
@@ -33,21 +23,13 @@ sub   rsa4096 2018-10-17 [E] [expires: 2020-10-16]
       43ED 5F7C F5EC CBDF 2552  FE98 1D52 D14E BCF3 BE08
 sub   rsa4096 2018-10-17 [A] [expires: 2020-10-16]
       70FB 9AAD 5240 2841 2B14  8685 4040 DFEC 6EC1 3F3A
       43ED 5F7C F5EC CBDF 2552  FE98 1D52 D14E BCF3 BE08
 sub   rsa4096 2018-10-17 [A] [expires: 2020-10-16]
       70FB 9AAD 5240 2841 2B14  8685 4040 DFEC 6EC1 3F3A
-        </pre>
+    </pre>
 
 
-        <p>
-          You may find other keys with my name on keyservers or around
-          the internet, but they are either old keys of mine that I no
-          longer have access to, or not mine at all.
-        </p>
-      </section>
-    </main>
-    <footer>
-      <p>
-        Copyright (c) 2018 Amin Bandali<br>
-        Verbatim copying and redistribution of this entire page are
-        permitted provided this notice is preserved.
-      </p>
-    </footer>
-  </body>
-</html>
+    <p>
+      You may find other keys with my name on keyservers or around
+      the internet, but they are either old keys of mine that I no
+      longer have access to, or not mine at all.
+    </p>
+  </section>
+</main>
+<!--# include virtual="/common/footer.html" -->
diff --git a/index.html b/index.html
index 0bb507f..fb82602 100644 (file)
--- a/index.html
+++ b/index.html
@@ -1,149 +1,129 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name=viewport content="width=device-width, initial-scale=1">
-    <meta name="description" content="Amin Bandali is a graduate
-                student at WatForm, the co-host of the Emacs.el
-                podcast, a free software advocate, and a volunteer
-                webmaster for the GNU project."/>
-    <title>Amin Bandali</title>
-    <link rel="stylesheet" href="/style.css" />
-  </head>
-  <body>
-    <header>
-      <h1><a href="images/amin.png">Amin Bandali</a>&rsquo;s personal site</h1>
-      <span id="sub">
-        Graduate student at University of Waterloo supervised by
-        <a href="https://cs.uwaterloo.ca/~nday/">Nancy Day</a>
-      </span>
-    </header>
+<!--# include virtual="/common/header.html" -->
+<meta
+  name="description"
+  content="Amin Bandali is a graduate student at WatForm, the
+        co-host of the Emacs.el podcast, a free software advocate,
+        and a volunteer webmaster for the GNU project."/>
+<title>Amin Bandali</title>
+<!--#set var="bpage" value="Home" -->
+<!--# include virtual="/common/banner.html" -->
+<main>
+  <section>
+    <h2 id="contact">Contact</h2>
+    <table class="btable">
+      <tbody>
+        <tr>
+          <th></th>
+          <th>academic</th>
+          <th>personal</th>
+        </tr>
+        <tr>
+          <td>email</td>
+          <td><a href="mailto:abandali@uwaterloo.ca">abandali@uwaterloo.ca</a></td>
+          <td><a href="mailto:bandali@gnu.org">bandali@gnu.org</a>
+            (<a href="gpg">gpg</a>)</td>
+        </tr>
+        <tr>
+          <td>git repos</td>
+          <td><a href="https://git.uwaterloo.ca/abandali">git.uwaterloo.ca/abandali</a></td>
+          <td><a href="https://git.sr.ht/~bandali">git.sr.ht/~bandali</a></td>
+        </tr>
+        <tr>
+          <td>other means</td>
+          <td>see <a href="contact">contact</a> page</td>
+        </tr>
+      </tbody>
+    </table>
+  </section>
 
 
-    <main>
-      <section>
-        <h2 id="contact">Contact</h2>
-        <table class="btable">
-          <tbody>
-            <tr>
-              <th></th>
-              <th>academic</th>
-              <th>personal</th>
-            </tr>
-            <tr>
-              <td>email</td>
-              <td><a href="mailto:abandali@uwaterloo.ca">abandali@uwaterloo.ca</a></td>
-              <td><a href="mailto:bandali@gnu.org">bandali@gnu.org</a>
-                (<a href="gpg">gpg</a>)</td>
-            </tr>
-            <tr>
-              <td>git repos</td>
-              <td><a href="https://git.uwaterloo.ca/abandali">git.uwaterloo.ca/abandali</a></td>
-              <td><a href="https://git.sr.ht/~bandali">git.sr.ht/~bandali</a></td>
-            </tr>
-            <tr>
-              <td>other means</td>
-              <td>see <a href="contact">contact</a> page</td>
-            </tr>
-          </tbody>
-        </table>
-      </section>
+  <section>
+    <h2 id="research-interests">Research interests</h2>
+    <p>
+      The main goal of my research is improving
+      <strong>software&nbsp;reliability</strong>
+      through application of <em>formal methods</em>.
+    </p>
 
 
-      <section>
-        <h2 id="research-interests">Research interests</h2>
-        <p>
-          The main goal of my research is improving
-          <strong>software&nbsp;reliability</strong>
-          through application of <em>formal methods</em>.
-        </p>
+    <p>
+      My current research at <a href="https://watform.uwaterloo.ca">WatForm</a>
+      focuses on formal logic, model checking, and verification.
+      Specifically, I am working on various optimizations aiming to
+      improve the analysis performance of the Alloy Analyzer on
+      models.
+    </p>
 
 
-        <p>
-          My current research at <a href="https://watform.uwaterloo.ca">WatForm</a>
-          focuses on formal logic, model checking, and verification.
-          Specifically, I am working on various optimizations aiming to
-          improve the analysis performance of the Alloy Analyzer on
-          models.
-        </p>
+    <p>
+      I am also interested in programming languages, type systems, and
+      interactive theorem proving.
+    </p>
 
 
-        <p>
-          I am also interested in programming languages, type systems, and
-          interactive theorem proving.
-        </p>
+    <p>
+      On the side, I dabble in <a href="https://leanprover.github.io">Lean</a>
+      and enjoy <a href="https://stallman.org/articles/on-hacking.html">hacking</a> on
+      <a href="https://www.gnu.org/software/emacs/manual/elisp.html">Emacs Lisp</a>.
+      I&rsquo;m also a <a href="https://www.gnu.org/philosophy/free-sw.en.html">free software</a>
+      and <a href="https://www.gnu.org/licenses/copyleft.en.html">copyleft</a>
+      advocate, and a volunteer webmaster for the GNU project.
+    </p>
 
 
-        <p>
-          On the side, I dabble in <a href="https://leanprover.github.io">Lean</a>
-          and enjoy <a href="https://stallman.org/articles/on-hacking.html">hacking</a> on
-          <a href="https://www.gnu.org/software/emacs/manual/elisp.html">Emacs Lisp</a>.
-          I&rsquo;m also a <a href="https://www.gnu.org/philosophy/free-sw.en.html">free software</a>
-          and <a href="https://www.gnu.org/licenses/copyleft.en.html">copyleft</a>
-          advocate, and a volunteer webmaster for the GNU project.
-        </p>
+    <p>
+      You may wish to view my academic <a href="bandali-cv.pdf">curriculum vitae</a>.
+    </p>
+  </section>
 
 
-        <p>
-          You may wish to view my academic <a href="bandali-cv.pdf">curriculum vitae</a>.
-        </p>
-      </section>
+  <section>
+    <h2 id="publications">Publications</h2>
+    <dl>
+      <dt>
+        <strong>A Comparison of the Declarative Modelling
+          Languages B, Dash, and TLA<sup>+</sup></strong>
+        (<a href="papers/2018-AbBaDaSe-modre.pdf">pdf</a>,
+        <a href="papers/2018-AbBaDaSe-modre.bib">bib</a>,
+        <a href="https://doi.org/10.1109/MoDRE.2018.00008">doi</a>,
+        <a href="https://cs.uwaterloo.ca/~nday/models/2018-modre">models</a>)
+      </dt>
+      <dd>
+        Ali Abbassi, <strong>Amin Bandali</strong>, Nancy A. Day,
+        and Jose Serna
+      </dd>
+      <dd>
+        <em>2018 IEEE 8th International Model-Driven Requirements
+          Engineering Workshop (MoDRE)</em>
+      </dd>
+    </dl>
+    <!-- <h3 id="theses">Theses</h3> -->
+  </section>
 
 
-      <section>
-        <h2 id="publications">Publications</h2>
-        <dl>
-          <dt>
-            <strong>A Comparison of the Declarative Modelling
-            Languages B, Dash, and TLA<sup>+</sup></strong>
-            (<a href="papers/2018-AbBaDaSe-modre.pdf">pdf</a>,
-            <a href="papers/2018-AbBaDaSe-modre.bib">bib</a>,
-            <a href="https://doi.org/10.1109/MoDRE.2018.00008">doi</a>,
-            <a href="https://cs.uwaterloo.ca/~nday/models/2018-modre">models</a>)
-          </dt>
-          <dd>
-            Ali Abbassi, <strong>Amin Bandali</strong>, Nancy A. Day,
-            and Jose Serna
-          </dd>
-          <dd>
-            <em>2018 IEEE 8th International Model-Driven Requirements
-              Engineering Workshop (MoDRE)</em>
-          </dd>
-        </dl>
-        <!-- <h3 id="theses">Theses</h3> -->
-      </section>
+  <section>
+    <h2 id="presentations">Presentations</h2>
+    <dl>
+      <dt>
+        <strong>The Magic of Specifications and Type
+          Systems</strong>
+      </dt>
+      <dd><strong>Amin Bandali</strong>, Simon Hudon,
+        Jonathan Ostroff
+      </dd>
+      <dd><a href="presentations/cucsc-2017-slides.pdf">Slides</a>
+        presented at
+        <abbr title="Canadian Undergraduate Computer Science Conference">
+          CUCSC 2017</abbr>, University of Toronto, Canada, June
+        15-17, 2017.
+      </dd>
+      <dd><a href="presentations/eecs4080-poster.pdf">Poster</a>
+        presented at
+        <abbr title="Lassonde Undergraduate Summer Student Research Conference">
+          Lassonde USSR Conference</abbr>, York University, Toronto, Canada,
+        August 15, 2017.</dd>
+    </dl>
+  </section>
 
 
-      <section>
-        <h2 id="presentations">Presentations</h2>
-        <dl>
-          <dt>
-            <strong>The Magic of Specifications and Type
-              Systems</strong>
-          </dt>
-          <dd><strong>Amin Bandali</strong>, Simon Hudon,
-            Jonathan Ostroff
-          </dd>
-          <dd><a href="presentations/cucsc-2017-slides.pdf">Slides</a>
-            presented at
-            <abbr title="Canadian Undergraduate Computer Science Conference">
-              CUCSC 2017</abbr>, University of Toronto, Canada, June
-            15-17, 2017.
-          </dd>
-          <dd><a href="presentations/eecs4080-poster.pdf">Poster</a>
-            presented at
-            <abbr title="Lassonde Undergraduate Summer Student Research Conference">
-              Lassonde USSR Conference</abbr>, York University, Toronto, Canada,
-            August 15, 2017.</dd>
-        </dl>
-      </section>
-
-      <section>
-        <h2 id="writings">Writings</h2>
-        <dl>
-          <dt>Will be added soon.</dt>
-          <!-- <dd></dd> -->
-        </dl>
-      </section>
-    </main>
-    <footer>
-      <p>
-        Copyright (c) 2016&ndash;2019 Amin Bandali<br>
-        Verbatim copying and redistribution of this entire page are
-        permitted provided this notice is preserved.
-      </p>
-    </footer>
-  </body>
-</html>
+  <section>
+    <h2 id="writings">Writings</h2>
+    <dl>
+      <dt>Will be added soon.</dt>
+      <!-- <dd></dd> -->
+    </dl>
+  </section>
+</main>
+<!--# include virtual="/common/footer.html" -->
Sources for my personal site