From fa40e6fd0e56ccde08362ab14745952eb16c37a9 Mon Sep 17 00:00:00 2001 From: Matthew Grove Date: Tue, 3 Mar 2020 11:07:22 +0000 Subject: [PATCH 1/2] Revert "Merge pull request #2 from mgrove36/development" This reverts commit 8b8da2159329be412ed4b828418d9086f7588718. --- 2018.md | 5 - 2019.md | 5 - 2020.md | 5 - Gemfile.lock | 5 - _includes/article-carousel.html | 65 +++ _includes/article-page-head.html | 4 +- _includes/footer.html | 10 +- _includes/head.html | 4 +- _includes/navbar.html | 2 +- _includes/top-app-bar.html | 2 +- _layouts/404.html | 1 + _layouts/{home.html => article-list.html} | 4 +- _layouts/image-article.html | 17 +- _layouts/video-article.html | 2 + _layouts/year.html | 55 -- _posts/2018-03-06-test.md | 22 - _posts/2020-03-02-test1.md | 10 - _posts/2020-03-02-test2.md | 10 - _site/2018.html | 334 ------------ _site/2019.html | 504 ------------------ _site/2020.html | 368 ------------- _site/404.html | 78 +-- _site/README.md | 4 +- _site/articles/2018/03/06/test.html | 294 ---------- ...n-found-so-what-are-we-doing-about-it.html | 319 ++++++++--- ...oads-around-your-home-and-school-safe.html | 350 +++++++++--- ...real-life-issues-inspire-sarah-govett.html | 405 +++++++++++--- ...ould-sky-high-aims-bring-reading-down.html | 319 ++++++++--- .../articles/2019/03/06/finished-product.html | 355 +++++++++--- ...arks-is-most-inspirational-woman-ever.html | 369 ++++++++++--- ...as-redevelopment-plans-are-called-out.html | 319 ++++++++--- ...s-virtual-fantasy-or-a-virtual-prison.html | 319 ++++++++--- ...what-is-in-the-patients-best-interest.html | 333 +++++++++--- .../03/06/whats-next-for-reading-prison.html | 369 ++++++++++--- .../06/young-reporter-team-ready-to-go.html | 355 +++++++++--- _site/articles/2020/03/01/test.html | 281 ---------- _site/articles/2020/03/02/test1.html | 281 ---------- _site/articles/2020/03/02/test2.html | 281 ---------- _site/css/article-list.css | 51 -- _site/css/article-page.css | 88 ++- _site/css/global.css | 132 ++--- _site/css/home.css | 43 -- _site/css/mdc-card-list.css | 81 +++ _site/css/slick-theme.css | 204 +++++++ _site/css/slick.css | 119 +++++ _site/css/year.css | 12 - ...-so-what-are-we-doing-about-it--cover.jpg} | Bin ...ound-your-home-and-school-safe--cover.jpg} | Bin ...fe-issues-inspire-sarah-govett--cover.jpg} | Bin ...y-high-aims-bring-reading-down--cover.jpg} | Bin ...=> 2019-03-06-finished-product--cover.jpg} | Bin ...-most-inspirational-woman-ever--cover.jpg} | Bin ...velopment-plans-are-called-out--cover.jpg} | Bin ...al-fantasy-or-a-virtual-prison--cover.jpg} | Bin ...-in-the-patients-best-interest--cover.jpg} | Bin ...-whats-next-for-reading-prison--cover.jpg} | Bin ...oung-reporter-team-ready-to-go--cover.jpg} | Bin _site/images/backgrounds/2019.jpg | Bin 280549 -> 0 bytes _site/images/backgrounds/2020.jpg | Bin 280549 -> 0 bytes _site/index.html | 463 ++++++++-------- _site/js/article-page.js | 41 +- _site/js/jarallax.min.js | 7 - _site/js/slick.min.js | 1 + _site/sitemap.xml | 89 +--- css/article-list.css | 51 -- css/article-page.css | 88 ++- css/global.css | 132 ++--- css/home.css | 43 -- css/mdc-card-list.css | 81 +++ css/slick-theme.css | 204 +++++++ css/slick.css | 119 +++++ css/year.css | 12 - ...-so-what-are-we-doing-about-it--cover.jpg} | Bin ...ound-your-home-and-school-safe--cover.jpg} | Bin ...fe-issues-inspire-sarah-govett--cover.jpg} | Bin ...y-high-aims-bring-reading-down--cover.jpg} | Bin .../2019-03-06-finished-product--cover.jpg | Bin images/2019-03-06-finished-product.jpg | Bin 280549 -> 0 bytes ...-most-inspirational-woman-ever--cover.jpg} | Bin ...velopment-plans-are-called-out--cover.jpg} | Bin ...al-fantasy-or-a-virtual-prison--cover.jpg} | Bin ...-in-the-patients-best-interest--cover.jpg} | Bin ...-whats-next-for-reading-prison--cover.jpg} | Bin ...oung-reporter-team-ready-to-go--cover.jpg} | Bin images/backgrounds/2018.jpg | Bin 280549 -> 0 bytes images/backgrounds/2019.jpg | Bin 280549 -> 0 bytes images/backgrounds/2020.jpg | Bin 280549 -> 0 bytes index.md | 53 +- js/article-page.js | 41 +- js/jarallax.min.js | 7 - js/slick.min.js | 1 + 91 files changed, 4529 insertions(+), 4099 deletions(-) delete mode 100644 2018.md delete mode 100644 2019.md delete mode 100644 2020.md create mode 100644 _includes/article-carousel.html rename _layouts/{home.html => article-list.html} (85%) delete mode 100644 _layouts/year.html delete mode 100644 _posts/2018-03-06-test.md delete mode 100644 _posts/2020-03-02-test1.md delete mode 100644 _posts/2020-03-02-test2.md delete mode 100644 _site/2018.html delete mode 100644 _site/2019.html delete mode 100644 _site/2020.html delete mode 100644 _site/articles/2018/03/06/test.html delete mode 100644 _site/articles/2020/03/01/test.html delete mode 100644 _site/articles/2020/03/02/test1.html delete mode 100644 _site/articles/2020/03/02/test2.html delete mode 100644 _site/css/article-list.css delete mode 100644 _site/css/home.css create mode 100644 _site/css/mdc-card-list.css create mode 100644 _site/css/slick-theme.css create mode 100644 _site/css/slick.css delete mode 100644 _site/css/year.css rename _site/images/{2019-03-06-a-possible-autism-anorexia-link-has-been-found-so-what-are-we-doing-about-it.jpg => 2019-03-06-a-possible-autism-anorexia-link-has-been-found-so-what-are-we-doing-about-it--cover.jpg} (100%) rename _site/images/{2019-03-06-are-the-roads-around-your-home-and-school-safe.jpg => 2019-03-06-are-the-roads-around-your-home-and-school-safe--cover.jpg} (100%) rename _site/images/{2019-03-06-book-week-real-life-issues-inspire-sarah-govett.jpg => 2019-03-06-book-week-real-life-issues-inspire-sarah-govett--cover.jpg} (100%) rename _site/images/{2019-03-06-could-sky-high-aims-bring-reading-down.jpg => 2019-03-06-could-sky-high-aims-bring-reading-down--cover.jpg} (100%) rename _site/images/{2019-03-06-finished-product.jpg => 2019-03-06-finished-product--cover.jpg} (100%) rename _site/images/{2019-03-06-student-survey-shows-rosa-parks-is-most-inspirational-woman-ever.jpg => 2019-03-06-student-survey-shows-rosa-parks-is-most-inspirational-woman-ever--cover.jpg} (100%) rename _site/images/{2019-03-06-tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out.jpg => 2019-03-06-tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out--cover.jpg} (100%) rename _site/images/{2019-03-06-video-games-virtual-fantasy-or-a-virtual-prison.jpg => 2019-03-06-video-games-virtual-fantasy-or-a-virtual-prison--cover.jpg} (100%) rename _site/images/{2019-03-06-what-is-in-the-patients-best-interest.jpg => 2019-03-06-what-is-in-the-patients-best-interest--cover.jpg} (100%) rename _site/images/{2019-03-06-whats-next-for-reading-prison.jpg => 2019-03-06-whats-next-for-reading-prison--cover.jpg} (100%) rename _site/images/{2019-03-06-young-reporter-team-ready-to-go.jpg => 2019-03-06-young-reporter-team-ready-to-go--cover.jpg} (100%) delete mode 100644 _site/images/backgrounds/2019.jpg delete mode 100644 _site/images/backgrounds/2020.jpg delete mode 100644 _site/js/jarallax.min.js create mode 100644 _site/js/slick.min.js delete mode 100644 css/article-list.css delete mode 100644 css/home.css create mode 100644 css/mdc-card-list.css create mode 100644 css/slick-theme.css create mode 100644 css/slick.css delete mode 100644 css/year.css rename images/{2019-03-06-a-possible-autism-anorexia-link-has-been-found-so-what-are-we-doing-about-it.jpg => 2019-03-06-a-possible-autism-anorexia-link-has-been-found-so-what-are-we-doing-about-it--cover.jpg} (100%) rename images/{2019-03-06-are-the-roads-around-your-home-and-school-safe.jpg => 2019-03-06-are-the-roads-around-your-home-and-school-safe--cover.jpg} (100%) rename images/{2019-03-06-book-week-real-life-issues-inspire-sarah-govett.jpg => 2019-03-06-book-week-real-life-issues-inspire-sarah-govett--cover.jpg} (100%) rename images/{2019-03-06-could-sky-high-aims-bring-reading-down.jpg => 2019-03-06-could-sky-high-aims-bring-reading-down--cover.jpg} (100%) rename _site/images/backgrounds/2018.jpg => images/2019-03-06-finished-product--cover.jpg (100%) delete mode 100644 images/2019-03-06-finished-product.jpg rename images/{2019-03-06-student-survey-shows-rosa-parks-is-most-inspirational-woman-ever.jpg => 2019-03-06-student-survey-shows-rosa-parks-is-most-inspirational-woman-ever--cover.jpg} (100%) rename images/{2019-03-06-tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out.jpg => 2019-03-06-tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out--cover.jpg} (100%) rename images/{2019-03-06-video-games-virtual-fantasy-or-a-virtual-prison.jpg => 2019-03-06-video-games-virtual-fantasy-or-a-virtual-prison--cover.jpg} (100%) rename images/{2019-03-06-what-is-in-the-patients-best-interest.jpg => 2019-03-06-what-is-in-the-patients-best-interest--cover.jpg} (100%) rename images/{2019-03-06-whats-next-for-reading-prison.jpg => 2019-03-06-whats-next-for-reading-prison--cover.jpg} (100%) rename images/{2019-03-06-young-reporter-team-ready-to-go.jpg => 2019-03-06-young-reporter-team-ready-to-go--cover.jpg} (100%) delete mode 100644 images/backgrounds/2018.jpg delete mode 100644 images/backgrounds/2019.jpg delete mode 100644 images/backgrounds/2020.jpg delete mode 100644 js/jarallax.min.js create mode 100644 js/slick.min.js diff --git a/2018.md b/2018.md deleted file mode 100644 index 8b5ffc0..0000000 --- a/2018.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -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 deleted file mode 100644 index 8b5ffc0..0000000 --- a/2019.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -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/2020.md b/2020.md deleted file mode 100644 index 8b5ffc0..0000000 --- a/2020.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -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/Gemfile.lock b/Gemfile.lock index a63c709..3191b88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,12 +25,10 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) eventmachine (1.2.7) - eventmachine (1.2.7-x64-mingw32) execjs (2.7.0) faraday (1.0.0) multipart-post (>= 1.2, < 3) ffi (1.12.2) - ffi (1.12.2-x64-mingw32) forwardable-extended (2.6.0) gemoji (3.0.1) github-pages (204) @@ -208,8 +206,6 @@ GEM multipart-post (2.1.1) nokogiri (1.10.8) mini_portile2 (~> 2.4.0) - nokogiri (1.10.8-x64-mingw32) - mini_portile2 (~> 2.4.0) octokit (4.16.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) @@ -244,7 +240,6 @@ GEM PLATFORMS ruby - x64-mingw32 DEPENDENCIES github-pages diff --git a/_includes/article-carousel.html b/_includes/article-carousel.html new file mode 100644 index 0000000..8d07103 --- /dev/null +++ b/_includes/article-carousel.html @@ -0,0 +1,65 @@ +{% if site.categories.articles.size > 1 %} + {% assign article_list_displayed = false %} + {% for article in site.categories.articles %} + {% if article.url != page.url %} + {% assign authors = article.authors | split: ", " %} + {% for author in authors %} + {% assign article_date = article.date | date: "%Y" %} + {% assign current_article_date = page.date | date: "%Y" %} + {% if article_date == current_article_date %} + {% assign current_authors = page.authors | split: ", " %} + {% for current_author in current_authors %} + {% assign break = false %} + {% if author == current_author %} + {% if article_list_displayed == false %} +

