From 2ffeb6be034f58a1af9e970ef72e1524e619b314 Mon Sep 17 00:00:00 2001
From: Yax <1949284+kianby@users.noreply.github.com>
Date: Sun, 18 Aug 2019 18:11:11 +0200
Subject: [PATCH] style
---
layout/item.html | 18 ++++++-------
layout/post.html | 2 +-
makesite.py | 67 ++++++++++++++++++++++++++++++++----------------
3 files changed, 55 insertions(+), 32 deletions(-)
diff --git a/layout/item.html b/layout/item.html
index e235cde..6e46330 100644
--- a/layout/item.html
+++ b/layout/item.html
@@ -1,10 +1,10 @@
-
-{{ category_label}} - {{ date }}
-
-{{ summary }} ...
-
-
-
+
{{ title }}
+ {{ category_label}} - {{ date }}
+
+ {{ summary }}
+
+
+
\ No newline at end of file
diff --git a/layout/post.html b/layout/post.html
index 535214e..a3ec1bd 100644
--- a/layout/post.html
+++ b/layout/post.html
@@ -1,5 +1,5 @@
-
+{{ title }}
{{ category_label }} - {{ date }}
{{ content }}
diff --git a/makesite.py b/makesite.py
index 6ac7633..5c832d1 100755
--- a/makesite.py
+++ b/makesite.py
@@ -123,6 +123,17 @@ def render(template, **params):
template)
+def get_categories(page_params):
+ cat = []
+ if 'category' in page_params:
+ cat.append(str(page_params['category']).strip())
+ elif 'categories' in page_params:
+ for s in page_params['categories'].split(' '):
+ if s.strip():
+ cat.append(s.strip())
+ return cat
+
+
def make_pages(src, dst, layout, **params):
"""Generate pages from page content."""
items = []
@@ -133,10 +144,10 @@ def make_pages(src, dst, layout, **params):
page_params = dict(params, **content)
# Populate placeholders in content if content-rendering is enabled.
- if page_params.get('render') == 'yes':
- rendered_content = render(page_params['content'], **page_params)
- page_params['content'] = rendered_content
- content['content'] = rendered_content
+ # if page_params.get('render') == 'yes':
+ # rendered_content = render(page_params['content'], **page_params)
+ # page_params['content'] = rendered_content
+ # content['content'] = rendered_content
items.append(content)
@@ -161,28 +172,33 @@ def make_posts(src, src_pattern, dst, layout, **params):
page_params['date_path'] = page_params['date'].replace('-', '/')
page_params['year'] = page_params['date'].split('-')[0]
- cat = []
- if 'category' in page_params:
- cat.append(str(page_params['category']).strip())
- elif 'categories' in page_params:
- for s in page_params['categories'].split(' '):
- if s.strip():
- cat.append(s.strip())
- page_params['category'] = cat
- page_params['category_label'] = ' '.join(cat)
+ # categories
+ categories = get_categories(page_params)
+ page_params['category'] = categories
+ page_params['category_label'] = ' '.join(categories)
- # TODO DEBUG
- #print(page_params)
- #break
# Populate placeholders in content if content-rendering is enabled.
- if page_params.get('render') == 'yes':
- rendered_content = render(page_params['content'], **page_params)
- page_params['content'] = rendered_content
- content['content'] = rendered_content
+ # if page_params.get('render') == 'yes':
+ # rendered_content = render(page_params['content'], **page_params)
+ # page_params['content'] = rendered_content
+ # content['content'] = rendered_content
+
+ summary_index = page_params['content'].find('