From fec5347ef90fb0da32f416ea2b31204df0de7994 Mon Sep 17 00:00:00 2001
From: Micressor <micressor@secure.mailbox.org>
Date: Wed, 12 Dec 2018 07:43:30 +0100
Subject: [PATCH] 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 | 16 +++++++++++++-
content/hiring/2018-05-java-developer.md | 4 +---
.../hiring/2018-05-usability-consultant.md | 4 +---
content/hiring/2018-05-ux-designer.md | 4 +---
.../news/2017-beta-released-security-audit.md | 10 +--------
content/news/2018-1.0-released-new-funding.md | 8 +------
content/news/2018-briar-1.1-released.md | 8 +------
content/page/about.md | 4 +---
content/page/download.md | 4 +---
content/page/get-involved.md | 4 +---
content/page/hiring.md | 4 +---
content/page/privacy.md | 4 +---
themes/briar/layouts/shortcodes/contact.html | 22 +++++++++++++++++++
.../layouts/shortcodes/contactemail.html | 4 ++++
.../briar/layouts/shortcodes/hidingemail.html | 2 --
15 files changed, 52 insertions(+), 50 deletions(-)
create mode 100644 themes/briar/layouts/shortcodes/contact.html
create mode 100644 themes/briar/layouts/shortcodes/contactemail.html
delete mode 100644 themes/briar/layouts/shortcodes/hidingemail.html
diff --git a/config.yaml b/config.yaml
index f9c50be..f6f8b64 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 db8bdd2..f54b910 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 d2c7df2..0d3945d 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 c1ee85f..d57b4a2 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 c1738f8..0a76bac 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 20dede6..c611203 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 0009a0e..9523876 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 97ae0c4..d0c8b60 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 6b17c2a..7b33044 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 7bc987e..9fdfd72 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 e09da74..b377951 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 f37cf48..554cb5d 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 0000000..90178bb
--- /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 0000000..a7b69bf
--- /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 16aa37f..0000000
--- 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>]
--
GitLab