From b767174f1795f3bc0619cc468f901ed55444f614 Mon Sep 17 00:00:00 2001 From: Yax <1949284+kianby@users.noreply.github.com> Date: Tue, 20 Aug 2019 12:56:18 +0200 Subject: [PATCH] banner --- layout/banner.html | 6 ++++ layout/landing.html | 77 --------------------------------------------- layout/page.html | 4 ++- makesite.py | 16 ++++++---- 4 files changed, 19 insertions(+), 84 deletions(-) create mode 100644 layout/banner.html delete mode 100644 layout/landing.html diff --git a/layout/banner.html b/layout/banner.html new file mode 100644 index 0000000..0ec79d1 --- /dev/null +++ b/layout/banner.html @@ -0,0 +1,6 @@ + diff --git a/layout/landing.html b/layout/landing.html deleted file mode 100644 index 896040b..0000000 --- a/layout/landing.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - {{ title }} - {{ subtitle }} - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- -
-
- -
-
-
- - - -
-
-
{{ content }}
-
-
- - - - - - \ No newline at end of file diff --git a/layout/page.html b/layout/page.html index 74ac0ec..a893fc0 100644 --- a/layout/page.html +++ b/layout/page.html @@ -47,6 +47,8 @@
+ {{ banner }} +
{{ content }}
@@ -67,4 +69,4 @@ - \ No newline at end of file + diff --git a/makesite.py b/makesite.py index 8c22d23..c963fa2 100755 --- a/makesite.py +++ b/makesite.py @@ -169,6 +169,7 @@ def make_posts(src, src_pattern, dst, layout, **params): content = read_content(src_path) page_params = dict(params, **content) + page_params['banner'] =' ' page_params['date_path'] = page_params['date'].replace('-', '/') page_params['year'] = page_params['date'].split('-')[0] @@ -208,7 +209,7 @@ def make_posts(src, src_pattern, dst, layout, **params): return sorted(items, key=lambda x: x['date'], reverse=True) -def make_list(posts, dst, list_layout, item_layout, **params): +def make_list(posts, dst, list_layout, item_layout, banner_layout, **params): """Generate list page for a blog.""" items = [] for post in posts: @@ -228,6 +229,9 @@ def make_list(posts, dst, list_layout, item_layout, **params): item = render(item_layout, **item_params) items.append(item) + banner = render(banner_layout) + params['banner'] = banner + params['content'] = ''.join(items) dst_path = render(dst, **params) output = render(list_layout, **params) @@ -257,17 +261,17 @@ def main(): params.update(json.loads(fread('params.json'))) # Load layouts. - landing_layout = fread('layout/landing.html') page_layout = fread('layout/page.html') post_layout = fread('layout/post.html') list_layout = fread('layout/list.html') item_layout = fread('layout/item.html') + banner_layout = fread('layout/banner.html') feed_xml = fread('layout/feed.xml') item_xml = fread('layout/item.xml') # Combine layouts to form final layouts. post_layout = render(page_layout, content=post_layout) - list_layout = render(landing_layout, content=list_layout) + list_layout = render(page_layout, content=list_layout) # Create site pages. make_pages('content/index.html', '_site/index.html', @@ -282,11 +286,11 @@ def main(): # Create blog list pages. make_list(blog_posts, '_site/index.html', - list_layout, item_layout, **params) + list_layout, item_layout, banner_layout, **params) # Create RSS feeds. - make_list(blog_posts, '_site/blog/rss.xml', - feed_xml, item_xml, **params) + #make_list(blog_posts, '_site/blog/rss.xml', + # feed_xml, item_xml, banner_layout, **params) # Test parameter to be set temporarily by unit tests.