From 726e5a5c473812f28115ea6afd7f841767b7acd6 Mon Sep 17 00:00:00 2001
From: Alice Bowman
Date: Mon, 15 Jul 2024 15:41:30 +0200
Subject: [PATCH] revamped contact page to increase visibility
---
content/en/_index.html | 5 ++++-
content/en/contact.md | 39 -----------------------------------
content/en/contributors.html | 40 +++++++++++++++++++++++++++++++-----
layouts/partials/footer.html | 2 +-
4 files changed, 40 insertions(+), 46 deletions(-)
delete mode 100644 content/en/contact.md
diff --git a/content/en/_index.html b/content/en/_index.html
index c98694ea..abdd736a 100644
--- a/content/en/_index.html
+++ b/content/en/_index.html
@@ -177,9 +177,12 @@ Just to be sure: Verify the magic!
We provide in-depth ressources in our Documentation section.
Go to Documentation
-
+
+
+If you have further questions, please feel free to get in touch. We maintain a public Rosenpass Matrix chatroom, as well as several inboxes, for public inquiries, development questions, and general interest. Feature requests can also be opened at our GitHub pages
+Go to Contact Page
{{% /blocks/section %}}
diff --git a/content/en/contact.md b/content/en/contact.md
deleted file mode 100644
index f7d6adaf..00000000
--- a/content/en/contact.md
+++ /dev/null
@@ -1,39 +0,0 @@
-
----
-title: "Contact"
-linkTitle: "Contact"
-weight: 70
-type: community
----
-
-{{< blocks/lead color="secondary" >}}
-Contact
-{{< /blocks/lead >}}
-
-{{< blocks/section color="light" >}}
-We are happy to answer your inquiries. Note that we are a free and independent group of developers and researchers, with limited administrative resources. Your time-to-reply may therefore vary.
-See the "Terms and Conditions" link in the footer for legal information.
-
-Please direct your inquiries by e-mail as follows:
-
-#### General inquiries
-
-info@rosenpass.eu
-
-#### Security issues and bug reports
-
-security@rosenpass.eu [(Open PGP key)](/keys/security@rosenpass.eu.pub)
-
-#### Report other problems and ask for support
-
-support@rosenpass.eu
-
-#### Press contact and interview requests
-
-press@rosenpass.eu
-
-#### Matrix chat
-
-https://matrix.to/#/#rosenpass:matrix.org
-
-{{< /blocks/section >}}
\ No newline at end of file
diff --git a/content/en/contributors.html b/content/en/contributors.html
index 591f4857..f67880eb 100644
--- a/content/en/contributors.html
+++ b/content/en/contributors.html
@@ -1,7 +1,7 @@
---
-title: "Contributors"
-linkTitle: "Contributors"
+title: "Contributors & Contact"
+linkTitle: "Contributors & Contact"
weight: 50
menu:
main:
@@ -9,10 +9,41 @@
type: community
---
+{{< blocks/lead color="secondary" >}}
+
+{{< /blocks/lead >}}
+
+{{< blocks/section color="light" >}}
+We are more than happy to answer your inquiries. Please note that we are a free and independent group of developers and researchers, with limited administrative resources. Your time-to-reply may therefore vary.
+See the "Terms and Conditions" link in the footer for legal information.
+
+Please direct your inquiries by e-mail as follows:
+
+General inquiries
+
+info@rosenpass.eu
+
+Security issues and bug reports
+
+security@rosenpass.eu (Open PGP key)
+
+Report other problems and ask for support
+support@rosenpass.eu
+
+Press contact and interview requests
+
+
press@rosenpass.eu
+
+
+We also maintain a Matrix chatroom for informal queries, development and use questions, and as a broad point of contact:
+
+https://matrix.to/#/#rosenpass:matrix.org
+
+{{< /blocks/section >}}
{{< blocks/lead color="primary" >}}
-Team
+Team
{{< /blocks/lead >}}
@@ -81,7 +112,7 @@
{{< blocks/lead color="dark" >}}
-With support from
+With support from
{{< /blocks/lead >}}
@@ -107,4 +138,3 @@
{{< /blocks/section >}}
-
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index af240986..dc13e7ea 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,7 +1,7 @@
{{ $links := .Site.Params.links }}
Website and mail hosting sponsored by Servercow.