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 @@ -
- -
\ 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 @@