From 9a4b1f6758ccdea8928f19c3b5b689da5b21ecfb Mon Sep 17 00:00:00 2001
From: "Jonathan S. Katz" <jonathan.katz@excoventures.com>
Date: Thu, 21 Jan 2021 11:51:21 -0500
Subject: [PATCH] Update content across PGCAC website

This adds clarifications for how to donate to PGCAC, how to contact
the PGCAC board, and fixes various typos and HTML errors.
---
 templates/base.html                |  1 +
 templates/pages/about/contact.html | 16 ++++++++++++++++
 templates/pages/about/pgcac.html   |  7 ++++++-
 templates/pages/domains/list.html  |  2 +-
 templates/pages/index.html         | 13 ++++++++-----
 5 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 templates/pages/about/contact.html

diff --git a/templates/base.html b/templates/base.html
index dbbb43c..113422e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -51,6 +51,7 @@
            <li><a href="/domains/list">Domain Names</li>
            <li><a href="/about/privacypolicy/">Privacy Policy</a></li>
            <li><a href="/about/website/">Website</a></li>
+           <li><a href="/about/contact/">Contact</a></li>
          </ul>
        </div>
       </div>
diff --git a/templates/pages/about/contact.html b/templates/pages/about/contact.html
new file mode 100644
index 0000000..2678ea9
--- /dev/null
+++ b/templates/pages/about/contact.html
@@ -0,0 +1,16 @@
+{%extends "base.html" %}
+{%block title%}Contact{%endblock%}
+{%block maincontent%}
+
+<h1>Contact</h1>
+<p>
+    The PostgreSQL Community Association of Canada is a Canadian Not For Profit
+    corporation that holds assets for the PostgreSQL project such as domain
+    names and trademarks.
+</p>
+
+<p>
+  You can contact the board of the PostgreSQL Community Association of Canada at
+  <a href="mailto:board@lists.postgres.ca">board@lists.postgres.ca</a>.
+</p>
+{%endblock%}
diff --git a/templates/pages/about/pgcac.html b/templates/pages/about/pgcac.html
index 8a1ee8e..fcff91e 100644
--- a/templates/pages/about/pgcac.html
+++ b/templates/pages/about/pgcac.html
@@ -12,7 +12,7 @@
 <h2>Board Members</h2>
 <p>
     The board of the PostgreSQL Community Association of Canada currently
-    consists of the following individuals.</o>
+    consists of the following individuals.</p>
  <ul>
      <li>Dave Page (Chairman)</li>
      <li>Steve Singer (Treasurer)</li>
@@ -21,4 +21,9 @@
      <li>Peter Eisentraut</li>
      <li>Marc Fournier</li>
 </ul>
+
+<p>
+  You can contact the board of the PostgreSQL Community Association of Canada at
+  <a href="mailto:board@lists.postgres.ca">board@lists.postgres.ca</a>.
+</p>
 {%endblock%}
diff --git a/templates/pages/domains/list.html b/templates/pages/domains/list.html
index 2fa99c1..f2598f6 100644
--- a/templates/pages/domains/list.html
+++ b/templates/pages/domains/list.html
@@ -18,7 +18,7 @@
     <li>postgresql.events</li>
     <li>postgresql.org</li>
     <li>postgres.ca</li>
-    <li>postgrsql.company</li>
+    <li>postgresql.company</li>
     <li>postgresql.co.uk</li>
     <li>postgresql.uk</li>
     <li>postgres.com</li>
diff --git a/templates/pages/index.html b/templates/pages/index.html
index 5e91574..3d89600 100644
--- a/templates/pages/index.html
+++ b/templates/pages/index.html
@@ -4,14 +4,17 @@
 {% block relatedinfo %}
 <div id="pgFrontRight">
  <div class="pgFrontBox">
-  <h2>Help us out!</h2>
-  <p>In the future you will be able to help PostgreSQL Canada by donating, but in the meantime
-  why not help out in the <a href="https://www.postgresql.org/community/">PostgreSQL community</a>.
+  <h2>Donate</h2>
+  <p>
+    If you would like to help support the mission of the PostgreSQL Community
+    Association of Canada (PGCAC) through a donation or other means, please
+    contact the PGCAC board at
+    <a href="mailto:board@lists.postgres.ca">board@lists.postgres.ca</a>.
   </p>
  </div>
 
  <div class="pgFrontBox">
-  <h2>Other usergroups</h2>
+  <h2>Other Organisations</h2>
   <ul>
    <li><a href="https://www.postgresql.eu/">PostgreSQL Europe</a></li>
    <li><a href="https://www.postgresql.us/">PostgreSQL US</a></li>
@@ -19,7 +22,7 @@
  </div>
 
  <div class="pgFrontBox">
-  <h2>Related organisations</h2>
+  <h2>Related</h2>
   <ul>
    <li><a href="https://www.postgresql.org/">PostgreSQL</a></li>
   </ul>
-- 
2.39.5