From 9c1f02f9099b0da48c0bec7f23fa8c0566a331f3 Mon Sep 17 00:00:00 2001 From: Jieiku Date: Mon, 30 May 2022 22:33:42 -0700 Subject: Whitespace Cleanup, Fix Recent --- templates/404.html | 34 ++++++------ templates/base.html | 111 ++++++++++++++++++++++----------------- templates/categories/list.html | 14 +++-- templates/categories/single.html | 13 +++-- templates/contact.html | 35 +++++++----- templates/index.html | 31 ++++++----- templates/macros/macros.html | 9 ++-- templates/macros/page.html | 8 +-- templates/macros/social.html | 7 ++- templates/page.html | 68 ++++++++++++------------ templates/pages.html | 6 ++- templates/posts.html | 17 ++++-- templates/shortcodes/img.html | 51 +++++++++--------- templates/tags/list.html | 19 ++++--- templates/tags/single.html | 13 +++-- 15 files changed, 253 insertions(+), 183 deletions(-) (limited to 'templates') diff --git a/templates/404.html b/templates/404.html index 23c7168..3b02be6 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,21 +1,23 @@ {% extends "base.html" %} - {# Title #} -{% block title %}Sorry! Page not found.{% endblock title %} - -{% if config.extra.seo | default(value=true) %} - {% block current_url %} - - - {% endblock current_url %} -{% endif %} -{# Page heading #} +{% block title %} + Sorry! Page not found. +{% endblock title %} -{% block content %}
+{% block current_url %} + {% if config.extra.seo | default(value=true) %} + + + {% endif %} +{% endblock current_url %} -

404 Error

-

Sorry

-

The requested page does not exist or has been moved to another address.

-

Please go back to home.

+{# Page heading #} -
{% endblock content %} +{% block content %} +
+

404 Error

+

Sorry

+

The requested page does not exist or has been moved to another address.

+

Please go back to home.

+
+{% endblock content %} diff --git a/templates/base.html b/templates/base.html index 77c4742..f43dcba 100644 --- a/templates/base.html +++ b/templates/base.html @@ -11,16 +11,20 @@ {% block description %} {% if page.description %} + {% if config.extra.seo | default(value=true) %} - - + + {% endif %} + {% else %} + {% if config.extra.seo | default(value=true) %} - - + + {% endif %} + {% endif %} {% endblock description %} @@ -44,11 +48,11 @@ {% block css %}{% endblock css %} + {% if config.extra.favicon %} - - {% else %} - + {% endif %} + {% if config.generate_feed %}{% endif %} @@ -74,8 +78,8 @@ {% endblock current_url %} {% if config.extra.social.twitter %} - - + + {% endif %} {% if page.extra.thumbnail %} @@ -93,55 +97,64 @@ {% endif %} {% elif config.extra.default_og_image %} - - - + + + {% elif config.extra.banner %} - - - + + + {% else %} - + {% endif %} {% endif %} {% block extra_head %}{% endblock extra_head %} -{% block header %}
- - {% if config.extra.sitedesc %}{% if config.description %}
{{ config.description }}
{% endif %}{% endif %} -
-
{% endblock header %} -
{% block content %} +{% block header %} +
+ + {% if config.extra.sitedesc %} + {% if config.description %} +
{{ config.description }}
+ {% endif %} + {% endif %} +
+
+{% endblock header %} +
+{% block content %} {% endblock content %}
-{% block footer %}{% endblock footer %} +{% block footer %} + +{% endblock footer %} diff --git a/templates/categories/list.html b/templates/categories/list.html index 89bbc23..bce31fa 100644 --- a/templates/categories/list.html +++ b/templates/categories/list.html @@ -1,12 +1,16 @@ {% extends "base.html" %} {% block content %} -
+

{{ terms | length }} Categories

{% for term in terms -%}[{{ term.name }}]   {%- endfor %}

- {% for term in terms -%}

{{ term.name }}

- {% for page in term.pages -%}

{{ page.title }} -

- {% endfor -%}{% endfor -%} -
{% endblock content %} + {% for term in terms -%} +

{{ term.name }}

+ {% for page in term.pages -%} +

{{ page.title }} -

+ {% endfor -%} + {% endfor -%} +
+{% endblock content %} diff --git a/templates/categories/single.html b/templates/categories/single.html index d5fe5b7..641add7 100644 --- a/templates/categories/single.html +++ b/templates/categories/single.html @@ -1,8 +1,13 @@ {% extends "base.html" %} {% block content %} -
+

{{ term.name }}

- {% for year, posts in term.pages | group_by(attribute="year") %}

{{ year }}

- {% for page in posts %}

{{ page.title }} -

- {% endfor %}{% endfor %}
{% endblock content %} + {% for year, posts in term.pages | group_by(attribute="year") %} +

{{ year }}

+ {% for page in posts %} +

{{ page.title }} -

+ {% endfor %} + {% endfor %} +
+{% endblock content %} diff --git a/templates/contact.html b/templates/contact.html index bf37d2d..6cdbc55 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -1,16 +1,25 @@ {% extends "base.html" %} {% block content %} -
-

Want to get in touch? Fill out the form below to send me a message and I will get back to you as soon as possible!

-
-

-

-

-

-

-

-
-

-
-
{% endblock content %} +
+

Want to get in touch? Fill out the form below to send me a message and I will get back to you as soon as possible!

+
+

+ + +

+

+ + +

+

+ + +

+
+

+ +

+
+
+{% endblock content %} diff --git a/templates/index.html b/templates/index.html index 1bd4976..ad4af41 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,20 +1,27 @@ {% import "macros/page.html" as page_macros %} {% import "macros/macros.html" as macros %} -{% extends "base.html" %}{% block content %} -
{% for page in paginator.pages %} -
-{{ macros::title(page=page) }}

{{ page.summary | markdown(inline=true) | safe }} ...more

-
{% endfor %} +{% extends "base.html" %} +{% block content %} +
+ {% for page in paginator.pages %} +
+ {{ macros::title(page=page) }} +

{{ page.summary | markdown(inline=true) | safe }} ...more

+
+ {% endfor %} -
{% set section_item = get_section(path="_index.md") %} +
+ {% set section_item = get_section(path="_index.md") %} {% if recent %} -
-
-

Recent Posts

{% for page in section_item.pages | slice(end=config.extra.recent_items) %} -{{ page_macros::page_listing(page=page) }}{% endfor %} +
+
+

Recent Posts

+ {% for page in section_item.pages | slice(end=config.extra.recent_items) %} + {{ page_macros::page_listing(page=page) }} + {% endfor %} +
-
{% endif %} - {% endblock content %} +{% endblock content %} diff --git a/templates/macros/macros.html b/templates/macros/macros.html index a470bb0..c3147aa 100644 --- a/templates/macros/macros.html +++ b/templates/macros/macros.html @@ -1,6 +1,9 @@ -{% macro title(page) %}

{{ page.title }}

- {{ page.date | date(format="%B %d, %Y") }}{% if page.taxonomies.categories %} [{% for cat in page.taxonomies.categories %}{{ cat }}{% endfor %}] {% endif %} - {% if page.taxonomies.tags %} {% for tag in page.taxonomies.tags %} #{{ tag }} {% endfor %}{% endif %} +{% macro title(page) %} +

{{ page.title }}

+{{ page.date | date(format="%B %d, %Y") }}{% if page.taxonomies.categories %} [{% for cat in page.taxonomies.categories %}{{ cat }}{% endfor %}] {% endif %} +{% if page.taxonomies.tags %} + {% for tag in page.taxonomies.tags %} #{{ tag }} {% endfor %} +{% endif %} {% endmacro title %} {% macro footer(page) %}

Back to top

diff --git a/templates/macros/page.html b/templates/macros/page.html index 69d40f7..0029e13 100644 --- a/templates/macros/page.html +++ b/templates/macros/page.html @@ -1,3 +1,5 @@ -{% macro page_listing(page) %}
- {{ page.title }} -
{% endmacro page_listing %} +{% macro page_listing(page) %} +
+ {{ page.title }} +
+{% endmacro page_listing %} diff --git a/templates/macros/social.html b/templates/macros/social.html index 8daf7bc..6d45b9e 100644 --- a/templates/macros/social.html +++ b/templates/macros/social.html @@ -1,4 +1,6 @@ -{% macro social_links(social_config) %}{% set base_url = get_url(path="", lang=lang) %} +{% macro social_links(social_config) %} +{% set base_url = get_url(path="", lang=lang) %} + {% if config.generate_feed %}{% if config.extra.social.feed %} {% endif %}{% endif %} {% if social_config.mail %} {% endif %} @@ -20,4 +22,5 @@ {% if social_config.pinterest %} {% endif %} {% if social_config.twitch %} {% endif %} {% if social_config.youtube %} {% endif %} - {% endmacro %} + +{% endmacro %} diff --git a/templates/page.html b/templates/page.html index e3388c0..f92574e 100644 --- a/templates/page.html +++ b/templates/page.html @@ -2,39 +2,39 @@ {% import "macros/macros.html" as macros %} {{config.title}} - {{page.title}} {% block content %} -
- {{ macros::title(page=page) }} - {{ page.content | safe }} - {% block page_before_footer %} - {% endblock page_before_footer %} - {% block page_footer %} - {{ macros::footer(page=page) }} - {% endblock page_footer %} - {% block page_after_footer %} - {% endblock page_after_footer %} -
-{% block toc %} - {% if page.extra.toc %} - {% set toc = page.toc %} - {% endif %} - {% if toc %} -
-
-

Index

- {% for h in toc %} -
- {{ h.title }} +
+ {{ macros::title(page=page) }} + {{ page.content | safe }} + {% block page_before_footer %} + {% endblock page_before_footer %} + {% block page_footer %} + {{ macros::footer(page=page) }} + {% endblock page_footer %} + {% block page_after_footer %} + {% endblock page_after_footer %} +
+ {% block toc %} + {% if page.extra.toc %} + {% set toc = page.toc %} + {% endif %} + {% if toc %} +
+
+

Index

+ {% for h in toc %} +
+ {{ h.title }} +
+ {% if h.children %} + {% for h2 in h.children %} +
+ - {{ h2.title }} +
+ {% endfor %} + {% endif %} + {% endfor %} +
- {% if h.children %} - {% for h2 in h.children %} -
- - {{ h2.title }} -
- {% endfor %} - {% endif %} - {% endfor %} -
-
- {% endif %} -{% endblock toc %} + {% endif %} + {% endblock toc %} {% endblock content %} diff --git a/templates/pages.html b/templates/pages.html index 30c95e9..3d2ca80 100644 --- a/templates/pages.html +++ b/templates/pages.html @@ -1,2 +1,4 @@ -{% extends "base.html" %}{% block content %} -
{{ page.content | safe }}
{% endblock content %} +{% extends "base.html" %} +{% block content %} +
{{ page.content | safe }}
+{% endblock content %} diff --git a/templates/posts.html b/templates/posts.html index 7aee3a7..f093e8e 100644 --- a/templates/posts.html +++ b/templates/posts.html @@ -1,5 +1,12 @@ -{% extends "base.html" %}{% block content %}{% set section_item = get_section(path="_index.md") %} -
{% for year, posts in section_item.pages | group_by(attribute="year") %} -

{{ year }}

- {% for post in posts %}

{{ post.title }} - {{ post.date | date(format="%F") }}

{% endfor %}{% endfor %} -
{% endblock content %} +{% extends "base.html" %} +{% block content %} + {% set section_item = get_section(path="_index.md") %} +
+ {% for year, posts in section_item.pages | group_by(attribute="year") %} +

{{ year }}

+ {% for post in posts %} +

{{ post.title }} - {{ post.date | date(format="%F") }}

+ {% endfor %} + {% endfor %} +
+{% endblock content %} diff --git a/templates/shortcodes/img.html b/templates/shortcodes/img.html index 94cb9fa..d003eeb 100644 --- a/templates/shortcodes/img.html +++ b/templates/shortcodes/img.html @@ -7,36 +7,39 @@ {% set figure_width = container_width - (40 * 2) %} {% if path is starting_with("./") %} - {% set relative_path = page.relative_path | split(pat="/") | slice(end=-1) | join(sep="/") %} - {% set img_path = path | trim_start_matches(pat="./") %} - {% set img_path = relative_path ~ "/" ~ img_path %} + {% set relative_path = page.relative_path | split(pat="/") | slice(end=-1) | join(sep="/") %} + {% set img_path = path | trim_start_matches(pat="./") %} + {% set img_path = relative_path ~ "/" ~ img_path %} {% else %} - {% set img_path = path %} + {% set img_path = path %} {% endif %} {% if path is not ending_with(".svg") %} - {% set resize = true %} - {% set image_quality = 90 %} - {% if quality %} - {% set image_quality = quality %} - {% endif %} - {% if extended_width_pct %} - {% if extended_width_pct == -1 %} - {# adjust extended width to container width #} - {% set extended_width_pct = 0.042 %} - {% endif %} - {% set _width = config.extra.images.max_width - figure_width %} - {% set extended_width = (extended_width_pct * _width + figure_width) | round | int %} - {% if extended_width > config.extra.images.max_width %} - {% set extended_width = config.extra.images.max_width %} - {% endif %} - {% set resized_image = resize_image(path=img_path, width=extended_width, op="fit_width", quality=image_quality) %} - {% else %} - {% set resized_image = resize_image(path=img_path, width=figure_width, op="fit_width", quality=image_quality) %} + {% set resize = true %} + {% set image_quality = 90 %} + {% if quality %} + {% set image_quality = quality %} + {% endif %} + + {% if extended_width_pct %} + + {% if extended_width_pct == -1 %} + {# adjust extended width to container width #} + {% set extended_width_pct = 0.042 %} {% endif %} + {% set _width = config.extra.images.max_width - figure_width %} + {% set extended_width = (extended_width_pct * _width + figure_width) | round | int %} + {% if extended_width > config.extra.images.max_width %} + {% set extended_width = config.extra.images.max_width %} + {% endif %} + {% set resized_image = resize_image(path=img_path, width=extended_width, op="fit_width", quality=image_quality) %} + + {% else %} + {% set resized_image = resize_image(path=img_path, width=figure_width, op="fit_width", quality=image_quality) %} + {% endif %} {% endif %}
- - {% if caption %}
{{ caption | safe }}
{% endif %} + + {% if caption %}
{{ caption | safe }}
{% endif %}
diff --git a/templates/tags/list.html b/templates/tags/list.html index e7a6b7d..56575df 100644 --- a/templates/tags/list.html +++ b/templates/tags/list.html @@ -2,10 +2,15 @@ {% block content %}
-
-

{{ terms | length }} Tags

-

{% for term in terms -%}#{{ term.name }}   {%- endfor %}

-
- {% for term in terms -%}

#{{ term.name }}

- {% for page in term.pages -%}

{{ page.title }} -

- {% endfor -%}{% endfor -%}
{% endblock content %} +
+

{{ terms | length }} Tags

+

{% for term in terms -%}#{{ term.name }}   {%- endfor %}

+
+ {% for term in terms -%} +

#{{ term.name }}

+ {% for page in term.pages -%} +

{{ page.title }} -

+ {% endfor -%} + {% endfor -%} +
+{% endblock content %} diff --git a/templates/tags/single.html b/templates/tags/single.html index fd1a10f..2bddb8e 100644 --- a/templates/tags/single.html +++ b/templates/tags/single.html @@ -2,7 +2,12 @@ {% block content %}
-

{{ term.name }}

- {% for year, posts in term.pages | group_by(attribute="year") %}

{{ year }}

- {% for page in term.pages %}

{{ page.title }} -

- {% endfor %}{% endfor %}
{% endblock content %} +

{{ term.name }}

+ {% for year, posts in term.pages | group_by(attribute="year") %} +

{{ year }}

+ {% for page in term.pages %} +

{{ page.title }} -

+ {% endfor %} + {% endfor %} +
+{% endblock content %} -- cgit v1.3.1