From 9e9f9f8c64f74dbf0ef0e3ee4be3e781abe06d21 Mon Sep 17 00:00:00 2001 From: Matthew Grove Date: Tue, 3 Mar 2020 11:03:13 +0000 Subject: [PATCH] Finish redesigning site --- 2018.md | 5 + 2019.md | 39 +- 2020.md | 5 + _includes/article-page-head.html | 1 + _includes/head.html | 1 - _includes/top-app-bar.html | 2 +- _layouts/home.html | 2 +- _layouts/image-article.html | 1 + .../{year-article-list.html => year.html} | 20 +- _site/2018.html | 334 ++++++++++++++++ _site/2019.html | 115 ++---- _site/2020.html | 368 ++++++++++++++++++ _site/404.html | 3 +- _site/articles/2018/03/06/test.html | 5 +- ...n-found-so-what-are-we-doing-about-it.html | 5 +- ...oads-around-your-home-and-school-safe.html | 5 +- ...real-life-issues-inspire-sarah-govett.html | 5 +- ...ould-sky-high-aims-bring-reading-down.html | 5 +- .../articles/2019/03/06/finished-product.html | 5 +- ...arks-is-most-inspirational-woman-ever.html | 5 +- ...as-redevelopment-plans-are-called-out.html | 5 +- ...s-virtual-fantasy-or-a-virtual-prison.html | 5 +- ...what-is-in-the-patients-best-interest.html | 5 +- .../03/06/whats-next-for-reading-prison.html | 5 +- .../06/young-reporter-team-ready-to-go.html | 5 +- _site/articles/2020/03/01/test.html | 5 +- _site/articles/2020/03/02/test1.html | 5 +- _site/articles/2020/03/02/test2.html | 5 +- _site/css/article-list.css | 51 +++ _site/css/article-page.css | 5 - _site/css/global.css | 67 ++-- _site/css/home.css | 44 +-- _site/css/mdc-card-list.css | 16 - _site/css/year-article-list.css | 63 --- _site/css/year.css | 12 + _site/images/backgrounds/2018.jpg | Bin 0 -> 280549 bytes _site/index.html | 31 +- _site/js/article-page.js | 8 +- _site/sitemap.xml | 22 ++ css/article-list.css | 51 +++ css/article-page.css | 5 - css/global.css | 67 ++-- css/home.css | 44 +-- css/mdc-card-list.css | 16 - css/year-article-list.css | 63 --- css/year.css | 12 + images/backgrounds/2018.jpg | Bin 0 -> 280549 bytes index.md | 6 +- js/article-page.js | 8 +- 49 files changed, 1066 insertions(+), 496 deletions(-) create mode 100644 2018.md create mode 100644 2020.md rename _layouts/{year-article-list.html => year.html} (74%) create mode 100644 _site/2018.html create mode 100644 _site/2020.html create mode 100644 _site/css/article-list.css delete mode 100644 _site/css/mdc-card-list.css delete mode 100644 _site/css/year-article-list.css create mode 100644 _site/css/year.css create mode 100644 _site/images/backgrounds/2018.jpg create mode 100644 css/article-list.css delete mode 100644 css/mdc-card-list.css delete mode 100644 css/year-article-list.css create mode 100644 css/year.css create mode 100644 images/backgrounds/2018.jpg diff --git a/2018.md b/2018.md new file mode 100644 index 0000000..8b5ffc0 --- /dev/null +++ b/2018.md @@ -0,0 +1,5 @@ +--- +title: BBC Young Reporter +description: News articles written by Reading School students in year 8 +layout: year +--- \ No newline at end of file diff --git a/2019.md b/2019.md index 00dfd79..8b5ffc0 100644 --- a/2019.md +++ b/2019.md @@ -1,40 +1,5 @@ --- title: BBC Young Reporter description: News articles written by Reading School students in year 8 -layout: year-article-list -year: 2019 ---- - -{% if site.categories.articles %} -{% for article in site.categories.articles %} -
-
-
-

{{ article.title }}

-

- - | by {{ article.authors }} -

-
-
{{ article.description }}
-
-
- -
-
-
- - -{% endfor %} -{% else %} -
We haven't got any articles for you yet! Come back during this year's BBC Young Reporter day to see what Reading School's year 8 students have produced!
- -{% endif %} +layout: year +--- \ No newline at end of file diff --git a/2020.md b/2020.md new file mode 100644 index 0000000..8b5ffc0 --- /dev/null +++ b/2020.md @@ -0,0 +1,5 @@ +--- +title: BBC Young Reporter +description: News articles written by Reading School students in year 8 +layout: year +--- \ No newline at end of file diff --git a/_includes/article-page-head.html b/_includes/article-page-head.html index fe286cc..9688c9a 100644 --- a/_includes/article-page-head.html +++ b/_includes/article-page-head.html @@ -1,2 +1,3 @@ + diff --git a/_includes/head.html b/_includes/head.html index b5805b8..006b1ef 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -45,5 +45,4 @@ - diff --git a/_includes/top-app-bar.html b/_includes/top-app-bar.html index ae44be2..e848902 100644 --- a/_includes/top-app-bar.html +++ b/_includes/top-app-bar.html @@ -2,7 +2,7 @@
menu - BBC Young Reporter | Reading School + BBC Young Reporter | Reading School
{% include footer.html %} diff --git a/_layouts/year-article-list.html b/_layouts/year.html similarity index 74% rename from _layouts/year-article-list.html rename to _layouts/year.html index ad8eb75..9a37b0e 100644 --- a/_layouts/year-article-list.html +++ b/_layouts/year.html @@ -1,8 +1,8 @@ {% include head.html %} - - + + {% include cookie-notice.html %} @@ -15,16 +15,18 @@
-
-
-

{{ currentdate }}

- -
+ {% assign pageyear = page.url | relative_url | remove: '.html' | remove: '/' %} +
+

{{ pageyear }}

+
+
+
{% assign articles = site.categories.articles | sort: date | reverse %} {% for article in articles %} - {% if article.date | date: "%Y" == page.year %} -
+ {% assign articleyear = article.date | date: "%Y" %} + {% if pageyear == articleyear %} +

{{ article.title }}

diff --git a/_site/2018.html b/_site/2018.html new file mode 100644 index 0000000..8ea80b9 --- /dev/null +++ b/_site/2018.html @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + BBC Young Reporter | Reading School + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Just to let you know, we use cookies on our site.

+

OK

+
+ + + +
+ +
+ + +
+
+
+
+ menu + BBC Young Reporter | Reading School +
+ +
+
+ + +
+
+ +
+

2018

+
+
+
+
+ + + + +
+
+
+

A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It?

+

+ + | by Luke H +

+
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ +
+ + diff --git a/_site/2019.html b/_site/2019.html index 83dcd7d..f179e25 100644 --- a/_site/2019.html +++ b/_site/2019.html @@ -47,11 +47,10 @@ - - - + +
@@ -235,7 +234,7 @@
menu - BBC Young Reporter | Reading School + BBC Young Reporter | Reading School