From b87a60d91e7d3efbbe2025bbd0ef8d08d6bfcbc9 Mon Sep 17 00:00:00 2001 From: Sebastian Zhorel Date: Tue, 31 Dec 2019 13:55:56 +0100 Subject: [PATCH] Create default layout, then update home, news and sitemap --- www.freecol.org/_config.yml | 3 + www.freecol.org/_layouts/default.html | 97 +++++++++++ www.freecol.org/_layouts/news.html | 91 +--------- .../2015-08-02-freecol-0.11.4-released.html | 2 +- www.freecol.org/index.html | 88 ++-------- www.freecol.org/news/index.html | 3 + www.freecol.org/sitemap.html | 157 ++---------------- 7 files changed, 129 insertions(+), 312 deletions(-) create mode 100644 www.freecol.org/_layouts/default.html diff --git a/www.freecol.org/_config.yml b/www.freecol.org/_config.yml index 1573b22b3..eb71472f2 100644 --- a/www.freecol.org/_config.yml +++ b/www.freecol.org/_config.yml @@ -6,3 +6,6 @@ defaults: values: permalink: news/:categories/:title:output_ext layout: "news-post" + folder: + path: /news/ + name: News diff --git a/www.freecol.org/_layouts/default.html b/www.freecol.org/_layouts/default.html new file mode 100644 index 000000000..7d7f11aed --- /dev/null +++ b/www.freecol.org/_layouts/default.html @@ -0,0 +1,97 @@ + + + + + + FreeCol - {{ page.title }} + +{% if page.author %} + +{% endif %} + + + + + + + + + + +
+ +
+
+ Home +{% if page.folder %} + arrow + {{ page.folder.name }} +{% endif %} +{% if page.subfolder %} + arrow + {{ page.subfolder.name }} +{% endif %} +{% if page.title and page.title!="Home" %} + arrow + {{ page.title }} +{% endif %} + + + SITEMAP + +
+
+ +
+ +
+
+
+
+
+

{{ page.title }}

+{{ content }} +{% if page.folder %} +
+ + [ Back ] +
+{% endif %} +
+
+
+
+ + +
+ + diff --git a/www.freecol.org/_layouts/news.html b/www.freecol.org/_layouts/news.html index d1e5bd139..c361b5e03 100644 --- a/www.freecol.org/_layouts/news.html +++ b/www.freecol.org/_layouts/news.html @@ -1,89 +1,4 @@ - - - - - - FreeCol - {{ page.title }} - -{% if page.author %} - -{% endif %} - - - - - - - - - - -
- -
-
- Home - arrow - News - arrow - {{ page.title }} - - - SITEMAP - -
-
- -
- -
-
-
-
-
-
- {{ page.title }} -
+--- + layout: default +--- {{ content }} -
- - [ Back ] -
-
-
-
-
- - -
- - diff --git a/www.freecol.org/_posts/2015-08-02-freecol-0.11.4-released.html b/www.freecol.org/_posts/2015-08-02-freecol-0.11.4-released.html index abeb14a7c..95a33fdb5 100644 --- a/www.freecol.org/_posts/2015-08-02-freecol-0.11.4-released.html +++ b/www.freecol.org/_posts/2015-08-02-freecol-0.11.4-released.html @@ -1,5 +1,5 @@ --- - title: FreeCol 0.11.4 released + title: FreeCol 0.11.4 released and withdrawn author: Mike Pope ---
diff --git a/www.freecol.org/index.html b/www.freecol.org/index.html index de7480508..a00a058da 100644 --- a/www.freecol.org/index.html +++ b/www.freecol.org/index.html @@ -1,60 +1,7 @@ - - - - - - FreeCol - Home - - - - - - - - -
- -
-
- Home - - SITEMAP - -
-
- -
-
- -
-
-
- -
-
- - -
- - diff --git a/www.freecol.org/news/index.html b/www.freecol.org/news/index.html index aad351296..0916ea29f 100644 --- a/www.freecol.org/news/index.html +++ b/www.freecol.org/news/index.html @@ -1,6 +1,9 @@ --- title: News Index layout: news-page + folder: + path: /news/index.html + name: News ---