From 6744c59c58ac1cb6495dea65c460e30dc460a399 Mon Sep 17 00:00:00 2001
From: "Uwe Jandt (DESY, HIFIS)" <uwe.jandt@desy.de>
Date: Wed, 23 Nov 2022 20:40:00 +0100
Subject: [PATCH] Standard link collection to subscriptions

---
 _includes/subscription_lists.md | 10 ++++++++++
 _layouts/frontpage.html         |  1 +
 faq.md                          |  7 +++----
 newsletter/index.md             |  9 +--------
 subscribe.md                    | 15 +++++++++++++++
 5 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 _includes/subscription_lists.md
 create mode 100644 subscribe.md

diff --git a/_includes/subscription_lists.md b/_includes/subscription_lists.md
new file mode 100644
index 000000000..2f2d5a0cf
--- /dev/null
+++ b/_includes/subscription_lists.md
@@ -0,0 +1,10 @@
+- Subscribe here to receive all further [**HIFIS newsletter**](https://lists.desy.de/sympa/subscribe/hifis-newsletter) issues automatically.
+- For more frequent updates, you are invited to regularly check our [**blog posts page**]({% link posts/index.html %}), and
+- Subscribe to <a class="rss-posts-button" href="{{ '/feed/news.xml' | relative_url }}"
+                       title="Subscribe to HIFIS Blog Posts RSS Feed (RSS Reader required)"
+                       type="application/atom+xml"
+                       download>
+                       <strong>HIFIS Blog Posts RSS Feed</strong>
+                    </a> (RSS Reader required)
+- Subscribe to [**AAI Announcement letter**](mailto:helmholtz-aai-announcement-subscribe@fz-juelich.de) /
+  [unsubscribe](mailto:helmholtz-aai-announcement-unsubscribe@fz-juelich.de)
diff --git a/_layouts/frontpage.html b/_layouts/frontpage.html
index 2dfc11f69..71a8bcc86 100644
--- a/_layouts/frontpage.html
+++ b/_layouts/frontpage.html
@@ -77,6 +77,7 @@
                         </div>
                         <a href="{{ 'posts/' | relative_url }}" class="btn btn-outline-secondary">All Blog Posts</a>
                         <a href="{{ 'newsletter/' | relative_url }}" class="btn btn-outline-secondary">HIFIS Newsletter</a>
+                        <a href="{{ 'subscribe' | relative_url }}" class="btn btn-outline-secondary">Subscribe</a>
                             </div>
                         </div>
                 </section>
diff --git a/faq.md b/faq.md
index f876991f3..69f6097d1 100644
--- a/faq.md
+++ b/faq.md
@@ -70,11 +70,10 @@ At the same time, the significance of a sustainable software development for the
     </summary>
     <div>
         <p>Since July 2022, HIFIS is sending quarterly newsletters via <code class="language-plaintext highlighter-rouge">newsletter@hifis.net</code>. You are invited to register to never miss any news and upcoming events! Newsletters published so far can be <a href="{% link newsletter/index.md %}">found here</a>.</p>
-        <p>Either register <a href="mailto:sympa@desy.de?subject=sub%20hifis-newsletter">by sending a registration mail</a> or
-        <a href="https://lists.desy.de/sympa/subscribe/hifis-newsletter">register here</a>, where you can also unregister.</p>
-        <p>To stay updated on general HIFIS news, you are invited to check out
-        <a href="{{ site.feed.collections.posts.path | relative_url }}">our RSS news feed</a>—besides, of course, regularly checking our website and <a href="news">news section!</a></p>
     </div>
+<div markdown=1>
+{% include subscription_lists.md %}
+</div>
 </details>
 
 <details class="my-3">
diff --git a/newsletter/index.md b/newsletter/index.md
index cc497ce25..53eac38dd 100644
--- a/newsletter/index.md
+++ b/newsletter/index.md
@@ -25,13 +25,6 @@ All previous newsletter issues can be found here.
 
 ## Subscribe and share the links:
 
-- Subscribe here to receive all further [**HIFIS newsletter**](https://lists.desy.de/sympa/subscribe/hifis-newsletter) issues automatically.
-- For more frequent updates, you are invited to regularly check our [**blog posts page**]({% link posts/index.html %}), and
-- Subscribe to <a class="rss-posts-button" href="{{ '/feed/news.xml' | relative_url }}"
-                       title="Subscribe to HIFIS Blog Posts RSS Feed (RSS Reader required)"
-                       type="application/atom+xml"
-                       download>
-                       <strong>HIFIS Blog Posts RSS Feed</strong>
-                    </a> (RSS Reader required)
+{% include subscription_lists.md %}
 
 Spread the word and share the links. Thank you!
diff --git a/subscribe.md b/subscribe.md
new file mode 100644
index 000000000..04699194b
--- /dev/null
+++ b/subscribe.md
@@ -0,0 +1,15 @@
+---
+title: Subscribe to HIFIS lists
+title_image: default
+layout: default
+excerpt:
+    Subscribe to HIFIS lists.
+---
+
+<h3>Subscription links</h3>
+
+See here for links to HIFIS newsletter, posts and specific announcement letters:
+
+{% include subscription_lists.md %}
+
+Spread the word and share the links. Thank you!
-- 
GitLab