From c2d72e09747a2a4abe9602e1ba49a1b4649c9d3c Mon Sep 17 00:00:00 2001 From: Jieiku Date: Fri, 14 Aug 2026 15:10:15 -0700 Subject: Update for Zola 0.23.3 --- templates/404.html | 27 +- templates/archive.html | 29 +- templates/base.html | 60 ++--- templates/categories/list.html | 33 +-- templates/categories/single.html | 31 +-- templates/components/audio.html | 30 +++ templates/components/components.html | 504 +++++++++++++++++++++++++++++++++++ templates/components/gif.html | 30 +++ templates/components/image.html | 64 +++++ templates/components/img.html | 52 ++++ templates/components/imgswap.html | 103 +++++++ templates/components/katex.html | 3 + templates/components/showdata.html | 9 + templates/components/streamable.html | 5 + templates/components/video.html | 30 +++ templates/components/vimeo.html | 5 + templates/components/youtube.html | 5 + templates/index.html | 74 +++-- templates/macros/macros.html | 378 -------------------------- templates/macros/seo.html | 145 ---------- templates/page.html | 196 +++++++------- templates/pages.html | 53 ++-- templates/partials/head.html | 44 ++- templates/partials/head_js.html | 52 ++-- templates/partials/social.html | 4 +- templates/shortcodes/audio.html | 29 -- templates/shortcodes/gif.html | 29 -- templates/shortcodes/image.html | 61 ----- templates/shortcodes/img.html | 49 ---- templates/shortcodes/imgswap.html | 100 ------- templates/shortcodes/katex.html | 1 - templates/shortcodes/showdata.html | 18 -- templates/shortcodes/streamable.html | 3 - templates/shortcodes/video.html | 29 -- templates/shortcodes/vimeo.html | 3 - templates/shortcodes/youtube.html | 3 - templates/tags/list.html | 33 +-- templates/tags/single.html | 31 +-- 38 files changed, 1143 insertions(+), 1212 deletions(-) create mode 100644 templates/components/audio.html create mode 100644 templates/components/components.html create mode 100644 templates/components/gif.html create mode 100644 templates/components/image.html create mode 100644 templates/components/img.html create mode 100644 templates/components/imgswap.html create mode 100644 templates/components/katex.html create mode 100644 templates/components/showdata.html create mode 100644 templates/components/streamable.html create mode 100644 templates/components/video.html create mode 100644 templates/components/vimeo.html create mode 100644 templates/components/youtube.html delete mode 100644 templates/macros/macros.html delete mode 100644 templates/macros/seo.html delete mode 100644 templates/shortcodes/audio.html delete mode 100644 templates/shortcodes/gif.html delete mode 100644 templates/shortcodes/image.html delete mode 100644 templates/shortcodes/img.html delete mode 100644 templates/shortcodes/imgswap.html delete mode 100644 templates/shortcodes/katex.html delete mode 100644 templates/shortcodes/showdata.html delete mode 100644 templates/shortcodes/streamable.html delete mode 100644 templates/shortcodes/video.html delete mode 100644 templates/shortcodes/vimeo.html delete mode 100644 templates/shortcodes/youtube.html (limited to 'templates') diff --git a/templates/404.html b/templates/404.html index 8c42866..70e1f91 100644 --- a/templates/404.html +++ b/templates/404.html @@ -2,20 +2,17 @@ {%- set uglyurls = config.extra.uglyurls | default(value=false) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} -{%- block seo %} +{%- block seo -%} {{ super() }} - {%- set title = "404 Page not found" %} - - {%- if config.title %} - {%- set title_addition = title_separator ~ config.title %} - {%- else %} - {%- set title_addition = "" %} - {%- endif %} - - {%- set description = config.description %} - - {{- macros_seo::seo(config=config, title=title, title_addition=title_addition, description=description, is_404=true) }} -{%- endblock seo %} + {%- set title = "404 Page not found" -%} + {%- if config.title -%} + {%- set title_addition = title_separator ~ config.title -%} + {%- else -%} + {%- set title_addition = "" -%} + {%- endif -%} + {%- set description = config.description -%} + {{}} +{%- endblock seo -%} {%- block content %}
@@ -29,11 +26,11 @@ {%- set i18n_404 = load_data(path="i18n/" ~ lcode ~ '.toml', required=false) -%} {%- if not i18n_404 -%}{%- set i18n_404 = load_data(path="themes/abridge/i18n/" ~ lcode ~ ".toml", required=false) -%}{%- endif %} -

{{ macros::translate(key="404_not_found", default="404_not_found", i18n=i18n_404) }}{{ macros::translate(key="full_stop", default=".", i18n=i18n_404) }} {% if config.build_search_index %}{{ macros::translate(key="404_try_search", default="Try searching or", i18n=i18n_404) }}{% endif %} {{ macros::translate(key="404_go_home", default="go to homepage", i18n=i18n_404) }}{{ macros::translate(key="full_stop", default=".", i18n=i18n_404) }}

+

{{}}{{}} {% if config.build_search_index %}{{}}{% endif %} {{}}{{}}

{%- endif -%} {%- endfor -%} {% if config.default_language != "en" %} -

{{ macros::translate(key="404_not_found", default="404_not_found", i18n=i18n) }}{{ macros::translate(key="full_stop", default=".", i18n=i18n) }} {% if config.build_search_index %}{{ macros::translate(key="404_try_search", default="Try searching or", i18n=i18n) }}{% endif %} {{ macros::translate(key="404_go_home", default="go to homepage", i18n=i18n) }}{{ macros::translate(key="full_stop", default=".", i18n=i18n) }}

+

{{}}{{}} {% if config.build_search_index %}{{}}{% endif %} {{}}{{}}

