Merge branch 'blog-posts-vs-newsletter' into 'master'

Blog posts vs newsletter

See merge request !632

_config.yml

@@ -87,7 +87,7 @@ plugins:
   - 'jekyll-sitemap'
 
 paginate: 8
-paginate_path: '/news/page:num/'
+paginate_path: '/posts/page:num/'
 
 markdown: kramdown
 kramdown:

_data/navigation.yml

@@ -80,8 +80,8 @@ header:
         url: "spotlights"
   - title: "Latest & Media"
     entries:
-      - title: "News"
-        url: "news/"
+      - title: "Blog Posts"
+        url: "posts/"
       - title: "Newsletters"
         url: "newsletter/"
       - title: "Upcoming events"
@@ -91,7 +91,7 @@ header:
         entries:
           - title: 'Newsletter <i class="fas fa-bell"></i>'
             url: "https://lists.desy.de/sympa/subscribe/hifis-newsletter"
-          - title: 'News RSS feed <i class="fas fa-rss"></i>'
+          - title: 'Blog Posts RSS feed <i class="fas fa-rss"></i>'
             url: "feed/news.xml"
       - title: "Media & Materials"
         url: "media"

_layouts/frontpage.html

@@ -58,7 +58,7 @@
                 <section>
                     <div class="info-col" style="grid-template-columns: 1fr !important;">
                         <div>
-                            <h1><a href="{{ 'news/' | relative_url }}" >News</a></h1>
+                            <h1>Blog Posts and Newsletter</h1>
                         <div class="flex-cards">
                             {%- assign posts = site.posts | where:"lang", site.default.lang -%}
                             {%- for post in posts limit:5 -%}
@@ -75,18 +75,8 @@
                             {%-   endif -%}
                             {%- endfor -%}
                         </div>
-                        <a href="{{ 'news/' | relative_url }}" class="btn btn-outline-secondary">All HIFIS News</a>
-                        <a class="btn btn-outline-secondary" href="{{ '/feed/news.xml' | relative_url }}"
-                            title="Subscribe to HIFIS News RSS Feed (RSS Reader required)"
-                            type="application/atom+xml"
-                            download>
-                            News Feed <i class="fas fa-rss"></i></a>
-                        <a href="{{ 'newsletter/' | relative_url }}" class="btn btn-outline-secondary">Newsletters</a>
-                        <a href="https://lists.desy.de/sympa/subscribe/hifis-newsletter"
-                            class="btn btn-outline-secondary"
-                            title="Subscribe to HIFIS Newsletter - also unsubscribe">
-                            Subscribe <i class="fas fa-bell"></i></a>
-                        <a href="https://events.hifis.net/category/4/" class="btn btn-outline-secondary"><i class="fas fa-external-link-alt"></i> HIFIS Events</a>
+                        <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>
                             </div>
                         </div>
                 </section>

_layouts/pagination.html

 ---
-title: HIFIS
+title: HIFIS Blog Posts
 ---
 
 {% include top.html %}
@@ -29,7 +29,7 @@ title: HIFIS
                     <span> {{ page }} </span>
                     {% elsif page == 1 %}
                         <span>
-                            <a href="{{ 'news/' | relative_url }}"> {{ page }} </a>
+                            <a href="{{ 'posts/' | relative_url }}"> {{ page }} </a>
                         </span>
                     {% else %}
                         <span>
@@ -52,7 +52,7 @@ title: HIFIS
                 </div>
                 <div class="rss-posts-container grid-item">
                     <a class="rss-posts-button" href="{{ '/feed/news.xml' | relative_url }}"
-                       title="Subscribe to HIFIS News RSS Feed (RSS Reader required)"
+                       title="Subscribe to HIFIS Blog Posts RSS Feed (RSS Reader required)"
                        type="application/atom+xml"
                        download>
                         <i class="fas fa-rss"></i>
@@ -117,7 +117,7 @@ title: HIFIS
                     <span> {{ page }} </span>
                     {% elsif page == 1 %}
                         <span>
-                            <a href="{{ 'news/' | relative_url }}"> {{ page }} </a>
+                            <a href="{{ 'posts/' | relative_url }}"> {{ page }} </a>
                         </span>
                     {% else %}
                         <span>
@@ -140,7 +140,7 @@ title: HIFIS
                 </div>
                 <div class="rss-posts-container grid-item">
                     <a class="rss-posts-button" href="{{ '/feed/news.xml' | relative_url }}"
-                       title="Subscribe to HIFIS News Feed"
+                       title="Subscribe to HIFIS Blog Posts RSS Feed"
                        type="application/atom+xml"
                        download>
                         <i class="fas fa-rss"></i>

_posts/2021/05/2021-05-12-unified-homepage.md

@@ -23,7 +23,7 @@ All details, documents and explanations on HIFIS are accessible from [hifis.net]
 
 * [**hifis.net/services**]({% link services/index.md %}) -- All HIFIS Services in a nutshell.
 * [**hifis.net/events**]({% link events.md %}) -- HIFIS Events, including Courses and Community Events.
-* [**hifis.net/news**]({% link news/index.html %}) -- HIFIS News and Announcements.
+* [**hifis.net/news**]({% link posts/index.html %}) -- HIFIS News and Announcements.
 * [**hifis.net/publications**]({% link publications.md %}) -- Publications of HIFIS.
 * [**hifis.net/roadmap**]({% link roadmap/index.md %}) -- HIFIS Roadmap.
 * [**hifis.net/doc**](https://hifis.net/doc) -- HIFIS Technical and Adminstrative Documentation.

newsletter/index.md

 ---
-title: Newsletters
+title: Newsletter
 title_image: sign-pen-business-document-48148.jpg
 layout: default
 additional_css:
@@ -7,18 +7,31 @@ additional_css:
     - title/service-title-buttons.css
 additional_js: frontpage.js
 excerpt:
-    HIFIS Newsletters
+    HIFIS Newsletter
 ---
 
-HIFIS Newsletters will be published quarterly from July 2022 onwards.
+The HIFIS Newsletter will be published quarterly from July 2022 onwards.
 Find all published newsletters here in HTML and PDF formats.
 
 Feel free to distribute the links to everyone who might be interested.
 
-## Don't want to miss the next newsletter?
+## Subscribe and share the links
 
-[**Subscribe here**](https://lists.desy.de/sympa/subscribe/hifis-newsletter) to receive all further newsletters automatically. Spread the word and share the link. Thank you!
+- 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)
 
-## Published Newsletters so far:
+
+Spread the word and share the links. Thank you!
+
+## Published Newsletter Issues so far:
+
+All previous newsletter issues can be found here.
 
 - July 2022: [HTML]({% link newsletter/2022-07/2022-07-HIFIS-Newsletter.html %}), [PDF]({% link newsletter/2022-07/2022-07-HIFIS-Newsletter.pdf %})
+- _More to come!_

news/index.html → posts/index.html

 ---
-title: News
+title: Blog Posts
 title_image: default
 layout: pagination
+redirect_from:
+    - news
+    - news/
 ---