diff options
| -rw-r--r-- | templates/404.html | 2 | ||||
| -rw-r--r-- | templates/archive.html | 2 | ||||
| -rw-r--r-- | templates/base.html | 14 | ||||
| -rw-r--r-- | templates/categories/list.html | 2 | ||||
| -rw-r--r-- | templates/categories/single.html | 2 | ||||
| -rw-r--r-- | templates/components/components.html | 34 | ||||
| -rw-r--r-- | templates/components/seo.html | 2 | ||||
| -rw-r--r-- | templates/index.html | 6 | ||||
| -rw-r--r-- | templates/page.html | 10 | ||||
| -rw-r--r-- | templates/partials/head.html | 10 | ||||
| -rw-r--r-- | templates/partials/head_js.html | 32 | ||||
| -rw-r--r-- | templates/partials/social.html | 2 | ||||
| -rw-r--r-- | templates/tags/list.html | 2 | ||||
| -rw-r--r-- | templates/tags/single.html | 2 |
14 files changed, 61 insertions, 61 deletions
diff --git a/templates/404.html b/templates/404.html index 70e1f91..02a4f54 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} {%- block seo -%} diff --git a/templates/archive.html b/templates/archive.html index 8bc0f27..3ec7d67 100644 --- a/templates/archive.html +++ b/templates/archive.html @@ -4,7 +4,7 @@ This Template can also be used as the rendering template for Sections, eg: examp #} {% extends "base.html" %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} {%- block seo -%} diff --git a/templates/base.html b/templates/base.html index 97d2f4d..d359226 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,10 +1,10 @@ {#- 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) -%} +{%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library -%}{%- if config.extra.search_library == "offline" -%}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%} <!DOCTYPE html> -<html lang="{%- if lang != config.default_language %}{{ lang }}{% else %}{{ config.extra.language_code | default(value=lang) }}{% endif %}"> +<html lang="{%- if lang != config.default_language %}{{ lang }}{% else %}{{ (config.extra.language_code if config.extra.language_code else lang) }}{% endif %}"> <head> {%- include "partials/head.html" -%} {#- SEO: title, description, etc -#} @@ -45,7 +45,7 @@ <div> <ul> - {%- set js_switcher=config.extra.js_switcher | default(value=true) %} + {%- set js_switcher=(config.extra.js_switcher if config.extra.js_switcher is defined else true) %} {%- if config.extra.menu %} {%- for i in config.extra.menu -%} <li><a{%- if i.size %} class="{{ i.size }}"{% endif %} href="{%- if i.url is matching(pat="^http[s]?://") %}{{ i.url }}{%- else -%}{{ get_url(path=i.url, lang=lang, trailing_slash=i.slash) }}{%- if i.slash and uglyurls %}index.html{%- endif %}{%- endif %}"{% if i.blank %} target="_blank"{% endif %}> @@ -78,7 +78,7 @@ {%- endif %} {%- if js_switcher -%} - {%- set icon_adjust=config.extra.icon_adjust | default(value="svgs adjust") -%} + {%- set icon_adjust=(config.extra.icon_adjust if config.extra.icon_adjust else "svgs adjust") -%} {%- if icon_adjust -%}<li><i type="reset" id="mode" class="js {{ icon_adjust }}"></i>{%- else -%}<i type="reset" id="mode" class="js mode">☀</i></li>{%- endif -%} {%- endif -%} @@ -87,7 +87,7 @@ <div> {%- if config.build_search_index %} - {%- set icon_search=config.extra.icon_search | default(value="svgs svgm search") %} + {%- set icon_search=(config.extra.icon_search if config.extra.icon_search else "svgs svgm search") %} <div> <form autocomplete=off class="js" name="goSearch" id="searchbox"> <div class="searchd"> @@ -142,7 +142,7 @@ {%- endif %} {#- Copyright START #} - {%- if config.extra.copyright | default(value=true) -%} + {%- if (config.extra.copyright if config.extra.copyright is defined else true) -%} {%- set current_year = now() | date(format="%Y") %} {%- set current_year = '<span id="year">' ~ current_year ~ '</span>' %} @@ -160,7 +160,7 @@ {%- endif -%} {#- Copyright END #} - {%- if config.extra.footer_credit | default(value=true) %} + {%- if (config.extra.footer_credit if config.extra.footer_credit is defined else true) %} {%- if config.extra.footer_credit_override %} {{ config.extra.footer_credit_override | safe }} {%- else %} diff --git a/templates/categories/list.html b/templates/categories/list.html index 966fd03..b9a3972 100644 --- a/templates/categories/list.html +++ b/templates/categories/list.html @@ -1,5 +1,5 @@ {%- extends "base.html" -%} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library -%}{%- if config.extra.search_library == "offline" -%}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%} {%- block seo -%} {{- super() -}} diff --git a/templates/categories/single.html b/templates/categories/single.html index de68a4f..47bb6cb 100644 --- a/templates/categories/single.html +++ b/templates/categories/single.html @@ -1,5 +1,5 @@ {%- extends "base.html" -%} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library -%}{%- if config.extra.search_library == "offline" -%}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%} {%- block seo -%} {{- super() -}} diff --git a/templates/components/components.html b/templates/components/components.html index e12b45f..7833747 100644 --- a/templates/components/components.html +++ b/templates/components/components.html @@ -1,9 +1,9 @@ {% component translate(key: string, i18n, default="") %} -{{- i18n[key] | default(value=default) | safe -}} +{{- (i18n[key] if i18n[key] else default) | safe -}} {% endcomponent translate %} {%- component page_listing(page, config) %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{%- set uglyurls = true %}{%- endif %}{%- endif %} <div class="tpad"> <a href="{{ page.permalink | safe}}{%- if uglyurls %}index.html{%- endif %}">{{ page.title | markdown(inline=true) | safe }}</a> @@ -11,7 +11,7 @@ {%- endcomponent page_listing %} {%- component series_link(inner, page, config) %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{%- set uglyurls = true %}{%- endif %}{%- endif %} {%- if inner.content == page.content %} <a class="scur" href="{{ inner.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ inner.title }}</a><br> @@ -21,7 +21,7 @@ {%- endcomponent series_link %} {%- component title_post(page, config) %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) %} +{%- set uglyurls = (config.extra.uglyurls or false) %} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{%- set uglyurls = true %}{%- endif %}{%- endif %} <h1><a href="{{ page.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ page.title | markdown(inline=true) | safe }}</a></h1> {%- endcomponent title_post %} @@ -31,7 +31,7 @@ {%- 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) -%} +{%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{%- set uglyurls = true -%}{%- endif %}{%- endif %} <span{%- if config.extra.meta_post?.size %} class="{{ config.extra.meta_post?.size }}"{% endif %}> @@ -60,7 +60,7 @@ {%- endif %} {#- ReadTime #} - {%- if config.extra.meta_post?.readtime %} {%- if config.extra.icon_read %}<i class="{{ config.extra.icon_read }}"></i> {% endif %} {{ page.reading_time }} {{ config.extra.meta_post?.readstring | default(value="min") }} + {%- if config.extra.meta_post?.readtime %} {%- if config.extra.icon_read %}<i class="{{ config.extra.icon_read }}"></i> {% endif %} {{ page.reading_time }} {{ (config.extra.meta_post?.readstring if config.extra.meta_post?.readstring else "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 %}<span class="hpad">{{ config.extra.meta_post?.divider | safe }}</span>{%- else %} <span class="rpad"></span> {%- endif %}{%- endif %}{%- endif %} @@ -92,7 +92,7 @@ {%- endcomponent meta_post %} {%- component title_index(page, config) %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library -%}{%- if config.extra.search_library == "offline" -%}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%} <big>{% if config.extra.title_size_index %}<span class="{{ config.extra.title_size_index }}">{% endif %}<a href="{{ page.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ page.title | markdown(inline=true) | safe }}</a>{% if config.extra.title_size_index %}</span>{% endif %}</big> {%- endcomponent title_index -%} @@ -101,7 +101,7 @@ {#- 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) -%} +{%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%} <span{%- if config.extra.meta_index?.size %} class="{{ config.extra.meta_index?.size }}"{% endif %}> @@ -130,7 +130,7 @@ {%- endif %} {#- ReadTime #} - {%- if config.extra.meta_index?.readtime %} {%- if config.extra.icon_read %}<i class="{{ config.extra.icon_read }}"></i> {% endif %} {{ page.reading_time }} {{ config.extra.meta_index?.readstring | default(value="min") }} + {%- if config.extra.meta_index?.readtime %} {%- if config.extra.icon_read %}<i class="{{ config.extra.icon_read }}"></i> {% endif %} {{ page.reading_time }} {{ (config.extra.meta_index?.readstring if config.extra.meta_index?.readstring else "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 %}<span class="hpad">{{ config.extra.meta_index?.divider | safe }}</span>{%- else %} <span class="rpad"></span> {%- endif %}{%- endif %}{%- endif %} @@ -162,10 +162,10 @@ {%- endcomponent meta_index -%} {%- component footer(page, config) %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- set uglyurls = (config.extra.uglyurls or 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 not (config.extra.hide_page_nextprev_titles or false) %} {%- if page.lower or page.higher %} <nav> <div> @@ -184,7 +184,7 @@ {%- endcomponent footer %} {% component pagination(paginator, config) %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) %} +{%- set uglyurls = (config.extra.uglyurls or 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 #} @@ -215,10 +215,10 @@ {%- endif %} {%- endif %} <nav class="vpad"> - {%- set icon_first=config.extra.icon_first | default(value="svgs svgh angll") %} - {%- set icon_prev=config.extra.icon_prev | default(value="svgs svgh angl") %} - {%- set icon_next=config.extra.icon_next | default(value="svgs svgh angr") %} - {%- set icon_last=config.extra.icon_last | default(value="svgs svgh angrr") %} + {%- set icon_first=(config.extra.icon_first if config.extra.icon_first else "svgs svgh angll") %} + {%- set icon_prev=(config.extra.icon_prev if config.extra.icon_prev else "svgs svgh angl") %} + {%- set icon_next=(config.extra.icon_next if config.extra.icon_next else "svgs svgh angr") %} + {%- set icon_last=(config.extra.icon_last if config.extra.icon_last else "svgs svgh angrr") %} {%- if paginator.previous %} <a class="on outp" href="{{ paginator.first | safe }}{%- if uglyurls %}index.html{%- endif %}" title="First Page"> {%- if icon_first %}<i class="{{ icon_first }}" alt="First Page"></i> @@ -289,7 +289,7 @@ {% endcomponent pagination %} {% component numpagination(paginator, config) %} -{%- set uglyurls = config.extra.uglyurls | default(value=false) %} +{%- set uglyurls = (config.extra.uglyurls or 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 #} diff --git a/templates/components/seo.html b/templates/components/seo.html index 87861ff..3a99096 100644 --- a/templates/components/seo.html +++ b/templates/components/seo.html @@ -44,7 +44,7 @@ {%- endif %} {#- Extra SEO START #} -{%- if config.extra?.seo | default(value=true) %} +{%- if (config.extra?.seo if config.extra?.seo is defined else true) %} {%- if not is_404 %} {%- if config.extra?.google %} diff --git a/templates/index.html b/templates/index.html index 3c2c1b1..fc75d95 100644 --- a/templates/index.html +++ b/templates/index.html @@ -3,7 +3,7 @@ This Template Shows a paginated page of the Posts of a section with a short summ 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) -%} +{%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} @@ -65,7 +65,7 @@ This Template can also be used directly for the index eg: example.com/ or as the {%- if paginator %}{{<numpagination paginator={paginator} config={config} />}}{% endif %} {%- endif %} </div> - {%- if config.extra.recent | default(value=true) %} + {%- if (config.extra.recent if config.extra.recent is defined else true) %} {#- The following line is checking if the template is being used for the root or a section #} {%- if current_path is matching(pat="^(/[[:alpha:]][[:alpha:]])?(/page/[[:digit:]]+)?/$") %} {%- set sec = "" %} @@ -87,7 +87,7 @@ This Template can also be used directly for the index eg: example.com/ or as the <div class="sblock"> <div class="blockdiv sticky"> <span class="b s150">{{<translate key="Recent" default="Recent" i18n={i18n} />}}</span> - {%- set recent_items=config.extra.recent_items | default(value=9) -%} + {%- set recent_items=(config.extra.recent_items if config.extra.recent_items is defined else 9) -%} {%- for page in section_item.pages[:recent_items] -%} {{<page_listing page={page} config={config} />}} {%- endfor %} diff --git a/templates/page.html b/templates/page.html index 6615602..d8580fa 100644 --- a/templates/page.html +++ b/templates/page.html @@ -52,7 +52,7 @@ {%- endblock page_header %} {#- In Page Series Navigation #} - {%- if config.extra.series | default(value=true) %} + {%- if (config.extra.series if config.extra.series is defined else true) %} {%- if page.extra.series %} {%- set tag = get_taxonomy_term(kind="tags", term=page.extra.series, lang=lang) %} @@ -62,7 +62,7 @@ {%- set parts_string %}{{<translate key="Series_parts" default="Series" i18n={i18n} />}}{%- 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) %} + {%- set parts_string = (config.extra.Series_parts if config.extra.Series_parts else "Series") | replace(from="$NUMBER_OF_PARTS", to=page_num) %} {%- endif %} <div class="block"> @@ -100,14 +100,14 @@ {%- endblock comments_body %} </article> {%- block toc %} - {%- if config.extra.toc | default(value=true) %} + {%- if (config.extra.toc if config.extra.toc is defined else true) %} {%- if page.extra.toc %} {%- set toc = page.toc %} {%- endif %} {%- if toc or page.extra.series %} <div class="sblock"> {%- if page.extra.series %} - {%- set num_extra_pages = config.extra.series_items | default(value=9) %} + {%- set num_extra_pages = (config.extra.series_items if config.extra.series_items is defined else 9) %} <div class="blockdiv"> <a class="b s150" href="{{ tag.permalink | safe }}{%- if uglyurls %}index.html{%- endif %}">{{ parts_string }}</a><br> {%- if tag.page_count > num_extra_pages and num_extra_pages > 0 %} @@ -207,7 +207,7 @@ {%- if page.reading_time %} {%- if page.reading_time > 2 %} -{%- set icon_top=config.extra.icon_top | default(value="svgs svgh angu") -%} +{%- set icon_top=(config.extra.icon_top if config.extra.icon_top else "svgs svgh angu") -%} <span class="topout"> <span class="topleft"> </span><a href="#" class="top" title="Back to Top">{%- if icon_top %}<i class="{{ icon_top }}"></i>{%- else %}⋏{%- endif %}</a> </span> diff --git a/templates/partials/head.html b/templates/partials/head.html index e020404..0341d29 100644 --- a/templates/partials/head.html +++ b/templates/partials/head.html @@ -1,9 +1,9 @@ {#- Theme Switcher Button to toggle between dark/light #} - {%- set integrity = config.extra.integrity | default(value=true) -%} + {%- set integrity = (config.extra.integrity if config.extra.integrity is defined else true) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set integrity = false %}{% endif %}{% endif %} - {%- if config.extra.js_switcher | default(value=true) %} + {%- if (config.extra.js_switcher if config.extra.js_switcher is defined else true) %} {%- set js_theme="js/theme.min.js" %} {%- if config.extra.js_switcher_default %} {%- if config.extra.js_switcher_default == "light" %}{% set js_theme="js/theme_light.min.js" %}{% endif %} @@ -16,7 +16,7 @@ {#- Style Sheets #} - {%- set stylesheets=config.extra.stylesheets | default(value=[ "abridge.css" ]) -%} + {%- set stylesheets=(config.extra.stylesheets if config.extra.stylesheets is defined else [ "abridge.css" ]) -%} {%- if stylesheets %}{%- for i in stylesheets %} <link rel="stylesheet" href="{{ get_url(path=i , trailing_slash=false, cachebust=true) | safe }}" /> {%- endfor %}{%- endif %} @@ -94,7 +94,7 @@ {#- Style Sheets Preload #} - {%- set integrity = config.extra.integrity | default(value=true) -%} + {%- set integrity = (config.extra.integrity if config.extra.integrity is defined else true) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set integrity = false %}{% endif %}{% endif %} {%- if config.extra.fonts %}{%- for i in config.extra.fonts %} @@ -111,7 +111,7 @@ {%- if config.extra.math or page?.extra?.math %} - {%- set katex_css=config.extra.katex_css | default(value="katex.min.css") -%} + {%- set katex_css=(config.extra.katex_css if config.extra.katex_css else "katex.min.css") -%} {%- if katex_css %}{%- if katex_css is matching(pat="^http[s]?://") %} <link rel="preload" as="style" class="preStyle" href="{{ katex_css | safe }}"{%- if integrity and config.extra.katex_css_integrity %} integrity="{{ config.extra.katex_css_integrity | safe }}"{%- endif %} crossorigin="anonymous" /> {%- else %} diff --git a/templates/partials/head_js.html b/templates/partials/head_js.html index af82de8..ae67802 100644 --- a/templates/partials/head_js.html +++ b/templates/partials/head_js.html @@ -1,7 +1,7 @@ {#- JAVASCRIPT -#} - {%- set integrity = config.extra.integrity | default(value=true) -%} + {%- set integrity = (config.extra.integrity if config.extra.integrity is defined else true) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{%- set integrity = false -%}{%- endif -%}{%- endif -%} - {%- set search_library=config.extra.search_library | default(value="elasticlunr") -%} + {%- set search_library=(config.extra.search_library if config.extra.search_library else "elasticlunr") -%} {%- set preStyle = false -%} @@ -16,7 +16,7 @@ {%- endif -%} {%- if config.extra.math or page?.extra?.math -%} - {%- set katex_css=config.extra.katex_css | default(value="katex.min.css") -%} + {%- set katex_css=(config.extra.katex_css if config.extra.katex_css else "katex.min.css") -%} {%- if katex_css -%} {%- set preStyle = true -%} {%- endif -%} @@ -26,14 +26,14 @@ {%- if config.extra.js_bundle -%} {%- if config.build_search_index -%} - {%- if notserve and config.extra.pwa | default(value=false) %} + {%- if notserve and (config.extra.pwa or false) %} <script defer src="{{ get_url(path='js/abridge.min.js' , trailing_slash=false, cachebust=true) | safe }}"{%- if integrity %} integrity="sha384-{{ get_hash(path='js/abridge.min.js', sha_type=384, base64=true) | safe }}"{%- endif %}></script> {%- else %} <script defer src="{{ get_url(path='js/abridge_nopwa.min.js' , trailing_slash=false, cachebust=true) | safe }}"{%- if integrity %} integrity="sha384-{{ get_hash(path='js/abridge_nopwa.min.js', sha_type=384, base64=true) | safe }}"{%- endif %}></script> {%- endif -%} {%- else %} - {%- if notserve and config.extra.pwa | default(value=false) %} + {%- if notserve and (config.extra.pwa or false) %} <script defer src="{{ get_url(path='js/abridge_nosearch.min.js' , trailing_slash=false, cachebust=true) | safe }}"{%- if integrity %} integrity="sha384-{{ get_hash(path='js/abridge_nosearch.min.js', sha_type=384, base64=true) | safe }}"{%- endif %}></script> {%- else %} <script defer src="{{ get_url(path='js/abridge_nosearch_nopwa.min.js' , trailing_slash=false, cachebust=true) | safe }}"{%- if integrity %} integrity="sha384-{{ get_hash(path='js/abridge_nosearch_nopwa.min.js', sha_type=384, base64=true) | safe }}"{%- endif %}></script> @@ -52,24 +52,24 @@ {%- else %}{#- Not js_bundle #} {%- if preStyle == true %} - {%- if config.extra.js_prestyle | default(value=true) %} + {%- if (config.extra.js_prestyle if config.extra.js_prestyle is defined else true) %} <script defer src="{{ get_url(path='js/prestyle.js' , trailing_slash=false, cachebust=true) | safe }}"{%- if integrity %} integrity="sha384-{{ get_hash(path='js/prestyle.js', sha_type=384, base64=true) | safe }}"{%- endif %}></script> {%- endif %} {%- endif %} - {%- if config.extra.js_switcher | default(value=true) %} + {%- if (config.extra.js_switcher if config.extra.js_switcher is defined else true) %} <script defer src="{{ get_url(path='js/theme_button.js' , trailing_slash=false, cachebust=true) | safe }}"{%- if integrity %} integrity="sha384-{{ get_hash(path='js/theme_button.js', sha_type=384, base64=true) | safe }}"{%- endif %}></script> {%- endif %} - {%- if config.extra.js_email_encode | default(value=true) %} + {%- if (config.extra.js_email_encode if config.extra.js_email_encode is defined else true) %} <script defer src="{{ get_url(path='js/email.js' , trailing_slash=false, cachebust=true) | safe }}"{%- if integrity %} integrity="sha384-{{ get_hash(path='js/email.js', sha_type=384, base64=true) | safe }}"{%- endif %}></script> {%- endif %} - {%- if config.extra.js_copycode | default(value=true) %} + {%- if (config.extra.js_copycode if config.extra.js_copycode is defined else true) %} <script defer src="{{ get_url(path='js/codecopy.js' , trailing_slash=false, cachebust=true) | safe }}"{%- if integrity %} integrity="sha384-{{ get_hash(path='js/codecopy.js', sha_type=384, base64=true) | safe }}"{%- endif %}></script> {%- endif %} - {%- if notserve and config.extra.pwa | default(value=false) %} + {%- if notserve and (config.extra.pwa or false) %} <script defer src="{{ get_url(path='js/sw_load.js' , trailing_slash=false, cachebust=true) | safe }}"{%- if integrity %} integrity="sha384-{{ get_hash(path='js/sw_load.js', sha_type=384, base64=true) | safe }}"{%- endif %}></script> {%- endif %} @@ -84,7 +84,7 @@ {%- endif %} {%- endif %} - {%- set uglyurls = config.extra.uglyurls | default(value=false) -%} + {%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library %}{%- if config.extra.search_library == "offline" %}{% set uglyurls = true %}{% endif %}{% endif %} {%- if search_index_format == "elasticlunr_javascript" %}{#- Javascript index format #} <script defer src="{{ get_url(path='js/elasticlunr.min.js' , trailing_slash=false, cachebust=true) | safe }}"{%- if integrity %} integrity="sha384-{{ get_hash(path='js/elasticlunr.min.js' , sha_type=384, base64=true) | safe }}"{%- endif %}></script> @@ -119,19 +119,19 @@ {#- https://github.com/KaTeX/KaTeX/tree/main/contrib/mathtex-script-type/ #} {%- if config.extra.math or page?.extra?.math %} -{%- set katex_bundle=config.extra.katex_bundle | default(value="js/katexbundle.min.js") -%} +{%- set katex_bundle=(config.extra.katex_bundle if config.extra.katex_bundle else "js/katexbundle.min.js") -%} {%- if katex_bundle %} <script defer src="{{ get_url(path=katex_bundle , trailing_slash=false, cachebust=true) }}"{%- if integrity %} integrity="sha384-{{ get_hash(path=katex_bundle, sha_type=384, base64=true) | safe }}"{%- endif %}></script> {%- else %} - {%- set katex_js=config.extra.katex_js | default(value="js/katex.min.js") -%} + {%- set katex_js=(config.extra.katex_js if config.extra.katex_js else "js/katex.min.js") -%} {%- if katex_js %}{%- if katex_js is matching(pat="^http[s]?://") %} <script defer src="{{ katex_js | safe }}"{%- if integrity and config.extra.katex_js_integrity %} integrity="{{ config.extra.katex_js_integrity | safe }}"{%- endif %} crossorigin="anonymous"></script> {%- else %} <script defer src="{{ get_url(path=katex_js , trailing_slash=false, cachebust=true) }}"{%- if integrity %} integrity="sha384-{{ get_hash(path=katex_js, sha_type=384, base64=true) | safe }}"{%- endif %}></script> {%- endif %}{%- endif %} - {%- set mathtex_js=config.extra.mathtex_js | default(value="js/mathtex-script-type.min.js") -%} + {%- set mathtex_js=(config.extra.mathtex_js if config.extra.mathtex_js else "js/mathtex-script-type.min.js") -%} {%- if mathtex_js %}{%- if mathtex_js is matching(pat="^http[s]?://") %} <script defer src="{{ mathtex_js | safe }}"{%- if integrity and config.extra.mathtex_js_integrity %} integrity="{{ config.extra.mathtex_js_integrity | safe }}"{%- endif %} crossorigin="anonymous"></script> {%- else %} @@ -139,7 +139,7 @@ {%- endif %}{%- endif %} {%- if config.extra.math_auto_render or page?.extra?.math_auto_render %} - {%- set katex_autorender_js=config.extra.katex_autorender_js | default(value="js/katex-auto-render.min.js") -%} + {%- set katex_autorender_js=(config.extra.katex_autorender_js if config.extra.katex_autorender_js else "js/katex-auto-render.min.js") -%} {%- if katex_autorender_js %} {%- if katex_autorender_js is matching(pat="^http[s]?://") %} <script defer src="{{ katex_autorender_js | safe }}"{%- if integrity and config.extra.katex_autorender_js_integrity %} integrity="{{ config.extra.katex_autorender_js_integrity | safe }}"{%- endif %} crossorigin="anonymous"></script> @@ -147,7 +147,7 @@ <script defer src="{{ get_url(path=katex_autorender_js , trailing_slash=false, cachebust=true) }}"{%- if integrity %} integrity="sha384-{{ get_hash(path=katex_autorender_js, sha_type=384, base64=true) | safe }}"{%- endif %}></script> {%- endif %} {%- endif %} - {%- set katex_options=config.extra.katex_options | default(value="js/katexoptions.js") -%} + {%- set katex_options=(config.extra.katex_options if config.extra.katex_options else "js/katexoptions.js") -%} {%- if katex_options %} <script defer src="{{ get_url(path=katex_options , trailing_slash=false, cachebust=true) }}"{%- if integrity %} integrity="sha384-{{ get_hash(path=katex_options, sha_type=384, base64=true) | safe }}"{%- endif %}></script> {%- endif %} diff --git a/templates/partials/social.html b/templates/partials/social.html index a44142a..d830f30 100644 --- a/templates/partials/social.html +++ b/templates/partials/social.html @@ -12,7 +12,7 @@ {%- endif -%} {%- if config.extra.mail -%} - {%- if config.extra.mail_encode | default(value=true) -%} + {%- if (config.extra.mail_encode if config.extra.mail_encode is defined else true) -%} {%- set base64_email = config.extra.mail -%} <a class="js m-protected" href="#{{ base64_email | base64_encode }}" target="_blank" title="Mail"><i type="Button" class="svg mail" title="Mail"></i></a> {%- else -%} diff --git a/templates/tags/list.html b/templates/tags/list.html index 0f3488a..bbe195d 100644 --- a/templates/tags/list.html +++ b/templates/tags/list.html @@ -1,5 +1,5 @@ {%- extends "base.html" -%} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library -%}{%- if config.extra.search_library == "offline" -%}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%} {%- block seo -%} {{- super() -}} diff --git a/templates/tags/single.html b/templates/tags/single.html index b507ceb..02593a5 100644 --- a/templates/tags/single.html +++ b/templates/tags/single.html @@ -1,5 +1,5 @@ {%- extends "base.html" -%} -{%- set uglyurls = config.extra.uglyurls | default(value=false) -%} +{%- set uglyurls = (config.extra.uglyurls or false) -%} {%- if config.extra.search_library -%}{%- if config.extra.search_library == "offline" -%}{%- set uglyurls = true -%}{%- endif -%}{%- endif -%} {%- block seo -%} {{- super() -}} |