{% endif %}
{%- endblock content %} diff --git a/templates/archive.html b/templates/archive.html index aac705a..8bc0f27 100644 --- a/templates/archive.html +++ b/templates/archive.html @@ -7,24 +7,21 @@ This Template can also be used as the rendering template for Sections, eg: examp {%- set uglyurls = config.extra.uglyurls | default(value=false) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} -{%- block seo %} - {{- super() }} - {%- set title = "Archive" %} - - {%- if config.title %} - {%- set title_addition = title_separator ~ config.title %} - {%- else %} - {%- set title_addition = "" %} - {%- endif %} - - {%- set description = config.description %} - - {{- macros_seo::seo(config=config, title=title, title_addition=title_addition, description=description, is_home=true) }} -{%- endblock seo %} +{%- block seo -%} + {{- super() -}} + {%- set title = "Archive" -%} + {%- if config.title -%} + {%- set title_addition = title_separator ~ config.title -%} + {%- else -%} + {%- set title_addition = "" -%} + {%- endif -%} + {%- set description = config.description -%} + {{}} +{%- endblock seo -%} {%- block content %} {#- The following line is checking if the template is being used for the archive page or a section #} - {%- if current_path is matching("^(/[[:alpha:]][[:alpha:]])?/archive/$") %} + {%- if current_path is matching(pat="^(/[[:alpha:]][[:alpha:]])?/archive/$") %} {%- if section.extra.sec %} {%- set sec = section.extra.sec ~ "/" %} {%- else %} @@ -36,7 +33,7 @@ This Template can also be used as the rendering template for Sections, eg: examp {%- set langpath = "/" ~ lang ~ "/" %} {%- endif %} - {%- set sec = current_path | trim_start_matches(pat=langpath) | split(pat="/page/") | slice(end=1) | join(sep="") | trim_end_matches(pat="/") %} + {%- set sec = current_path | trim_start(pat=langpath) | split(pat="/page/") | first | trim_end(pat="/") %} {%- set sec = sec ~ "/" %} {%- endif %} diff --git a/templates/base.html b/templates/base.html index d16854c..97d2f4d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,29 +1,22 @@ -{%- import 'macros/seo.html' as macros_seo %} -{%- import "macros/macros.html" as macros %} -{# Load current language i18n data from .toml files in user's '/i18n' folder, use theme as fallback. #} +{#- Load current language i18n data from .toml files in user's '/i18n' folder, use theme as fallback. -#} {%- set i18n = load_data(path="i18n/" ~ lang ~ '.toml', required=false) -%} -{%- if not i18n -%}{%- set i18n = load_data(path="themes/abridge/i18n/" ~ lang ~ ".toml", required=false) -%}{%- endif %} - +{%- if not i18n -%}{%- set i18n = load_data(path="themes/abridge/i18n/" ~ lang ~ ".toml", required=false) -%}{%- endif -%} {%- set uglyurls = config.extra.uglyurls | default(value=false) -%} -{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} +{%- if config.extra.search_library -%}{%- if config.extra.search_library == "offline" -%}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%} - {%- include "partials/head.html" %} - - {#- SEO: title, description, etc #} - {%- block seo %} - {%- if config.extra.title_separator %} + {%- include "partials/head.html" -%} + {#- SEO: title, description, etc -#} + {%- block seo -%} + {%- if config.extra.title_separator -%} {%- set title_separator = " " ~ config.extra.title_separator ~ " " -%} - {%- else %} + {%- else -%} {%- set title_separator = " | " -%} - {%- endif %} - {%- endblock seo %} - - {%- block comments_init %} - {%- endblock comments_init %} - - {%- include "partials/head_js.html" %} + {%- endif -%} + {%- endblock seo -%} + {%- block comments_init -%}{%- endblock comments_init -%} + {%- include "partials/head_js.html" -%} {%- block header %} @@ -33,10 +26,10 @@ {%- if config.extra.logo -%} - {%- if config.extra.logo.file -%} - {{ config.extra.logo.alt | safe }} + {%- if config.extra.logo?.file -%} + {{ config.extra.logo?.alt | safe }} {%- endif -%} - {%- if config.extra.logo.text -%}{{ config.extra.logo.text | safe }}{%- endif -%} + {%- if config.extra.logo?.text -%}{{ config.extra.logo?.text | safe }}{%- endif -%} {%- elif config.extra.textlogo -%} @@ -55,8 +48,8 @@ {%- set js_switcher=config.extra.js_switcher | default(value=true) %} {%- if config.extra.menu %} {%- for i in config.extra.menu -%} -
  • - {%- if lang != config.default_language %} {{ macros::translate(key=i.name|safe, default=i.name|safe, i18n=i18n) }} {% else %} {{ i.name | safe }} {% endif -%} +
  • + {%- if lang != config.default_language %} {{}} {% else %} {{ i.name | safe }} {% endif -%}
    • {%- endfor -%} {%- endif -%} @@ -65,17 +58,17 @@
  • {%- if current_url %}
    - {{ macros::translate(key="language_name", default="lang_name", i18n=i18n) }} + {{}} {%- for lcode,language in config.languages -%} {%- set i18n_menu = load_data(path="i18n/" ~ lcode ~ '.toml', required=false) -%} {%- if not i18n_menu -%}{%- set i18n_menu = load_data(path="themes/abridge/i18n/" ~ lcode ~ ".toml", required=false) -%}{%- endif %} {%- if lang != lcode -%} {%- if lcode == config.default_language -%} - {{ macros::translate(key="language_name", default="language_name", i18n=i18n_menu) }} + {{}} {%- elif lang == config.default_language -%} - {{ macros::translate(key="language_name", default="language_name", i18n=i18n_menu) }} + {{}} {%- else -%} - {{ macros::translate(key="language_name", default="language_name", i18n=i18n_menu) }} + {{}} {%- endif -%} {%- endif -%} {%- endfor -%} @@ -98,7 +91,7 @@
    diff --git a/templates/categories/list.html b/templates/categories/list.html index 4566a75..966fd03 100644 --- a/templates/categories/list.html +++ b/templates/categories/list.html @@ -1,26 +1,21 @@ -{% extends "base.html" %} +{%- extends "base.html" -%} {%- set uglyurls = config.extra.uglyurls | default(value=false) -%} -{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} - -{%- block seo %} - {{- super() }} - {%- set title = "Categories" %} - - {%- if config.title %} - {%- set title_addition = title_separator ~ config.title %} - {%- else %} - {%- set title_addition = "" %} - {%- endif %} - - {%- set description = config.description %} - - {{- macros_seo::seo(config=config, title=title, title_addition=title_addition, description=description, is_home=true) }} -{%- endblock seo %} - +{%- if config.extra.search_library -%}{%- if config.extra.search_library == "offline" -%}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%} +{%- block seo -%} + {{- super() -}} + {%- set title = "Categories" -%} + {%- if config.title -%} + {%- set title_addition = title_separator ~ config.title -%} + {%- else -%} + {%- set title_addition = "" -%} + {%- endif -%} + {%- set description = config.description -%} + {{}} +{%- endblock seo -%} {%- block content %}
    -

    {{ terms | length }} {{ macros::translate(key="Categories", default="Categories", i18n=i18n) }}

    +

    {{ terms | length }} {{}}

    {% for term in terms %} [{{ term.name }}]{{ term.pages | length }} {% endfor %}

    {%- for term in terms %} diff --git a/templates/categories/single.html b/templates/categories/single.html index 08b4327..de68a4f 100644 --- a/templates/categories/single.html +++ b/templates/categories/single.html @@ -1,22 +1,17 @@ -{% extends "base.html" %} +{%- extends "base.html" -%} {%- set uglyurls = config.extra.uglyurls | default(value=false) -%} -{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} - -{%- block seo %} - {{- super() }} - {%- set title = term.name ~ " category" %} - - {%- if config.title %} - {%- set title_addition = title_separator ~ config.title %} - {%- else %} - {%- set title_addition = "" %} - {%- endif %} - - {%- set description = config.description %} - - {{- macros_seo::seo(config=config, title=title, title_addition=title_addition, description=description, is_home=true) }} -{%- endblock seo %} - +{%- if config.extra.search_library -%}{%- if config.extra.search_library == "offline" -%}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%} +{%- block seo -%} + {{- super() -}} + {%- set title = term.name ~ " category" -%} + {%- if config.title -%} + {%- set title_addition = title_separator ~ config.title -%} + {%- else -%} + {%- set title_addition = "" -%} + {%- endif -%} + {%- set description = config.description -%} + {{}} +{%- endblock seo -%} {%- block content %}

    {{ term.name }}

    diff --git a/templates/components/audio.html b/templates/components/audio.html new file mode 100644 index 0000000..f31488d --- /dev/null +++ b/templates/components/audio.html @@ -0,0 +1,30 @@ +{% component audio(page, config, sources, caption="", class="", autoplay=false, loop=false, muted=false, playsinline=false) %} +{%- if caption %}
    {% endif %} + +{%- if caption %}
    {{caption}}
    {% endif %} + +{% endcomponent audio %} diff --git a/templates/components/components.html b/templates/components/components.html new file mode 100644 index 0000000..7ce9ef3 --- /dev/null +++ b/templates/components/components.html @@ -0,0 +1,504 @@ +{# Former macro components #} + +{% component translate(key: string, i18n, default="") %} +{{- i18n[key] | default(value=default) | safe -}} +{% endcomponent translate %} + +{%- component page_listing(page, config) %} +{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{%- set uglyurls = true %}{%- endif %}{%- endif %} +
    + {{ page.title | markdown(inline=true) | safe }} +
    +{%- endcomponent page_listing %} + +{%- component series_link(inner, page, config) %} +{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{%- set uglyurls = true %}{%- endif %}{%- endif %} + {%- if inner.content == page.content %} + {{ inner.title }}
    + {%- else %} + {{ inner.title }}
    + {%- endif %} +{%- endcomponent series_link %} + +{%- component title_post(page, config) %} +{%- set uglyurls = config.extra.uglyurls | default(value=false) %} +{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{%- set uglyurls = true %}{%- endif %}{%- endif %} +

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

    +{%- endcomponent title_post %} + +{%- component meta_post(page, config) -%} +{#- Load current language i18n data from .toml files in user's '/i18n' folder, use theme as fallback. -#} +{%- set i18n = load_data(path="i18n/" ~ page.lang ~ '.toml', required=false) -%} +{%- if not i18n -%}{%- set i18n = load_data(path="themes/abridge/i18n/" ~ page.lang ~ ".toml", required=false) -%}{%- endif -%} + +{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{%- set uglyurls = true -%}{%- endif %}{%- endif %} + + + {#- Author #} + {%- if page.taxonomies.authors and config.taxonomies %} + {%- for author in page.taxonomies.authors %} + {%- if author_flag %}, {% endif %} + {{ author }} + {%- set_global author_flag = true %} + {%- endfor %} + {%- elif page.extra.authors and config.extra.meta_post?.author %} + {%- if config.extra.icon_author %} {% endif %} + {%- for author in page.extra.authors %} + {%- if author_flag %}, {% endif %} {{ author }} + {%- set_global author_flag = true %} + {%- endfor %} + {%- elif config.extra.author and config.extra.meta_post?.author %} + {%- if config.extra.icon_author %} {% endif %} {{ config.extra.author }} + {%- endif %} + + {#- divider #} + {%- if config.extra.meta_post?.author %} + {%- if config.extra.meta_post?.readtime or config.extra.meta_post?.date or config.extra.meta_post?.updated or config.extra.meta_post?.categories_tags %} + {%- if config.extra.meta_post?.divider %}{{ config.extra.meta_post?.divider | safe }}{%- else %} {%- endif %} + {%- endif %} + {%- endif %} + + {#- ReadTime #} + {%- if config.extra.meta_post?.readtime %} {%- if config.extra.icon_read %} {% endif %} {{ page.reading_time }} {{ config.extra.meta_post?.readstring | default(value="min") }} + {#- divider #} + {%- if config.extra.meta_post?.date or config.extra.meta_post?.updated or config.extra.meta_post?.categories_tags %} + {%- if config.extra.meta_post?.divider %}{{ config.extra.meta_post?.divider | safe }}{%- else %} {%- endif %}{%- endif %}{%- endif %} + + {#- Date #} + {%- if config.extra.meta_post?.date %} {%- if config.extra.icon_date %} {% endif %} + {%- set lang_locale %}{{}}{% endset %} + {%- set page_date = page.date | date(format="%B %d, %Y", locale=lang_locale) %} + {%- if page_date %} {{ page_date }} {%- else %} {{ page.date | date(format="%B %d, %Y") }} {%- endif %} + {#- divider #} + {%- if config.extra.meta_post?.updated or config.extra.meta_post?.categories_tags %} + {%- if config.extra.meta_post?.divider %}{{ config.extra.meta_post?.divider | safe }}{%- else %} {%- endif %}{%- endif %}{% endif %} + + {#- Updated #} + {%- if config.extra.meta_post?.updated and page.updated %} {%- if config.extra.icon_date %} {% endif %} + {{}}: + {%- set lang_locale %}{{}}{% endset %} + {%- set page_updated = page.updated | date(format="%B %d, %Y", locale=lang_locale) %} + {%- if page_updated %} {{ page_updated }} {%- else %} {{ page.updated | date(format="%B %d, %Y") }} {%- endif %} + {#- divider #} + {%- if config.extra.meta_post?.categories_tags %} + {%- if config.extra.meta_post?.divider %}{{ config.extra.meta_post?.divider | safe }}{%- else %} {%- endif %}{%- endif %}{% endif %} + + {#- Categories #} + {%- if page.taxonomies.categories %} {%- if config.extra.icon_info %} {% endif %} [{% for cat in page.taxonomies.categories %}{{ cat }}{%- if not loop.last %}, {% endif %}{% endfor %}]{% endif %} + + {#- Tags #} + {%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #{{ tag }} {% endfor %}{%- endif %} +{%- endcomponent meta_post %} + +{%- component title_index(page, config) %} +{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- if config.extra.search_library -%}{%- if config.extra.search_library == "offline" -%}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%} + {% if config.extra.title_size_index %}{% endif %}{{ page.title | markdown(inline=true) | safe }}{% if config.extra.title_size_index %}{% endif %} +{%- endcomponent title_index -%} + +{%- component meta_index(page, config) %} +{#- Load current language i18n data from .toml files in user's '/i18n' folder, use theme as fallback. -#} +{%- set i18n = load_data(path="i18n/" ~ page.lang ~ '.toml', required=false) -%} +{%- if not i18n %}{%- set i18n = load_data(path="themes/abridge/i18n/" ~ page.lang ~ ".toml", required=false) %}{%- endif %} +{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%} + + + {#- Author #} + {%- if page.taxonomies.authors and config.taxonomies %} + {%- for author in page.taxonomies.authors %} + {%- if author_flag %}, {% endif %} + {{ author }} + {%- set_global author_flag = true %} + {%- endfor %} + {%- elif page.extra.authors and config.extra.meta_index?.author %} + {%- if config.extra.icon_author %} {% endif %} + {%- for author in page.extra.authors %} + {%- if author_flag %}, {% endif %} {{ author }} + {%- set_global author_flag = true %} + {%- endfor %} + {%- elif config.extra.author and config.extra.meta_index?.author %} + {%- if config.extra.icon_author %} {% endif %} {{ config.extra.author }} + {%- endif %} + + {#- divider #} + {%- if config.extra.meta_index?.author %} + {%- if config.extra.meta_index?.readtime or config.extra.meta_index?.date or config.extra.meta_index?.updated or config.extra.meta_index?.categories_tags %} + {%- if config.extra.meta_index?.divider %}{{ config.extra.meta_index?.divider | safe }}{%- else %} {%- endif %} + {%- endif %} + {%- endif %} + + {#- ReadTime #} + {%- if config.extra.meta_index?.readtime %} {%- if config.extra.icon_read %} {% endif %} {{ page.reading_time }} {{ config.extra.meta_index?.readstring | default(value="min") }} + {#- divider #} + {%- if config.extra.meta_index?.date or config.extra.meta_index?.updated or config.extra.meta_index?.categories_tags %} + {%- if config.extra.meta_index?.divider %}{{ config.extra.meta_index?.divider | safe }}{%- else %} {%- endif %}{%- endif %}{%- endif %} + + {#- Date #} + {%- if config.extra.meta_index?.date %} {%- if config.extra.icon_date %} {% endif %} + {%- set lang_locale %}{{}}{% endset %} + {%- set page_date = page.date | date(format="%B %d, %Y", locale=lang_locale) %} + {%- if page_date %} {{ page_date }} {%- else %} {{ page.date | date(format="%B %d, %Y") }} {%- endif %} + {#- divider #} + {%- if config.extra.meta_index?.updated or config.extra.meta_index?.categories_tags %} + {%- if config.extra.meta_index?.divider %}{{ config.extra.meta_index?.divider | safe }}{%- else %} {%- endif %}{%- endif %}{% endif %} + + {#- Updated #} + {%- if config.extra.meta_index?.updated and page.updated %} {%- if config.extra.icon_date %} {% endif %} + {{}}: + {%- set lang_locale %}{{}}{% endset %} + {%- set page_updated = page.updated | date(format="%B %d, %Y", locale=lang_locale) %} + {%- if page_updated %} {{ page_updated }} {%- else %} {{ page.updated | date(format="%B %d, %Y") }} {%- endif %} + {#- divider #} + {%- if config.extra.meta_index?.categories_tags %} + {%- if config.extra.meta_index?.divider %}{{ config.extra.meta_index?.divider | safe }}{%- else %} {%- endif %}{%- endif %}{% endif %} + + {#- Categories #} + {%- if page.taxonomies.categories %} {%- if config.extra.icon_info %} {% endif %} [{% for cat in page.taxonomies.categories %}{{ cat }}{%- if not loop.last %}, {% endif %}{% endfor %}]{% endif %} + + {#- Tags #} + {%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #{{ tag }} {% endfor %}{%- endif %} +{%- endcomponent meta_index -%} + +{%- component footer(page, config) %} +{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{%- set uglyurls = true %}{%- endif %}{%- endif %} + {#- prev/next content page nextprev title pagination -#} + {%- if not config.extra.hide_page_nextprev_titles | default(value=false) %} + {%- if page.lower or page.higher %} + + {%- endif %} + {%- endif %} +{%- endcomponent footer %} + +{% component pagination(paginator, config) %} +{%- set uglyurls = config.extra.uglyurls | default(value=false) %} +{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} + {%- if paginator.number_pagers > 1 %} + {%- if paginator.number_pagers <= 5 %} {# 5 or less pager is simple, just display all 5 #} + {%- set start = 1 %} + {%- set end = paginator.number_pagers %} + {%- endif %} + + {%- if paginator.number_pagers > 5 %} + + {%- if paginator.current_index >= 3 %} {# Check if the first number will be 1 or not #} + {%- set start = paginator.current_index - 2 %} {# Set the start number #} + {%- if paginator.number_pagers - paginator.current_index < 2 %} {# the last two pages your no longer centered with equal pages start and end #} + {%- set difference = paginator.number_pagers - paginator.current_index %} + {%- set compensation = 1 - difference %} + {%- set start = paginator.current_index - 3 - compensation %} {# however many pages are missing on the end, add offset to start #} + {%- endif %} + {%- else %} + {%- set start = 1 %} + {%- endif %} + + {%- if paginator.number_pagers >= paginator.current_index + 2 %} {# Check if the last page is beyond our range #} + {%- set end = paginator.current_index + 2 %} {# End is beyond our range so we can safely set it to our range #} + {%- if paginator.current_index <= 3 %} {# check offset start, if on page 1 or 2 then set the end to page 5 #} + {%- set end = 5 %} + {%- endif %} + {%- else %} + {%- set end = paginator.number_pagers %} + {%- endif %} + {%- endif %} + + {%- endif %} +{% endcomponent pagination %} + +{% component numpagination(paginator, config) %} +{%- set uglyurls = config.extra.uglyurls | default(value=false) %} +{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} + {%- if paginator.number_pagers > 1 %} + {%- if paginator.number_pagers <= 5 %} {# 5 or less pager is simple, just display all 5 #} + {%- set start = 1 %} + {%- set end = paginator.number_pagers %} + {%- endif %} + + {%- if paginator.number_pagers > 5 %} + + {%- if paginator.current_index >= 3 %} {# Check if the first number will be 1 or not #} + {%- set start = paginator.current_index - 2 %} {# Set the start number #} + {%- if paginator.number_pagers - paginator.current_index < 2 %} {# the last two pages your no longer centered with equal pages start and end #} + {%- set difference = paginator.number_pagers - paginator.current_index %} + {%- set compensation = 1 - difference %} + {%- set start = paginator.current_index - 3 - compensation %} {# however many pages are missing on the end, add offset to start #} + {%- endif %} + {%- else %} + {%- set start = 1 %} + {%- endif %} + + {%- if paginator.number_pagers >= paginator.current_index + 2 %} {# Check if the last page is beyond our range #} + {%- set end = paginator.current_index + 2 %} {# End is beyond our range so we can safely set it to our range #} + {%- if paginator.current_index <= 3 %} {# check offset start, if on page 1 or 2 then set the end to page 5 #} + {%- set end = 5 %} + {%- endif %} + {%- else %} + {%- set end = paginator.number_pagers %} + {%- endif %} + {%- endif %} + + {%- endif %} +{% endcomponent numpagination %} + +{% component seo( config, title="", title_addition="", description="", type="website", is_home=false, is_404=false, is_page=false, page_images="", page_section="", created_time="2023-05-15T07:07:00-07:00", updated_time="2023-05-15T07:07:00-07:00", page="" ) -%} +{#- Load current language i18n data from .toml files in user's '/i18n' folder, use theme as fallback. -#} +{%- set _lang = page.lang if page else config.default_language -%} +{%- set i18n = load_data(path="i18n/" ~ _lang ~ '.toml', required=false) -%} +{%- if not i18n -%}{%- set i18n = load_data(path="themes/abridge/i18n/" ~ _lang ~ ".toml", required=false) -%}{%- endif -%} +{%- set lang_locale %}{{}}{% endset -%} +{%- if is_404 %} + +{%- else %} + + + +{%- endif %} + +{%- if current_url %} + {%- set page_url = current_url %} +{%- else %} + {%- set page_url = get_url(path="404.html", trailing_slash=true) %} +{%- endif %} + {{ title ~ title_addition }} + +{%- if config.extra?.author %} + +{%- endif %} +{%- if config.extra?.facebook_publisher %} + +{%- endif %} + +{%- if config.extra?.facebook_author %} + +{%- endif %} +{%- if page?.description %} + +{%- else %} + +{%- endif %} + +{%- if page?.extra?.keywords and config.extra?.keywords %} + +{%- elif page?.extra?.keywords %} + +{%- elif config.extra?.keywords %} + +{%- endif %} + +{#- Extra SEO START #} +{%- if config.extra?.seo | default(value=true) %} +{%- if not is_404 %} + +{%- if config.extra?.google %} + +{%- endif %} + +{%- if config.extra?.bing %} + +{%- endif %} + + + +{%- if page?.description %} + + +{%- else %} + + +{%- endif %} + +{%- if page?.title %} + + +{%- else %} + + +{%- endif %} + + +{#- SEO MEDIA START #} +{%- if page?.extra?.thumbnail %} + + + + +{%- elif page?.extra?.static_thumbnail %} + + {%- if page?.extra?.static_thumbnail is matching(pat="^http[s]?://") %} + + + {%- else %} + + + {%- endif %} + +{%- elif config.extra?.banner %} + + + + +{%- else %} + + +{%- endif %} + +{%- if config.extra?.open?.audio %} + +{%- endif %} + +{%- if config.extra?.open?.locale %} + +{%- endif %} + +{%- if config.extra?.open?.videos %} + {%- for video in config.extra?.open?.videos %} + + {%- endfor %} +{%- endif %} + +{#- SEO MEDIA END #} + + + +{%- if page?.updated %} + +{%- elif page?.date %} + +{%- else %} + +{%- endif %} + +{%- if config.extra?.twitter_meta %} + + +{%- endif -%} +{%- endif -%} +{%- endif -%} +{#- Extra SEO END -#} +{% endcomponent seo %} + diff --git a/templates/components/gif.html b/templates/components/gif.html new file mode 100644 index 0000000..cf4d264 --- /dev/null +++ b/templates/components/gif.html @@ -0,0 +1,30 @@ +{% component gif(page, config, sources, caption="", class="", w=0, h=0) %} +{%- if caption %}
    {% endif %} + +{%- if caption %}
    {{caption}}
    {% endif %} + +{% endcomponent gif %} diff --git a/templates/components/image.html b/templates/components/image.html new file mode 100644 index 0000000..c8230e1 --- /dev/null +++ b/templates/components/image.html @@ -0,0 +1,64 @@ +{% component image(page, config, sources, caption="", class="", alt="", w=0, h=0) %} +{%- if caption %}
    {% endif %} + + {%- for src in sources %} + + {%- set video = src | split(pat="/") | last %} + {%- set dirtest = src | trim_start(pat="./") %} + {%- if dirtest is containing(pat="/") %} {%- set reldir = true %} {%- endif %} + {%- if page and page.path %}{%- set pagepath = page.path %}{%- elif section and section.path %}{%- set pagepath = section.path %}{%- endif %} + + {%- if src is starting_with(pat="./") and reldir %}{# Relative Path #} + {%- set path = (src | trim_start(pat="./") | split(pat="/"))[:-1] | join(sep="/") | trim_start(pat="/") -%} + {%- set path = path ~ "/" %} + {%- if not w or not h %} + {%- if page.lang != config.default_language %} + {%- set metapath = (pagepath ~ path ~ video) | replace(from="/" ~ page.lang ~ "/", to="/") %} + {%- else %} + {%- set metapath = pagepath ~ path ~ video %} + {%- endif %} + {%- set meta = get_image_metadata(path=metapath) %} + {%- set w = meta.width %} + {%- set h = meta.height %} + {%- endif %} + + {%- elif src is starting_with(pat="/") %}{# Root Path #} + {%- set rootpath = (src | split(pat="/"))[:-1] | join(sep="/") -%} + {%- set path = (config.base_url if config else "") ~ rootpath ~ "/" %} + {%- if not w or not h %} + {%- set metapath = rootpath ~ "/" ~ video %} + {%- set meta = get_image_metadata(path=metapath) %} + {%- set w = meta.width %} + {%- set h = meta.height %} + {%- endif %} + + {%- else %}{# Same Directory Path #} + {%- set path = "" %} + {%- if not w or not h %} + {%- if page.lang != config.default_language %} + {%- set metapath = (pagepath ~ video) | replace(from="/" ~ page.lang ~ "/", to="/") %} + {%- else %} + {%- set metapath = pagepath ~ video %} + {%- endif %} + {%- set meta = get_image_metadata(path=metapath) %} + {%- set w = meta.width %} + {%- set h = meta.height %} + {%- endif %} + + {%- endif %} + + {%- set type = src | split(pat=".") | last %} + {%- if type is matching(pat="^mov$") %}{%- set type = "quicktime" %}{% endif %} + {%- if loop.last %} + {%- if not alt %} + {%- set alt = video | split(pat=".") | first %} + {%- endif %} + {{ alt }} + {%- else %} + + {%- endif %} + {%- endfor %} + +{%- if caption %}
    {{caption}}
    {% endif %} + +{% endcomponent image %} diff --git a/templates/components/img.html b/templates/components/img.html new file mode 100644 index 0000000..6aa5b2e --- /dev/null +++ b/templates/components/img.html @@ -0,0 +1,52 @@ +{% component img(page, config, src, caption="", class="", alt="", w=0, h=0, link="") %} +{%- set img = src | split(pat="/") | last %} +{%- set dirtest = src | trim_start(pat="./") %} +{%- if dirtest is containing(pat="/") %} {%- set reldir = true %} {%- endif %} +{%- if page and page.path %}{%- set pagepath = page.path %}{%- elif section and section.path %}{%- set pagepath = section.path %}{%- endif %} + +{%- if src is starting_with(pat="./") and reldir %} {# Relative Path #} + {%- set path = (src | trim_start(pat="./") | split(pat="/"))[:-1] | join(sep="/") | trim_start(pat="/") -%} + {%- set path = path ~ "/" %} + {%- if not w or not h %} + {%- if page.lang != config.default_language %} + {%- set metapath = (pagepath ~ path ~ img) | replace(from="/" ~ page.lang ~ "/", to="/") %} + {%- else %} + {%- set metapath = pagepath ~ path ~ img %} + {%- endif %} + {%- set meta = get_image_metadata(path=metapath) %} + {%- set w = meta.width %} + {%- set h = meta.height %} + {%- endif %} + +{%- elif src is starting_with(pat="/") %} {# Root Path #} + {%- set rootpath = (src | split(pat="/"))[:-1] | join(sep="/") -%} + {%- set path = (config.base_url if config else "") ~ rootpath ~ "/" %} + {%- if not w or not h %} + {%- set metapath = rootpath ~ "/" ~ img %} + {%- set meta = get_image_metadata(path=metapath) %} + {%- set w = meta.width %} + {%- set h = meta.height %} + {%- endif %} + +{%- else %} {# Same Directory Path #} + {%- set path = "" %} + {%- if not w or not h %} + {%- if page.lang != config.default_language %} + {%- set metapath = (pagepath ~ img) | replace(from="/" ~ page.lang ~ "/", to="/") %} + {%- else %} + {%- set metapath = pagepath ~ img %} + {%- endif %} + {%- set meta = get_image_metadata(path=metapath) %} + {%- set w = meta.width %} + {%- set h = meta.height %} + {%- endif %} +{%- endif %} + +{%- if not alt %} + {%- set alt = img | split(pat=".") | first %} +{%- endif %} +{%- if caption %}
    {% endif %} +{%- if link %}{% endif %}{% if link %}{% endif %} +{%- if caption %}
    {{ caption | safe }}
    {%- endif %} + +{% endcomponent img %} diff --git a/templates/components/imgswap.html b/templates/components/imgswap.html new file mode 100644 index 0000000..b260615 --- /dev/null +++ b/templates/components/imgswap.html @@ -0,0 +1,103 @@ +{% component imgswap(page, config, main_src, swap_src, caption="", class="", alt="", w=0, h=0) %} +
    + {%- set img = main_src | split(pat="/") | last %} + {%- set dirtest = main_src | trim_start(pat="./") %} + {%- if dirtest is containing(pat="/") %} {%- set reldir = true %} {%- endif %} + {%- if page and page.path %}{%- set pagepath = page.path %}{%- elif section and section.path %}{%- set pagepath = section.path %}{%- endif %} + + {%- if main_src is starting_with(pat="./") and reldir %} {# Relative Path #} + {%- set path = (main_src | trim_start(pat="./") | split(pat="/"))[:-1] | join(sep="/") | trim_start(pat="/") -%} + {%- set path = path ~ "/" %} + {%- if not w or not h %} + {%- if page.lang != config.default_language %} + {%- set metapath = (pagepath ~ path ~ img) | replace(from="/" ~ page.lang ~ "/", to="/") %} + {%- else %} + {%- set metapath = pagepath ~ path ~ img %} + {%- endif %} + {%- set meta = get_image_metadata(path=metapath) %} + {%- set w = meta.width %} + {%- set h = meta.height %} + {%- endif %} + + {%- elif main_src is starting_with(pat="/") %} {# Root Path #} + {%- set rootpath = (main_src | split(pat="/"))[:-1] | join(sep="/") -%} + {%- set path = (config.base_url if config else "") ~ rootpath ~ "/" %} + {%- if not w or not h %} + {%- set metapath = rootpath ~ "/" ~ img %} + {%- set meta = get_image_metadata(path=metapath) %} + {%- set w = meta.width %} + {%- set h = meta.height %} + {%- endif %} + + {%- else %} {# Same Directory Path #} + {%- set path = "" %} + {%- if not w or not h %} + {%- if page.lang != config.default_language %} + {%- set metapath = (pagepath ~ img) | replace(from="/" ~ page.lang ~ "/", to="/") %} + {%- else %} + {%- set metapath = pagepath ~ img %} + {%- endif %} + {%- set meta = get_image_metadata(path=metapath) %} + {%- set w = meta.width %} + {%- set h = meta.height %} + {%- endif %} + {%- endif %} + + {%- if not alt %} + {%- set alt = img | split(pat=".") | first %} + {%- endif %} + {%- if caption %}
    {% endif %} + {%- if link %}{% endif %}{% if link %}{% endif %} + {%- if caption %}
    {{caption}}
    {%- endif %} + + {%- set img = swap_src | split(pat="/") | last %} + {%- set dirtest = swap_src | trim_start(pat="./") %} + {%- if dirtest is containing(pat="/") %} {%- set reldir = true %} {%- endif %} + + {%- if swap_src is starting_with(pat="./") and reldir %} {# Relative Path #} + {%- set path = (swap_src | trim_start(pat="./") | split(pat="/"))[:-1] | join(sep="/") | trim_start(pat="/") -%} + {%- set path = path ~ "/" %} + {%- if not w or not h %} + {%- if page.lang != config.default_language %} + {%- set metapath = (pagepath ~ path ~ img) | replace(from="/" ~ page.lang ~ "/", to="/") %} + {%- else %} + {%- set metapath = pagepath ~ path ~ img %} + {%- endif %} + {%- set meta = get_image_metadata(path=metapath) %} + {%- set w = meta.width %} + {%- set h = meta.height %} + {%- endif %} + + {%- elif swap_src is starting_with(pat="/") %} {# Root Path #} + {%- set rootpath = (swap_src | split(pat="/"))[:-1] | join(sep="/") -%} + {%- set path = (config.base_url if config else "") ~ rootpath ~ "/" %} + {%- if not w or not h %} + {%- set metapath = rootpath ~ "/" ~ img %} + {%- set meta = get_image_metadata(path=metapath) %} + {%- set w = meta.width %} + {%- set h = meta.height %} + {%- endif %} + + {%- else %} {# Same Directory Path #} + {%- set path = "" %} + {%- if not w or not h %} + {%- if page.lang != config.default_language %} + {%- set metapath = (pagepath ~ img) | replace(from="/" ~ page.lang ~ "/", to="/") %} + {%- else %} + {%- set metapath = pagepath ~ img %} + {%- endif %} + {%- set meta = get_image_metadata(path=metapath) %} + {%- set w = meta.width %} + {%- set h = meta.height %} + {%- endif %} + {%- endif %} + + {%- if not alt %} + {%- set alt = img | split(pat=".") | first %} + {%- endif %} + {%- if caption %}
    {% endif %} + {%- if link %}{% endif %}{% if link %}{% endif %} + {%- if caption %}
    {{caption}}
    {%- endif %} +
    + +{% endcomponent imgswap %} diff --git a/templates/components/katex.html b/templates/components/katex.html new file mode 100644 index 0000000..71e27dd --- /dev/null +++ b/templates/components/katex.html @@ -0,0 +1,3 @@ +{% component katex(block=false) %} + +{% endcomponent katex %} diff --git a/templates/components/showdata.html b/templates/components/showdata.html new file mode 100644 index 0000000..2aba3b1 --- /dev/null +++ b/templates/components/showdata.html @@ -0,0 +1,9 @@ +{%- component showdata(page, config, src, type="", key="") -%} +{%- if src and key and type -%} +{%- if src is matching(pat="^http[s]?://") -%}{%- set data = load_data(url=src, format=type) -%}{%- else -%}{%- set data = load_data(path=src, format=type) -%}{%- endif -%} +{{- data[key] }} +{%- else -%} +{%- if src is matching(pat="^http[s]?://") -%}{%- set data = load_data(url=src) -%}{%- else -%}{%- set data = load_data(path=src) -%}{%- endif -%} +{{- data }} +{%- endif -%} +{%- endcomponent showdata -%} diff --git a/templates/components/streamable.html b/templates/components/streamable.html new file mode 100644 index 0000000..94dfc45 --- /dev/null +++ b/templates/components/streamable.html @@ -0,0 +1,5 @@ +{% component streamable(id, class="", title="") %} +
    + +
    +{% endcomponent streamable %} diff --git a/templates/components/video.html b/templates/components/video.html new file mode 100644 index 0000000..ee8130d --- /dev/null +++ b/templates/components/video.html @@ -0,0 +1,30 @@ +{% component video(page, config, sources, caption="", class="", w=0, h=0, autoplay=false, loop=false, muted=false, playsinline=false) %} +{%- if caption %}
    {% endif %} + +{%- if caption %}
    {{caption}}
    {% endif %} + +{% endcomponent video %} diff --git a/templates/components/vimeo.html b/templates/components/vimeo.html new file mode 100644 index 0000000..d5a9e70 --- /dev/null +++ b/templates/components/vimeo.html @@ -0,0 +1,5 @@ +{% component vimeo(id, class="", title="", autoplay=false, loop=false, noautopause=false, cookie=true) %} +
    + +
    +{% endcomponent vimeo %} diff --git a/templates/components/youtube.html b/templates/components/youtube.html new file mode 100644 index 0000000..1022825 --- /dev/null +++ b/templates/components/youtube.html @@ -0,0 +1,5 @@ +{% component youtube(id, class="", title="", playlist="", autoplay=false, cookie=false) %} +
    + +
    +{% endcomponent youtube %} diff --git a/templates/index.html b/templates/index.html index e5da411..3c2c1b1 100644 --- a/templates/index.html +++ b/templates/index.html @@ -2,44 +2,40 @@ This Template Shows a paginated page of the Posts of a section with a short summary. This Template can also be used directly for the index eg: example.com/ or as the rendering template for Sections, eg: example.com/blog/ example.com/software/ #} - {%- extends "base.html" %} {%- set uglyurls = config.extra.uglyurls | default(value=false) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} -{%- block seo %} - {{- super() }} - - {%- if config.title %} - {%- set title = config.title %} - {%- else %} - {%- set title = "" %} - {%- endif %} - - {%- if config.extra.title_addition and title %} - {%- set title_addition = title_separator ~ config.extra.title_addition %} - {%- elif config.extra.title_addition %} - {%- set title_addition = config.extra.title_addition %} - {%- else %} - {%- set title_addition = "" %} - {%- endif %} - - {%- set description = config.description %} - - {{- macros_seo::seo(config=config, title=title, title_addition=title_addition, description=description, is_home=true) }} -{%- endblock seo %} +{%- block seo -%} + {{- super() -}} + {%- if config.title -%} + {%- set title = config.title -%} + {%- else -%} + {%- set title = "" -%} + {%- endif -%} + {%- if config.extra.title_addition and title -%} + {%- set title_addition = title_separator ~ config.extra.title_addition -%} + {%- elif config.extra.title_addition -%} + {%- set title_addition = config.extra.title_addition -%} + {%- else -%} + {%- set title_addition = "" -%} + {%- endif -%} + {%- set description = config.description -%} + {{}} +{%- endblock seo -%} {%- block content %}
    - {%- for page in paginator.pages %} + {%- set pages = paginator.pages if paginator else section.pages %} + {% for page in pages %}
    - {{- 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, config=config) }} + {{}} + {%- if config.extra.meta_index?.position %} + {%- if config.extra.meta_index?.position == "top" or config.extra.meta_index?.position == "both" %} + {{}} {%- endif %}{%- endif %}

    @@ -52,33 +48,33 @@ This Template can also be used directly for the index eg: example.com/ or as the {%- elif page.extra.static_thumbnail %} {%- endif %} - ...{{ macros::translate(key="more", default="more", i18n=i18n) }} + ...{{}}

    - {%- 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, config=config) }} + {%- if config.extra.meta_index?.position %} + {%- if config.extra.meta_index?.position == "bottom" or config.extra.meta_index?.position == "both" %} + {{}} {%- endif %} {%- endif %}
    {%- endfor %} {%- if config.extra.arrow_pagination %} - {{- macros::pagination(paginator=paginator, config=config) }} + {%- if paginator %}{{}}{% endif %} {%- else %} - {{- macros::numpagination(paginator=paginator, config=config) }} + {%- if paginator %}{{}}{% endif %} {%- endif %}
    {%- if config.extra.recent | default(value=true) %} {#- The following line is checking if the template is being used for the root or a section #} - {%- if current_path is matching("^(/[[:alpha:]][[:alpha:]])?(/page/[[:digit:]]+)?/$") %} + {%- if current_path is matching(pat="^(/[[:alpha:]][[:alpha:]])?(/page/[[:digit:]]+)?/$") %} {%- set sec = "" %} {%- else %} {%- if lang == config.default_language %} - {%- set sec = current_path | trim_start_matches(pat="/") | split(pat="/page/") | slice(end=1) | join(sep="") | trim_end_matches(pat="/") %} + {%- set sec = current_path | trim_start(pat="/") | split(pat="/page/") | first | trim_end(pat="/") %} {%- set sec = sec ~ "/" %} {%- else %} - {%- set sec = current_path | trim_start_matches(pat="/" ~ lang ~ "/") | split(pat="/page/") | slice(end=1) | join(sep="") | trim_end_matches(pat="/") %} + {%- set sec = current_path | trim_start(pat="/" ~ lang ~ "/") | split(pat="/page/") | first | trim_end(pat="/") %} {%- set sec = sec ~ "/" %} {%- endif %} {%- endif %} @@ -90,10 +86,10 @@ This Template can also be used directly for the index eg: example.com/ or as the {%- endif %}
    - {{ macros::translate(key="Recent", default="Recent", i18n=i18n) }} + {{}} {%- set recent_items=config.extra.recent_items | default(value=9) -%} - {%- for page in section_item.pages | slice(end=recent_items) %} - {{- macros::page_listing(page=page, config=config) }} + {%- for page in section_item.pages[:recent_items] -%} + {{}} {%- endfor %}
    diff --git a/templates/macros/macros.html b/templates/macros/macros.html deleted file mode 100644 index 84ad119..0000000 --- a/templates/macros/macros.html +++ /dev/null @@ -1,378 +0,0 @@ -{%- macro translate(key, i18n="", default="") %} -{{- i18n[key] | default(value=default) | safe -}} -{%- endmacro %} - -{%- macro page_listing(page, config) %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} -{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} -
    - {{ page.title | markdown(inline=true) | safe }} -
    -{%- endmacro page_listing %} - - -{%- macro series_link(inner, page, config) %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} -{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} - {%- if inner.content == page.content %} - {{ inner.title }}
    - {% else %} - {{ inner.title }}
    - {%- endif %} -{%- endmacro %} - - -{%- macro title_post(page, config) %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} -{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} -

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

    -{%- endmacro title_post %} - - - -{%- macro meta_post(page, config) %} -{# Load current language i18n data from .toml files in user's '/i18n' folder, use theme as fallback. #} -{%- set i18n = load_data(path="i18n/" ~ lang ~ '.toml', required=false) -%} -{%- if not i18n -%}{%- set i18n = load_data(path="themes/abridge/i18n/" ~ lang ~ ".toml", required=false) -%}{%- endif %} - -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} -{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} - - - {#- Author #} - {%- if page.taxonomies.authors and config.taxonomies %} - {%- for author in page.taxonomies.authors %} - {%- if author_flag %}, {% endif %} - {{ author }} - {%- set_global author_flag = true %} - {%- endfor %} - {%- elif page.extra.authors and config.extra.meta_post.author %} - {%- if config.extra.icon_author %} {% endif %} - {%- for author in page.extra.authors %} - {%- if author_flag %}, {% endif %} {{ author }} - {%- set_global author_flag = true %} - {%- endfor %} - {%- elif config.extra.author and config.extra.meta_post.author %} - {%- if config.extra.icon_author %} {% endif %} {{ config.extra.author }} - {%- endif %} - - {#- divider #} - {%- if config.extra.meta_post.author %} - {%- if config.extra.meta_post.readtime or config.extra.meta_post.date or config.extra.meta_post.updated or config.extra.meta_post.categories_tags %} - {%- if config.extra.meta_post.divider %}{{ config.extra.meta_post.divider | safe }}{%- else %} {%- endif %} - {%- endif %} - {%- endif %} - - {#- ReadTime #} - {%- if config.extra.meta_post.readtime %} {%- if config.extra.icon_read %} {% endif %} {{ page.reading_time }} {{ config.extra.meta_post.readstring | default(value="min") }} - {#- divider #} - {%- if config.extra.meta_post.date or config.extra.meta_post.updated or config.extra.meta_post.categories_tags %} - {%- if config.extra.meta_post.divider %}{{ config.extra.meta_post.divider | safe }}{%- else %} {%- endif %}{%- endif %}{%- endif %} - - {#- Date #} - {%- if config.extra.meta_post.date %} {%- if config.extra.icon_date %} {% endif %} - {%- set lang_locale = macros::translate(key='date_locale', default='en_US', i18n=i18n) -%} - {%- set page_date = page.date | date(format="%B %d, %Y", locale=lang_locale) -%} - {%- if page_date %} {{ page_date }} {%- else %} {{ page.date | date(format="%B %d, %Y") }} {%- endif %} - {#- divider #} - {%- if config.extra.meta_post.updated or config.extra.meta_post.categories_tags %} - {%- if config.extra.meta_post.divider %}{{ config.extra.meta_post.divider | safe }}{%- else %} {%- endif %}{%- endif %}{% endif %} - - {#- Updated #} - {%- if config.extra.meta_post.updated and page.updated %} {%- if config.extra.icon_date %} {% endif -%} - {{ macros::translate(key="Updated", default="Updated", i18n=i18n) }}: - {%- set lang_locale = macros::translate(key='date_locale', default='en_US', i18n=i18n) -%} - {%- set page_updated = page.updated | date(format="%B %d, %Y", locale=lang_locale) -%} - {%- if page_updated %} {{ page_updated }} {%- else %} {{ page.updated | date(format="%B %d, %Y") }} {%- endif %} - {#- divider #} - {%- if config.extra.meta_post.categories_tags %} - {%- if config.extra.meta_post.divider %}{{ config.extra.meta_post.divider | safe }}{%- else %} {%- endif %}{%- endif %}{% endif %} - - {#- Categories #} - {%- if page.taxonomies.categories %} {%- if config.extra.icon_info %} {% endif %} [{% for cat in page.taxonomies.categories %}{{ cat }}{%- if not loop.last %}, {% endif %}{% endfor %}]{% endif %} - - {#- Tags #} - {%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #{{ tag }} {% endfor -%}{%- endif %} -{%- endmacro meta_post %} - - - -{%- macro title_index(page, config) %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} -{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} - {% if config.extra.title_size_index %}{% endif %}{{ page.title | markdown(inline=true) | safe }}{% if config.extra.title_size_index %}{% endif %} -{%- endmacro title_index %} - - - -{%- macro meta_index(page, config) %} -{# Load current language i18n data from .toml files in user's '/i18n' folder, use theme as fallback. #} -{%- set i18n = load_data(path="i18n/" ~ lang ~ '.toml', required=false) -%} -{%- if not i18n -%}{%- set i18n = load_data(path="themes/abridge/i18n/" ~ lang ~ ".toml", required=false) -%}{%- endif %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} -{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} - - - {#- Author #} - {%- if page.taxonomies.authors and config.taxonomies %} - {%- for author in page.taxonomies.authors %} - {%- if author_flag %}, {% endif %} - {{ author }} - {%- set_global author_flag = true %} - {%- endfor %} - {%- elif page.extra.authors and config.extra.meta_index.author %} - {%- if config.extra.icon_author %} {% endif %} - {%- for author in page.extra.authors %} - {%- if author_flag %}, {% endif %} {{ author }} - {%- set_global author_flag = true %} - {%- endfor %} - {%- elif config.extra.author and config.extra.meta_index.author %} - {%- if config.extra.icon_author %} {% endif %} {{ config.extra.author }} - {%- endif %} - - {#- divider #} - {%- if config.extra.meta_index.author %} - {%- if config.extra.meta_index.readtime or config.extra.meta_index.date or config.extra.meta_index.updated or config.extra.meta_index.categories_tags %} - {%- if config.extra.meta_index.divider %}{{ config.extra.meta_index.divider | safe }}{%- else %} {%- endif %} - {%- endif %} - {%- endif %} - - {#- ReadTime #} - {%- if config.extra.meta_index.readtime %} {%- if config.extra.icon_read %} {% endif %} {{ page.reading_time }} {{ config.extra.meta_index.readstring | default(value="min") }} - {#- divider #} - {%- if config.extra.meta_index.date or config.extra.meta_index.updated or config.extra.meta_index.categories_tags %} - {%- if config.extra.meta_index.divider %}{{ config.extra.meta_index.divider | safe }}{%- else %} {%- endif %}{%- endif %}{%- endif %} - - {#- Date #} - {%- if config.extra.meta_index.date %} {%- if config.extra.icon_date %} {% endif %} - {%- set lang_locale = macros::translate(key='date_locale', default='en_US', i18n=i18n) -%} - {%- set page_date = page.date | date(format="%B %d, %Y", locale=lang_locale) -%} - {%- if page_date %} {{ page_date }} {%- else %} {{ page.date | date(format="%B %d, %Y") }} {%- endif %} - {#- divider #} - {%- if config.extra.meta_index.updated or config.extra.meta_index.categories_tags %} - {%- if config.extra.meta_index.divider %}{{ config.extra.meta_index.divider | safe }}{%- else %} {%- endif %}{%- endif %}{% endif %} - - {#- Updated #} - {%- if config.extra.meta_index.updated and page.updated %} {%- if config.extra.icon_date %} {% endif -%} - {{ macros::translate(key="Updated", default="Updated", i18n=i18n) }}: - {%- set lang_locale = macros::translate(key='date_locale', default='en_US', i18n=i18n) -%} - {%- set page_updated = page.updated | date(format="%B %d, %Y", locale=lang_locale) -%} - {%- if page_updated %} {{ page_updated }} {%- else %} {{ page.updated | date(format="%B %d, %Y") }} {%- endif %} - {#- divider #} - {%- if config.extra.meta_index.categories_tags %} - {%- if config.extra.meta_index.divider %}{{ config.extra.meta_index.divider | safe }}{%- else %} {%- endif %}{%- endif %}{% endif %} - - {#- Categories #} - {%- if page.taxonomies.categories %} {%- if config.extra.icon_info %} {% endif %} [{% for cat in page.taxonomies.categories %}{{ cat }}{%- if not loop.last %}, {% endif %}{% endfor %}]{% endif %} - - {#- Tags #} - {%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #{{ tag }} {% endfor -%}{%- endif %} -{%- endmacro meta_index %} - - - -{%- macro footer(page, config) %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} -{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} - {#- prev/next content page nextprev title pagination #} - {%- if not config.extra.hide_page_nextprev_titles | default(value=false) %} - {%- if page.lower or page.higher %} - - {%- endif %} - {%- endif %} -{%- endmacro footer %} - - - -{%- macro pagination(paginator, config)%} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} -{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} - {%- if paginator.number_pagers > 1 %} - {%- if paginator.number_pagers <= 5 %} {# 5 or less pager is simple, just display all 5 #} - {%- set start = 1 %} - {%- set end = paginator.number_pagers %} - {%- endif %} - - {%- if paginator.number_pagers > 5 %} - - {%- if paginator.current_index >= 3 %} {# Check if the first number will be 1 or not #} - {%- set start = paginator.current_index - 2 %} {# Set the start number #} - {%- if paginator.number_pagers - paginator.current_index < 2 %} {# the last two pages your no longer centered with equal pages start and end #} - {%- set difference = paginator.number_pagers - paginator.current_index %} - {%- set compensation = 1 - difference %} - {%- set start = paginator.current_index - 3 - compensation %} {# however many pages are missing on the end, add offset to start #} - {%- endif %} - {%- else %} - {%- set start = 1 %} - {%- endif %} - - {%- if paginator.number_pagers >= paginator.current_index + 2 %} {# Check if the last page is beyond our range #} - {%- set end = paginator.current_index + 2 %} {# End is beyond our range so we can safely set it to our range #} - {%- if paginator.current_index <= 3 %} {# check offset start, if on page 1 or 2 then set the end to page 5 #} - {%- set end = 5 %} - {%- endif %} - {%- else %} - {%- set end = paginator.number_pagers %} - {%- endif %} - {%- endif %} - - {%- endif %} -{%- endmacro %} - - - -{%- macro numpagination(paginator, config)%} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} -{%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} - {%- if paginator.number_pagers > 1 %} - {%- if paginator.number_pagers <= 5 %} {# 5 or less pager is simple, just display all 5 #} - {%- set start = 1 %} - {%- set end = paginator.number_pagers %} - {%- endif %} - - {%- if paginator.number_pagers > 5 %} - - {%- if paginator.current_index >= 3 %} {# Check if the first number will be 1 or not #} - {%- set start = paginator.current_index - 2 %} {# Set the start number #} - {%- if paginator.number_pagers - paginator.current_index < 2 %} {# the last two pages your no longer centered with equal pages start and end #} - {%- set difference = paginator.number_pagers - paginator.current_index %} - {%- set compensation = 1 - difference %} - {%- set start = paginator.current_index - 3 - compensation %} {# however many pages are missing on the end, add offset to start #} - {%- endif %} - {%- else %} - {%- set start = 1 %} - {%- endif %} - - {%- if paginator.number_pagers >= paginator.current_index + 2 %} {# Check if the last page is beyond our range #} - {%- set end = paginator.current_index + 2 %} {# End is beyond our range so we can safely set it to our range #} - {%- if paginator.current_index <= 3 %} {# check offset start, if on page 1 or 2 then set the end to page 5 #} - {%- set end = 5 %} - {%- endif %} - {%- else %} - {%- set end = paginator.number_pagers %} - {%- endif %} - {%- endif %} - - {%- endif %} -{%- endmacro %} diff --git a/templates/macros/seo.html b/templates/macros/seo.html deleted file mode 100644 index d8853be..0000000 --- a/templates/macros/seo.html +++ /dev/null @@ -1,145 +0,0 @@ -{#- type: website or article, generally setting article for blog articles -#} -{#- 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( config, title="", title_addition="", description="", type="website", is_home=false, is_404=false, is_page=false, page_images="", page_section="", created_time="2023-05-15T07:07:00-07:00", updated_time="2023-05-15T07:07:00-07:00" ) %} - -{#- Load current language i18n data from .toml files in user's '/i18n' folder, use theme as fallback. #} -{%- set i18n = load_data(path="i18n/" ~ lang ~ '.toml', required=false) -%} -{%- if not i18n -%}{%- set i18n = load_data(path="themes/abridge/i18n/" ~ lang ~ ".toml", required=false) -%}{%- endif %} -{%- set lang_locale = macros::translate(key='date_locale', default='en_US', i18n=i18n) -%} - -{%- if is_404 -%} - -{%- else -%} - - - -{%- endif -%} - -{%- if current_url %} - {%- set page_url = current_url %} -{%- else %} - {%- set page_url = get_url(path="404.html", trailing_slash=true) %} -{%- endif %} - {{ title ~ title_addition }} - -{%- if config.extra.author %} - -{%- endif %} -{%- if config.extra.facebook_publisher %} - -{%- endif %} - -{%- if config.extra.facebook_author %} - -{%- endif %} -{%- if page.description %} - -{%- else %} - -{%- endif %} - -{%- if page.extra.keywords and config.extra.keywords %} - -{%- elif page.extra.keywords %} - -{%- elif config.extra.keywords %} - -{%- endif %} - -{#- Extra SEO START #} -{%- if config.extra.seo | default(value=true) %} -{%- if not is_404 %} - -{%- if config.extra.google %} - -{%- endif %} - -{%- if config.extra.bing %} - -{%- endif %} - - - -{%- if page.description %} - - -{%- else %} - - -{%- endif %} - -{%- if page.title %} - - -{%- else %} - - -{%- endif %} - - -{#- SEO MEDIA START #} -{%- if page.extra.thumbnail %} - - - - -{%- elif page.extra.static_thumbnail %} - - {%- if page.extra.static_thumbnail is matching("^http[s]?://") %} - - - {%- else %} - - - {%- endif %} - -{%- elif config.extra.banner %} - - - - -{%- else %} - - -{%- endif %} - -{%- if config.extra.open.audio %} - -{%- endif %} - -{%- if config.extra.open.locale %} - -{%- endif %} - -{%- if config.extra.open.videos %} - {%- for video in config.extra.open.videos %} - - {%- endfor %} -{%- endif %} - -{#- SEO MEDIA END #} - - - -{%- if page.updated %} - -{%- elif page.date %} - -{%- else %} - -{%- endif %} - -{%- if config.extra.twitter_meta %} - - -{%- endif %} - - - -{%- endif %} -{%- endif %} -{#- Extra SEO END #} -{%- endmacro %} diff --git a/templates/page.html b/templates/page.html index 10ea571..6615602 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,43 +1,39 @@ -{# This Template Shows the Individual Blog Posts#} - -{% extends "base.html" %} - -{%- block seo %} - {{- super() }} - {%- set title_addition = "" %} - {%- if page.title and config.title %} - {%- set title = page.title %} - {%- set title_addition = title_separator ~ config.title %} - {%- elif page.title %} - {%- set title = page.title %} - {%- else %} - {%- set title = config.title %} - {%- endif %} - - {%- if page.description %} - {%- set description = page.description %} - {%- else %} - {%- set description = config.description %} - {%- endif %} - {%- set created_time = page.date %} - {%- set updated_time = page.updated %} - {%- if current_section %} - {%- set page_section = current_section %} - {%- else %} - {%- set page_section = "" %} - {%- endif %} - - {{- macros_seo::seo(config=config, title=title, title_addition=title_addition, description=description, type="article", is_page=true, created_time=created_time, updated_time=updated_time, page_section=page_section) }} -{%- endblock seo %} +{#- This Template Shows the Individual Blog Posts -#} +{%- extends "base.html" -%} +{%- block seo -%} + {{- super() -}} + {%- set title_addition = "" -%} + {%- if page.title and config.title -%} + {%- set title = page.title -%} + {%- set title_addition = title_separator ~ config.title -%} + {%- elif page.title -%} + {%- set title = page.title -%} + {%- else -%} + {%- set title = config.title -%} + {%- endif -%} + {%- if page.description -%} + {%- set description = page.description -%} + {%- else -%} + {%- set description = config.description -%} + {%- endif -%} + {%- set created_time = page.date or "" -%} + {%- set updated_time = page.updated or page.date or "" -%} + {%- if current_section -%} + {%- set page_section = current_section -%} + {%- else -%} + {%- set page_section = "" -%} + {%- endif -%} + {{}} +{%- endblock seo -%} {%- block comments_init %} - {%- if not config.extra.comment_system or config.extra.comment_system == "hyvor" and config.extra.comments.hyvor %} + {%- if config.extra.comment_system == "hyvor" and config.extra.comments?.hyvor %} - {%- elif config.extra.comment_system == "remark42" and config.extra.comments.remark42 %} + {%- elif config.extra.comment_system == "remark42" and config.extra.comments?.remark42 %} @@ -46,63 +42,59 @@ {%- block content %}
    + {%- block page_header -%} + {{}} - {%- block page_header %} - {{- macros::title_post(page=page, config=config) }} - - {%- if config.extra.meta_post.position %} - {%- if config.extra.meta_post.position == "top" or config.extra.meta_post.position == "both" %} - {{- macros::meta_post(page=page, config=config) }} + {%- if config.extra.meta_post?.position %} + {%- if config.extra.meta_post?.position == "top" or config.extra.meta_post?.position == "both" %} + {{}} {%- endif %}{%- endif %} {%- endblock page_header %} - {# In Page Series Navigation #} + {#- In Page Series Navigation #} {%- if config.extra.series | default(value=true) %} {%- if page.extra.series %} {%- set tag = get_taxonomy_term(kind="tags", term=page.extra.series, lang=lang) %} - {%- set page_num = tag.page_count | as_str %} + {%- set page_num = tag.page_count | str %} {%- if lang != config.default_language %} - {%- set parts_string = macros::translate(key='Series_parts', default='Series', i18n=i18n) | replace(from="$NUMBER_OF_PARTS", to=page_num) %} - {% else %} + {%- set parts_string %}{{}}{%- endset %} + {%- set parts_string = parts_string | replace(from="$NUMBER_OF_PARTS", to=page_num) %} + {%- else %} {%- set parts_string = config.extra.Series_parts | default(value="Series") | replace(from="$NUMBER_OF_PARTS", to=page_num) %} - {% endif -%} + {%- endif %} -
    -
    - {{ tag.name }} ({{ parts_string }})
    - {%- for inner in tag.pages | sort(attribute="date") %} - {%- if inner.content == page.content %} - {{ inner.title }}
    - {%- set_global current_section_index = loop.index0 %} {# Finds the current section, needed for pagination logic later #} - {% else %} - {{ inner.title }}
    - {%- endif %} - {%- endfor %} +
    +
    + {{ tag.name }} ({{ parts_string }})
    + {%- for inner in tag.pages | sort(attribute="date") %} + {%- if inner.content == page.content %} + {{ inner.title }}
    + {%- set_global current_section_index = loop.index0 %} {# Finds the current section, needed for pagination logic later #} + {%- else %} + {{ inner.title }}
    + {%- endif %} + {%- endfor %} +
    -
    {%- endif %} {%- endif %} - {{ page.content | safe }} - - {%- if config.extra.meta_post.position %} - {%- if config.extra.meta_post.position == "bottom" or config.extra.meta_post.position == "both" %} - {{- macros::meta_post(page=page, config=config) }} + {%- if config.extra.meta_post?.position %} + {%- if config.extra.meta_post?.position == "bottom" or config.extra.meta_post?.position == "both" %} + {{}} {%- endif %}{%- endif %} {%- block page_footer %} - {{- macros::footer(page=page, config=config) }} + {{