diff --git a/config.yaml b/config.yaml
index f9c50be9699cd28b7cf47add2be28a61b5a6abc4..f6f8b6400af835c2231b9e0b290fa7f7f21bd1dc 100644
--- a/config.yaml
+++ b/config.yaml
@@ -3,11 +3,25 @@ languageCode: en-us
title: Briar
theme: briar
+Bla:
+ test: bla
+
+
Params:
flatterid: 4pq200
Author:
- name: Briar Team
+ main:
+ - identifier: torsten
+ name: Torsten Grote
+ # String to hex encoder: http://www.wbwip.com/wbw/emailencoder.html
+ email: "torsten@briarproject.org"
+ keyurl: https://grobox.de/gpg/0x74DCA8A36C52F833.asc
+
+ - identifier: michael
+ name: Michael Rogers
+ email: "contact@briarproject.org"
+ keyurl: /keys/contact.asc
permalinks:
#post: /:section/:year/:month/:title/
diff --git a/content/hiring/2018-05-java-developer.md b/content/hiring/2018-05-java-developer.md
index db8bdd204ac737140c491192823363e13c54c11b..f54b91046ffa754dfe225cf82e91ded3212a9ea3 100644
--- a/content/hiring/2018-05-java-developer.md
+++ b/content/hiring/2018-05-java-developer.md
@@ -4,9 +4,7 @@ date: 2018-05-01T00:00:00+01:00
---
Sorry, this position is no longer available. If you'd like to hear about
-future vacancies, please email {{<hidingemail
- email="gro.tcejorprairb@tcatnoc"
- pgplink="/keys/contact.asc" >}}.
+future vacancies, please email {{< contactemail >}}.
If you're interested in getting involved as a volunteer, please [join
the development mailing
diff --git a/content/hiring/2018-05-usability-consultant.md b/content/hiring/2018-05-usability-consultant.md
index d2c7df25b4e5f2d42b23277e02b944a5a94c146c..0d3945d0b8dd42b8d2ad3f9834de6fb846f36d09 100644
--- a/content/hiring/2018-05-usability-consultant.md
+++ b/content/hiring/2018-05-usability-consultant.md
@@ -4,9 +4,7 @@ title: Usability Consultant
---
Sorry, this position is no longer available. If you'd like to hear about
-future vacancies, please email {{<hidingemail
- email="gro.tcejorprairb@tcatnoc"
- pgplink="/keys/contact.asc" >}}.
+future vacancies, please email {{< contactemail >}}.
If you're interested in getting involved as a volunteer, please [join
the development mailing
diff --git a/content/hiring/2018-05-ux-designer.md b/content/hiring/2018-05-ux-designer.md
index c1ee85f0a0646f8e4d9abed4d390b5a475a537e5..d57b4a2b632fe35e69a2416a6b0595d95613fed8 100644
--- a/content/hiring/2018-05-ux-designer.md
+++ b/content/hiring/2018-05-ux-designer.md
@@ -4,9 +4,7 @@ title: UX Designer
---
Sorry, this position is no longer available. If you'd like to hear about
-future vacancies, please email {{<hidingemail
- email="gro.tcejorprairb@tcatnoc"
- pgplink="/keys/contact.asc" >}}.
+future vacancies, please email {{< contactemail >}}.
If you're interested in getting involved as a volunteer, please [join
the development mailing
diff --git a/content/news/2017-beta-released-security-audit.md b/content/news/2017-beta-released-security-audit.md
index c1738f8d1b74fc2b27bdc3dad7a6c4b0f488fe78..0a76bacaf44ddf519038374bbd39dd2d3535960e 100644
--- a/content/news/2017-beta-released-security-audit.md
+++ b/content/news/2017-beta-released-security-audit.md
@@ -87,14 +87,6 @@ Project](https://web.archive.org/web/20160413063937/https://www.openitp.org/),
[Access](https://accessnow.org/) and the [Open Technology
Fund](https://www.opentech.fund).
-### Contact
-
-Torsten Grote {{<hidingemail
- email="<gro.tcejorprairb@netsrot>"
- pgplink="https://grobox.de/gpg/0x74DCA8A36C52F833.asc" >}}
-
-Michael Rogers{{<hidingemail
- email="gro.tcejorprairb@tcatnoc"
- pgplink="/keys/contact.asc" >}}
+{{<contact>}}
[@BriarApp](https://twitter.com/BriarApp)
diff --git a/content/news/2018-1.0-released-new-funding.md b/content/news/2018-1.0-released-new-funding.md
index 20dede6d68cdcae32afae275ef7953971902141c..c611203fef43cfdabf823e371943928226563b22 100644
--- a/content/news/2018-1.0-released-new-funding.md
+++ b/content/news/2018-1.0-released-new-funding.md
@@ -87,12 +87,6 @@ Fund](https://www.opentech.fund).
### Contact
-Torsten Grote {{<hidingemail
- email="<gro.tcejorprairb@netsrot>"
- pgplink="https://grobox.de/gpg/0x74DCA8A36C52F833.asc" >}}
-
-Michael Rogers{{<hidingemail
- email="gro.tcejorprairb@tcatnoc"
- pgplink="/keys/contact.asc" >}}
+{{< contact >}}
[@BriarApp](https://twitter.com/BriarApp)
diff --git a/content/news/2018-briar-1.1-released.md b/content/news/2018-briar-1.1-released.md
index 0009a0ee5f43b9afdf8267622288a1aca99e4455..952387654349d78770828058088131c665f836e2 100644
--- a/content/news/2018-briar-1.1-released.md
+++ b/content/news/2018-briar-1.1-released.md
@@ -86,12 +86,6 @@ Fund](https://prototypefund.de/).
### Contact
-Torsten Grote {{<hidingemail
- email="<gro.tcejorprairb@netsrot>"
- pgplink="https://grobox.de/gpg/0x74DCA8A36C52F833.asc" >}}
-
-Michael Rogers{{<hidingemail
- email="gro.tcejorprairb@tcatnoc"
- pgplink="/keys/contact.asc" >}}
+{{< contact >}}
Twitter: [@BriarApp](https://twitter.com/BriarApp)
diff --git a/content/page/about.md b/content/page/about.md
index 97ae0c42bc10072da54ee961991dfb1847e3f14b..d0c8b601e1e01b1a527cb858be230adce153f44c 100644
--- a/content/page/about.md
+++ b/content/page/about.md
@@ -53,6 +53,4 @@ Fund](https://www.opentech.fund/), the [Prototype
Fund](https://prototypefund.de/), and
[Internews](https://www.internews.org/).
-To contact the team, please email {{<hidingemail
- email="gro.tcejorprairb@tcatnoc"
- pgplink="/keys/contact.asc" >}}.
+To contact the team, please email {{<contactemail>}}.
diff --git a/content/page/download.md b/content/page/download.md
index 6b17c2a62e00a7baf41e93c543506a44722da2e7..7b330444c47792e323b853ca99ac11309d9eef1b 100644
--- a/content/page/download.md
+++ b/content/page/download.md
@@ -25,9 +25,7 @@ list](https://lists.sourceforge.net/lists/listinfo/briar-announce).
If you're interested in getting involved or following the progress of
the project, please [join the development mailing
list](https://lists.sourceforge.net/lists/listinfo/briar-devel) or email
-{{<hidingemail
- email="gro.tcejorprairb@tcatnoc"
- pgplink="/keys/contact.asc" >}}.
+{{<contactemail>}}.
All our software is open source - you can [browse the source
code](https://code.briarproject.org/briar/briar/tree/master) or [build
diff --git a/content/page/get-involved.md b/content/page/get-involved.md
index 7bc987e09101e433230eeae44b01111edf808d1e..9fdfd72b8574189732cf7d38f39bd4cfb940a069 100644
--- a/content/page/get-involved.md
+++ b/content/page/get-involved.md
@@ -12,9 +12,7 @@ experienced contributors.
If you're interested in getting involved or following the progress of
the project, please [join the development mailing
list](https://lists.sourceforge.net/lists/listinfo/briar-devel) or email
-{{<hidingemail
- email="gro.tcejorprairb@tcatnoc"
- pgplink="/keys/contact.asc" >}}. Translators
+{{<contactemail>}}. Translators
can volunteer through our [Transifex
project](https://transifex.com/otf/briar).
diff --git a/content/page/hiring.md b/content/page/hiring.md
index e09da74fe7869b01b0bdf94b72d1f9893c51585d..b377951f6f4fe34243865958006abe15ecbf3879 100644
--- a/content/page/hiring.md
+++ b/content/page/hiring.md
@@ -5,9 +5,7 @@ title: Sorry, We're Not Currently Hiring
---
We don't currently have any paid positions available. If you'd like to
-hear about future vacancies, please email {{<hidingemail
- email="gro.tcejorprairb@tcatnoc"
- pgplink="/keys/contact.asc" >}}.
+hear about future vacancies, please email {{<contactemail>}}.
If you're interested in getting involved as a volunteer, please [join
the development mailing
diff --git a/content/page/privacy.md b/content/page/privacy.md
index f37cf48e0b21e6ef56fb7301d10245436dca165e..554cb5da2b82a5c6d4da3cdfaba93e4c54b67c08 100644
--- a/content/page/privacy.md
+++ b/content/page/privacy.md
@@ -40,6 +40,4 @@ policy](https://slashdotmedia.com/privacy-statement/) applies to the
mailing lists. The list archives are public.
If you have any questions about our privacy policy, please email
-{{<hidingemail
- email="gro.tcejorprairb@tcatnoc"
- pgplink="/keys/contact.asc" >}}.
+{{<contactemail>}}.
diff --git a/themes/briar/layouts/shortcodes/contact.html b/themes/briar/layouts/shortcodes/contact.html
new file mode 100644
index 0000000000000000000000000000000000000000..90178bbee85127f9534d3e6eff74587c25535682
--- /dev/null
+++ b/themes/briar/layouts/shortcodes/contact.html
@@ -0,0 +1,22 @@
+<h3 id="contact">Contact</h3>
+<p>
+Torsten Grote <<a
+href="mailto:torsten@briarproject.org">torsten@briarproject.org</a>>
+[<a href="https://grobox.de/gpg/0x74DCA8A36C52F833.asc">PGP key</a>]
+</p>
+<p>
+Michael Rogers <<a
+href="mailto:contact@briarproject.org">contact@riarproject.org</a>>
+[<a href="/keys/contact.asc">PGP key</a>]
+</p>
+<!--
+{{ range .Site.Author.main }}
+
+<p>
+{{ .name }} <<a
+href="mailto:{{ .email | safeHTML }}">{{ .email | safeHTML }}</a>>
+[<a href="{{ .keyurl }}">PGP key</a>]
+</p>
+
+{{ end }}
+-->
diff --git a/themes/briar/layouts/shortcodes/contactemail.html b/themes/briar/layouts/shortcodes/contactemail.html
new file mode 100644
index 0000000000000000000000000000000000000000..a7b69bf4e5019f85c198cbd53be02a9717016819
--- /dev/null
+++ b/themes/briar/layouts/shortcodes/contactemail.html
@@ -0,0 +1,4 @@
+<!-- String to hex encoder: http://www.wbwip.com/wbw/emailencoder.html -->
+<a href="mailto:contact@briarproject.org"
+>contact@briarproject.org</a>
+[<a href="/keys/contact.asc">PGP key</a>]
diff --git a/themes/briar/layouts/shortcodes/hidingemail.html b/themes/briar/layouts/shortcodes/hidingemail.html
deleted file mode 100644
index 16aa37fcfdd8e1bf7c27f1c087253c89c91cea43..0000000000000000000000000000000000000000
--- a/themes/briar/layouts/shortcodes/hidingemail.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{{.Get "name" }} <span class="reverse">{{.Get "email" }}</span>
-[<a href="{{.Get "pgplink" }}">PGP key</a>]