Commit 22b6be0c authored by Chris Lamb's avatar Chris Lamb 💬

Merge the news & reports pages; they both cover "new" stuff.

parent 80c01577
...@@ -4,7 +4,7 @@ layout: default ...@@ -4,7 +4,7 @@ layout: default
<h1><a href="{{ page.url }}">{{ page.title }}</a></h1> <h1><a href="{{ page.url }}">{{ page.title }}</a></h1>
<p>&larr; <a href="{{ "/reports/" | prepend: site.baseurl }}">View all monthly reports</a></p> <p>&larr; <a href="{{ "/news/" | prepend: site.baseurl }}">View all monthly reports</a></p>
{% unless page.published %} {% unless page.published %}
<div class="col-12 alert alert-warning" role="alert"> <div class="col-12 alert alert-warning" role="alert">
......
...@@ -7,17 +7,31 @@ order: 8 ...@@ -7,17 +7,31 @@ order: 8
# News # News
{% for post in site.posts %} <br>
## [{{ post.title }}]({{ post.url | prepend: site.baseurl }}) <ul class="list-unstyled">
{% for post in site.posts limit: 4 %}
<li>
<a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
<small class="text-muted">{{ post.date | date: "%b %-d, %Y" }}</small>
</li>
{% endfor %}
</ul>
<span class="text-muted"> ## Reports
{{ post.date | date: "%b %-d, %Y" }}
</span>
{{ post.excerpt }} Every month we publish a report on what we have been up to. ([RSS/Atom feed]({{ "/blog/index.rss" | prepend: site.baseurl }}))
<a href="{{ post.url | prepend: site.baseurl }}" class="btn btn-outline-primary"> {% assign reports = site.reports | sort: 'year, month' | where: 'draft', 'false' | reverse %}
Read more… {% for x in reports %}
</a> * [{{ x.title }}]({{ x.url | prepend: site.baseurl }})
{% endfor %}
## Weekly reports
We previously published weekly reports on what we have been up to:
{% assign posts = site.blog | sort: 'published' | reverse %}
{% for x in posts %}
* [Week {{ x.week }}]({{ x.url | prepend: site.baseurl }})
{% endfor %} {% endfor %}
--- ---
layout: default
title: Reports
permalink: /reports/ permalink: /reports/
order: 6
--- ---
{% assign reports = site.reports | sort: 'year, month' | where: 'draft', 'false' | reverse %} <meta http-equiv="refresh" content="0; url={{ "/news/" | prepend: site.baseurl }}">
{% if reports.size > 0 %}
# Reports
Every month we publish a report on what we have been up to. ([RSS/Atom feed]({{ "/blog/index.rss" | prepend: site.baseurl }}))
{% for x in reports %}
* [{{ x.title }}]({{ x.url | prepend: site.baseurl }})
{% endfor %}
## Weekly reports
We previously published weekly reports on what we have been up to:
{% else %}
# Blog
Every week we publish a weekly report on what we have been up to. ([RSS/Atom feed]({{ "/blog/index.rss" | prepend: site.baseurl }}))
{% endif %}
{% assign posts = site.blog | sort: 'published' | reverse %}
{% for x in posts %}
* [Week {{ x.week }}]({{ x.url | prepend: site.baseurl }})
{% endfor %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment