Use hardcoded email in the shortcode until a working solution is there

* Rename shortcode hidingemail.html to contact.html
* Change content/ pages to new contact shortcodes

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/

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

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

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

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)

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)

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)

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>}}.

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

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).
 

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

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>}}.

themes/briar/layouts/shortcodes/contact.html

+<h3 id="contact">Contact</h3>
+<p>
+Torsten Grote <<a
+href="mailto:torsten&#64;briarproject.org">torsten&#64;briarproject.org</a>>
+[<a href="https://grobox.de/gpg/0x74DCA8A36C52F833.asc">PGP key</a>]
+</p>
+<p>
+Michael Rogers <<a
+href="mailto:contact&#64;briarproject.org">contact&#64;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 }}
+-->

themes/briar/layouts/shortcodes/contactemail.html

+<!-- String to hex encoder: http://www.wbwip.com/wbw/emailencoder.html -->
+<a href="mailto:contact&#064;briarproject.org"
+>contact&#064;briarproject.org</a>
+[<a href="/keys/contact.asc">PGP key</a>]

themes/briar/layouts/shortcodes/hidingemail.html

-{{.Get "name" }} <span class="reverse">{{.Get "email" }}</span>
-[<a href="{{.Get "pgplink" }}">PGP key</a>]