From 08f406c44c861a914c8b63fab454250f8a4c4b36 Mon Sep 17 00:00:00 2001 From: Jieiku Date: Wed, 20 Sep 2023 00:25:21 -0700 Subject: refactor nav, blocks, macros, templates. fix image shortcodes --- templates/base.html | 122 ++++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 62 deletions(-) (limited to 'templates/base.html') diff --git a/templates/base.html b/templates/base.html index 8d85516..b3dfec8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,21 +1,13 @@ -{%- import 'macros/head.html' as macros_head %} -{%- import "macros/social.html" as social_macros %} -{%- import "macros/page.html" as page_macros %} +{%- import 'macros/seo.html' as macros_seo %} {%- import "macros/macros.html" as macros %} {%- set uglyurls = config.extra.uglyurls | default(value=false) -%} {%- if config.extra.offline %}{% set uglyurls = true %}{% endif %} - {{- macros_head::theme(config=config) }} - {{- macros_head::stylesheets(config=config) }} - - - - {{- macros_head::stylesheets_preload(config=config) }} - {{- macros_head::js(config=config) }} - - {{- macros_head::feed(config=config) }} + {%- include "partials/head.html" %} + + {#- SEO: title, description, etc #} {%- block seo %} {%- if config.extra.title_separator %} {%- set title_separator = " " ~ config.extra.title_separator ~ " " -%} @@ -23,15 +15,11 @@ {%- set title_separator = " | " -%} {%- endif %} {%- endblock seo %} - - - - - {{- macros_head::security(config=config) }} - {{- macros_head::favicons(config=config) }} + {%- block comments_init %} {%- endblock comments_init %} - + + {%- include "partials/head_js.html" %} {%- block header %} @@ -39,7 +27,7 @@

{%- if config.extra.logo -%} -

+
{%- if config.extra.logo.file -%} {%- endif -%} @@ -48,56 +36,65 @@ {%- elif config.extra.textlogo -%}
{{ config.extra.textlogo | safe }}
+ index.html{%- endif -%}" title="{{config.title}}">{{ config.extra.textlogo | safe }}
{%- elif config.title -%} -

{%- endif -%}

- {% set js_switcher=config.extra.js_switcher | default(value=true) %} - {%- if config.extra.menu or js_switcher %} - {%- if config.extra.menu %} - {%- for i in config.extra.menu -%} - - {%- if lang != config.default_language %} {{ trans(key=i.name | safe, lang=lang) }} {% else %} {{ i.name | safe }} {% endif -%} - - {%- endfor -%} - {%- endif -%} - {%- if js_switcher -%} - {%- set icon_adjust=config.extra.icon_adjust | default(value="svgs adjust") -%} - {%- if icon_adjust -%}{%- else -%}☀{%- endif -%} - {%- endif -%} - {%- endif -%} - {%- if config.languages | length > 0 %} -

{%- if lang != config.default_language %}{{ trans(key="flag" | safe, lang=lang) }}{% else %}{{ config.extra.flag.en }}{% endif %} - {%- if current_url %} - - {%- if config.build_search_index %} - {%- set icon_search=config.extra.icon_search | default(value="svgs search") %} -

- - {%- endif %}

{%- if config.extra.sitedesc %} {%- if config.description %} @@ -119,11 +116,12 @@

{%- endif %}

- {{- social_macros::social_links(config=config) }} + {%- include "partials/social.html" %} {#- Copyright START #} {%- if config.extra.copyright | default(value=true) -%} {%- set current_year = now() | date(format="%Y") %} + {%- set current_year = '' ~ current_year ~ '' %} {%- if config.extra.copyright_override -%} {%- if lang != config.default_language %} -- cgit v1.3.1