+ {% if current_authors.size > 1 %} + Other Articles By These Authors + {% else %} + Other Articles By This Author + {% endif %} +

+ +
+ {% assign article_list_displayed = true %} + {% endif %} + +
+
+
+
+

{{ article.title }}

+

+ + | by {{ article.authors }} +

+
+
+
+ +
+
+ + +
+
+ {% assign break = true %} + {% break %} + {% endif %} + {% endfor %} + {% endif %} + {% if break == true %} + {% break %} + {% endif %} + {% endfor %} + {% endif %} + {% endfor %} + {% if article_list_displayed == true %} + +
+ {% endif %} +{% endif %} diff --git a/_includes/article-page-head.html b/_includes/article-page-head.html index 9688c9a..f2a8bf2 100644 --- a/_includes/article-page-head.html +++ b/_includes/article-page-head.html @@ -1,3 +1,5 @@ + + + - diff --git a/_includes/footer.html b/_includes/footer.html index e7ac624..ecba48c 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,6 +1,4 @@ -
-
- - © Matthew G {{ "now" | date: "%Y" }} | Made by Matthew G -
-
\ No newline at end of file + diff --git a/_includes/head.html b/_includes/head.html index 006b1ef..9208adc 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -39,10 +39,8 @@ - - - + diff --git a/_includes/navbar.html b/_includes/navbar.html index 1c788c2..daf86c1 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -2,7 +2,7 @@
+ -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
- -
+ + Scroll to top diff --git a/_site/articles/2019/03/06/could-sky-high-aims-bring-reading-down.html b/_site/articles/2019/03/06/could-sky-high-aims-bring-reading-down.html index 4ca7b6f..8b3e3e3 100644 --- a/_site/articles/2019/03/06/could-sky-high-aims-bring-reading-down.html +++ b/_site/articles/2019/03/06/could-sky-high-aims-bring-reading-down.html @@ -43,17 +43,17 @@ - - - + - + + + + - @@ -68,7 +68,7 @@