From c7b914505b6505b013610cc71e3b50d68c4a5473 Mon Sep 17 00:00:00 2001 From: Jieiku Date: Tue, 23 Aug 2022 13:41:41 -0700 Subject: Optimizations, Update Readme YellowLabTools --- templates/404.html | 2 +- templates/base.html | 16 ++++++++-------- templates/categories/list.html | 2 +- templates/categories/single.html | 2 +- templates/contact.html | 2 +- templates/index.html | 12 ++++++------ templates/macros/create_stork_toml.html | 5 ----- templates/macros/head.html | 16 ++++++++-------- templates/macros/macros.html | 10 +++++----- templates/macros/page.html | 2 +- templates/macros/social.html | 6 +++--- templates/page.html | 8 ++++---- templates/pages.html | 2 +- templates/posts.html | 2 +- templates/stork_toml.html | 5 ++++- templates/tags/list.html | 2 +- templates/tags/single.html | 2 +- templates/tinysearch_json.html | 5 ++++- 18 files changed, 51 insertions(+), 50 deletions(-) (limited to 'templates') diff --git a/templates/404.html b/templates/404.html index f72c54f..02c7688 100644 --- a/templates/404.html +++ b/templates/404.html @@ -12,7 +12,7 @@ {%- set description = config.description %} - {{- macros_head::seo(title=title, title_addition=title_addition, description=description, is_404=true) }} + {{- macros_head::seo(config=config, title=title, title_addition=title_addition, description=description, is_404=true) }} {%- endblock seo %} {%- block content %} diff --git a/templates/base.html b/templates/base.html index 9d27f8a..81dd59a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -5,15 +5,15 @@ - {{- macros_head::theme() }} - {{- macros_head::stylesheets() }} + {{- macros_head::theme(config=config) }} + {{- macros_head::stylesheets(config=config) }} - {{- macros_head::stylesheets_preload() }} - {{- macros_head::js() }} + {{- macros_head::stylesheets_preload(config=config) }} + {{- macros_head::js(config=config) }} - {{- macros_head::feed() }} + {{- macros_head::feed(config=config) }} {%- block seo %} {%- if config.extra.title_separator %} {%- set title_separator = " " ~ config.extra.title_separator ~ " " -%} @@ -25,8 +25,8 @@ - {{- macros_head::security() }} - {{- macros_head::favicons() }} + {{- macros_head::security(config=config) }} + {{- macros_head::favicons(config=config) }} {%- if config.build_search_index %} {%- endif %} @@ -91,7 +91,7 @@
{%- endif %}
- {{- social_macros::social_links(social_config=config.extra.social) }} + {{- social_macros::social_links(social_config=config.extra.social, config=config) }} {#- Copyright START #} {%- set copyright_start_year=config.extra.copyright_start_year | default(value="") %} diff --git a/templates/categories/list.html b/templates/categories/list.html index 2c70142..1ded228 100644 --- a/templates/categories/list.html +++ b/templates/categories/list.html @@ -12,7 +12,7 @@ {%- set description = config.description %} - {{- macros_head::seo(title=title, title_addition=title_addition, description=description, is_home=true) }} + {{- macros_head::seo(config=config, title=title, title_addition=title_addition, description=description, is_home=true) }} {%- endblock seo %} {%- block content %} diff --git a/templates/categories/single.html b/templates/categories/single.html index b1cd680..1f5e48c 100644 --- a/templates/categories/single.html +++ b/templates/categories/single.html @@ -12,7 +12,7 @@ {%- set description = config.description %} - {{- macros_head::seo(title=title, title_addition=title_addition, description=description, is_home=true) }} + {{- macros_head::seo(config=config, title=title, title_addition=title_addition, description=description, is_home=true) }} {%- endblock seo %} {%- block content %} diff --git a/templates/contact.html b/templates/contact.html index ae8a262..526bb61 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -21,7 +21,7 @@ {%- set description = config.description %} {%- endif %} - {{- macros_head::seo(title=title, title_addition=title_addition, description=description) }} + {{- macros_head::seo(config=config, title=title, title_addition=title_addition, description=description) }} {%- endblock seo %} {%- block content %} diff --git a/templates/index.html b/templates/index.html index 1434aee..7c8c45a 100644 --- a/templates/index.html +++ b/templates/index.html @@ -19,7 +19,7 @@ {%- set description = config.description %} - {{- macros_head::seo(title=title, title_addition=title_addition, description=description, is_home=true) }} + {{- macros_head::seo(config=config, title=title, title_addition=title_addition, description=description, is_home=true) }} {%- endblock seo %} @@ -28,10 +28,10 @@
{%- for page in paginator.pages %}
- {{- macros::title_index(page=page) }} + {{- macros::title_index(page=page, config=config) }} {%- if config.extra.meta_index.position %} {%- if config.extra.meta_index.position == "top" or config.extra.meta_index.position == "both" %} - {{- macros::meta_index(page=page) }} + {{- macros::meta_index(page=page, config=config) }} {%- endif %}{%- endif %}

@@ -47,12 +47,12 @@

{%- if config.extra.meta_index.position %} {%- if config.extra.meta_index.position == "bottom" or config.extra.meta_index.position == "both" %} - {{- macros::meta_index(page=page) }} + {{- macros::meta_index(page=page, config=config) }} {%- endif %} {%- endif %}
{%- endfor %} - {{- macros::pagination(paginator=paginator) }} + {{- macros::pagination(paginator=paginator, config=config) }}
{%- set section_item = get_section(path="_index.md") %} {%- if config.extra.recent | default(value=true) %} @@ -60,7 +60,7 @@

Recent Posts

{%- for page in section_item.pages | slice(end=config.extra.recent_items) %} - {{- page_macros::page_listing(page=page) }} + {{- page_macros::page_listing(page=page, config=config) }} {%- endfor %}
diff --git a/templates/macros/create_stork_toml.html b/templates/macros/create_stork_toml.html index c9ed35c..642b3f9 100644 --- a/templates/macros/create_stork_toml.html +++ b/templates/macros/create_stork_toml.html @@ -1,8 +1,3 @@ -{# cargo install stork-search --locked #} -{# cd .dev/abridge #} -{# zola build #} -{# /home/jieiku/.cargo/bin/stork build --input public/data_stork/index.html --output static/stork.st #} - {%- macro from_section(section) -%} {%- set section = get_section(path=section) -%} {%- for post in section.pages -%} diff --git a/templates/macros/head.html b/templates/macros/head.html index c3b217c..92b2bb5 100644 --- a/templates/macros/head.html +++ b/templates/macros/head.html @@ -1,5 +1,5 @@ {#- Theme Switcher Button to toggle between dark/light #} -{%- macro theme() %} +{%- macro theme(config) %} {%- if config.extra.js_theme %} {%- if config.extra.js_themeButton or config.extra.js_bundle %} @@ -7,7 +7,7 @@ {%- endif %} {%- endmacro %} -{%- macro stylesheets() %} +{%- macro stylesheets(config) %} {%- if config.extra.stylesheets %}{%- for i in config.extra.stylesheets %} @@ -15,7 +15,7 @@ {%- endmacro %} -{%- macro stylesheets_preload() %} +{%- macro stylesheets_preload(config) %} {%- if config.extra.fonts %}{%- for i in config.extra.fonts %} {%- if i.url is matching("^http[s]?://") %} @@ -43,7 +43,7 @@ -{%- macro feed() %} +{%- macro feed(config) %} {%- if config.generate_feed %} {%- endif %} @@ -51,7 +51,7 @@ -{%- macro js() %} +{%- macro js(config) %} {%- set preStyle = false %} @@ -228,7 +228,7 @@ -{%- macro favicons() %} +{%- macro favicons(config) %} {%- if config.extra.favicon_theme_color %} {%- endif %} @@ -260,7 +260,7 @@ -{%- macro security() %} +{%- macro security(config) %} {%- if config.extra.security_header_referrer %} {%- endif %} @@ -275,7 +275,7 @@ {#- page_images: using for the blog single template page -#} {#- page_section: the blog single template page have to pass the parameter -#} {#- is_404: using for the 404.html template -#} -{%- macro seo( title="",title_addition="",description="",type="website",is_home=false,is_404=false,is_page=false,page_images="",page_section="",created_time="2021-07-04T07:07:00-07:00", updated_time="2021-07-04T07:07:00-07:00" ) %} +{%- macro seo( config, title="", title_addition="", description="", type="website", is_home=false, is_404=false, is_page=false, page_images="", page_section="", created_time="2021-07-04T07:07:00-07:00", updated_time="2021-07-04T07:07:00-07:00" ) %} {%- if is_404 -%} {%- else -%} diff --git a/templates/macros/macros.html b/templates/macros/macros.html index 97b481f..dd3b75c 100644 --- a/templates/macros/macros.html +++ b/templates/macros/macros.html @@ -1,8 +1,8 @@ -{%- macro title_post(page) %} +{%- macro title_post(page, config) %}

{{ page.title }}

{%- endmacro title_post %} -{%- macro meta_post(page) %} +{%- macro meta_post(page, config) %} {#- Author #} @@ -42,12 +42,12 @@ {%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #{{ tag }} {% endfor -%}{%- endif %} {%- endmacro meta_post %} -{%- macro title_index(page) %} +{%- macro title_index(page, config) %}

{% if config.extra.title_size_index %}{% endif %}{{ page.title }}{% if config.extra.title_size_index %}{% endif %}

{%- endmacro title_index %} -{%- macro meta_index(page) %} +{%- macro meta_index(page, config) %} {#- Author #} @@ -99,7 +99,7 @@ {%- endmacro footer %} -{%- macro pagination(paginator)%} +{%- macro pagination(paginator, config)%} {%- if paginator.number_pagers > 1 %} {%- if paginator.number_pagers <= 5 %} {# 5 or less pager is simple, just display all 5 #} {%- set start = 1 %} diff --git a/templates/macros/page.html b/templates/macros/page.html index df06117..7fd0f77 100644 --- a/templates/macros/page.html +++ b/templates/macros/page.html @@ -1,4 +1,4 @@ -{%- macro page_listing(page) %} +{%- macro page_listing(page, config) %}
{{ page.title }}
diff --git a/templates/macros/social.html b/templates/macros/social.html index 0c704bf..52fb6ff 100644 --- a/templates/macros/social.html +++ b/templates/macros/social.html @@ -1,4 +1,4 @@ -{%- macro social_links(social_config) %} +{%- macro social_links(social_config, config) %}