From ca22b6115b45931187ecc5e3001eb252ade169f3 Mon Sep 17 00:00:00 2001 From: Jieiku Date: Thu, 9 Jun 2022 21:57:10 -0700 Subject: Add Theme Switcher --- templates/base.html | 31 ++++--- templates/index.html | 15 +++- templates/macros/head.html | 208 +++++++++++++++++++++++++++++++------------ templates/macros/macros.html | 18 ++-- templates/macros/social.html | 42 ++++----- 5 files changed, 212 insertions(+), 102 deletions(-) (limited to 'templates') diff --git a/templates/base.html b/templates/base.html index 1c46795..161e147 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,13 +3,15 @@ {%- import "macros/page.html" as page_macros %} {%- import "macros/macros.html" as macros %} - + + {{- macros_head::theme() }} + {{- macros_head::stylesheets() }} + {{- macros_head::js() }} - {{- macros_head::resource() }} - {{- macros_head::stylesheet() }} + {{- macros_head::feed() }} {%- block seo %} {%- if config.extra.title_separator %} {%- set title_separator = " " ~ config.extra.title_separator ~ " " -%} @@ -17,14 +19,15 @@ {%- set title_separator = " | " -%} {%- endif %} {%- endblock seo %} - {{- macros_head::favicons() }} - {{- macros_head::security() }} - {{- macros_head::math() }} - + {{- macros_head::security() }} + {{- macros_head::favicons() }} + {%- if config.build_search_index %} + + {%- endif %} {%- block header %} @@ -32,11 +35,11 @@

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

{%- if config.extra.logo.file %}{%- endif %}{%- if config.extra.logo.text %}{{ config.extra.logo.text | safe }}{%- endif %}

{%- elif config.extra.textlogo %} -

{%- elif config.title %} -

{%- endif %}

@@ -44,13 +47,17 @@ {%- for i in config.extra.menu %}

{%- endfor %} + {%- if config.extra.js_theme %} +

+ {%- endif %} +

{%- if config.build_search_index %}

- +

diff --git a/templates/index.html b/templates/index.html index a2f5b30..03a652c 100644 --- a/templates/index.html +++ b/templates/index.html @@ -26,8 +26,8 @@

{%- for page in paginator.pages %}

- {{- macros::title(page=page) }} -

{%- if page.summary %} {{ page.summary | markdown(inline=true) | safe }} {%- elif page.description %} @@ -38,6 +38,17 @@ {%- endif %} ...more

+ + {%- if page.taxonomies.authors and config.taxonomies %} + {%- for author in page.taxonomies.authors %} + {%- if author_flag %} and {% endif %} + {{ author }} + {%- set_global author_flag = true %} + {%- endfor %} + {%- elif config.extra.author and config.extra.author_show %}{{ config.extra.author }} + {%- endif %} {{ page.date | date(format="%Y %B %d") }}{%- if config.extra.readtime %} {{ page.reading_time }} {{ config.extra.readtime_string | default(value="min") }} {% endif %} +{%- if page.taxonomies.categories %} [{% for cat in page.taxonomies.categories %}{{ cat }}{% endfor %}]{% endif %} +{%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #{{ tag }} {% endfor -%}{%- endif %}

{%- endfor %} {{- macros::pagination(paginator=paginator) }} diff --git a/templates/macros/head.html b/templates/macros/head.html index 4dc5895..2df6fef 100644 --- a/templates/macros/head.html +++ b/templates/macros/head.html @@ -1,37 +1,164 @@ -{%- macro stylesheet() %} - +{%- macro theme() %} + {%- if config.extra.js_theme %} + {%- if config.extra.js_themeButton or config.extra.js_bundle %} + + {%- endif %} + {%- endif %} {%- endmacro %} +{%- macro stylesheets() %} + + {%- if config.extra.stylesheets %}{%- for i in config.extra.stylesheets %} + + {%- endfor %}{%- endif %} -{%- macro resource() %} {%- if config.extra.fonts %}{%- for i in config.extra.fonts %} {%- if i.url is matching("^http[s]?://") %} - + {%- else %} - + {%- endif %} {%- endfor %}{%- endif %} {%- if config.extra.fontawesome %} - + {%- endif %} -{%- if config.build_search_index %} +{%- if config.extra.math or page.extra.math %} + + {%- if config.extra.katex_css %}{%- if config.extra.katex_css is matching("^http[s]?://") %} + + {%- else %} + + {%- endif %}{%- endif %} + +{%- endif %} + +{%- endmacro %} + + + +{%- macro feed() %} + {%- if config.generate_feed %} + + {%- endif %} +{%- endmacro %} + + + +{%- macro js() %} + + {%- set preStyle = false %} + + {%- if config.extra.fonts %}{%- for i in config.extra.fonts %} + {%- if i.url is matching("^http[s]?://") %} + {%- set preStyle = true %} + {%- endif %} + {%- endfor %}{%- endif %} + + {%- if config.extra.fontawesome %} + {%- set preStyle = true %} + {%- endif %} + + {%- if config.extra.math or page.extra.math %} + {%- if config.extra.katex_css %} + {%- set preStyle = true %} + {%- endif %} + {%- endif %} + +{%- if config.build_search_index and config.extra.js_bundle %} + {%- if config.extra.js_search_index %} {%- endif %} - {%- if config.extra.js_search %} - + + {%- if config.extra.js_bundle %} + {%- endif %} + +{%- elif config.build_search_index %} + + {#- no bundle #} + + {%- if preStyle == true %} + {%- if config.extra.js_prestyle %} + + {%- endif %} + {%- endif %} + + {%- if config.extra.js_theme %} + {%- if config.extra.js_themeButton %} + + {%- endif %} + {%- endif %} + + {%- if config.extra.js_search_index %} + + {%- endif %} + {%- if config.extra.js_search %}{%- for i in config.extra.js_search %} + + {%- endfor %}{%- endif %} + +{%- elif config.extra.js_bundle %} + + {#- no search #} + + + +{%- else %} + + {#- no bundle or search #} + + {%- if preStyle == true %} + {%- if config.extra.js_prestyle %} + + {%- endif %} + {%- endif %} + + {%- if config.extra.js_theme %} + {%- if config.extra.js_themeButton or config.extra.js_bundle %} + + {%- endif %} + {%- endif %} + + +{%- endif %} + + +{#- https://katex.org/docs/autorender.html #} +{#- https://github.com/KaTeX/KaTeX/ #} +{#- https://github.com/KaTeX/KaTeX/tree/main/contrib/mathtex-script-type/ #} +{%- if config.extra.math or page.extra.math %} + + {%- if config.extra.katex_js %}{%- if config.extra.katex_js is matching("^http[s]?://") %} + + {%- else %} + + {%- endif %}{%- endif %} + + {%- if config.extra.mathtex_js %}{%- if config.extra.mathtex_js is matching("^http[s]?://") %} + + {%- else %} + + {%- endif %}{%- endif %} + +{%- if config.extra.math_auto_render or page.extra.math_auto_render %} + {%- if config.extra.katex_autorender_js %} + {%- if config.extra.katex_autorender_js is matching("^http[s]?://") %} + + {%- else %} + + {%- endif %} + {%- endif %} + {%- endif %} -{%- if config.generate_feed %} - {%- endif %} {%- endmacro %} + {%- macro favicons() %} {%- if config.extra.favicon_theme_color %} @@ -63,6 +190,18 @@ {%- endmacro %} + +{%- macro security() %} + {%- if config.extra.security_header_referrer %} + + {%- endif %} + {%- if config.extra.security_header_csp %} + + {%- endif %} +{%- endmacro %} + + + {#- 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 -#} @@ -199,50 +338,3 @@ {%- endif %} {#- Extra SEO END #} {%- endmacro %} - -{%- macro security() %} - {%- if config.extra.security_header_referrer %} - - {%- endif %} - {%- if config.extra.security_header_csp %} - - {%- endif %} -{%- endmacro %} - -{# https://katex.org/docs/autorender.html #} -{# https://github.com/KaTeX/KaTeX/ #} -{# https://github.com/KaTeX/KaTeX/tree/main/contrib/mathtex-script-type/ #} -{%- macro math() %} -{%- if config.extra.math or page.extra.math %} - - {%- if config.extra.katex_css %}{%- if config.extra.katex_css is matching("^http[s]?://") %} - - {%- else %} - - {%- endif %}{%- endif %} - - {%- if config.extra.katex_js %}{%- if config.extra.katex_js is matching("^http[s]?://") %} - - {%- else %} - - {%- endif %}{%- endif %} - - {%- if config.extra.mathtex_js %}{%- if config.extra.mathtex_js is matching("^http[s]?://") %} - - {%- else %} - - {%- endif %}{%- endif %} - -{%- if config.extra.math_auto_render or page.extra.math_auto_render %} - {%- if config.extra.katex_autorender_js %} - {%- if config.extra.katex_autorender_js is matching("^http[s]?://") %} - - {%- else %} - - {%- endif %} - {%- endif %} - -{%- endif %} - -{%- endif %} -{%- endmacro %} diff --git a/templates/macros/macros.html b/templates/macros/macros.html index 8003420..4b6c7d5 100644 --- a/templates/macros/macros.html +++ b/templates/macros/macros.html @@ -1,17 +1,17 @@ {%- macro title(page) %}

- {{ page.date | date(format="%B %d, %Y") }} - {%- if page.taxonomies.authors and config.taxonomies %} by - {%- for author in page.taxonomies.authors %} + + {%- if page.taxonomies.authors and config.taxonomies %} + {%- for author in page.taxonomies.authors %} {%- if author_flag %} and {% endif %} {{ author }} {%- set_global author_flag = true %} - {%- endfor %} - {%- elif config.extra.author and config.extra.author_show %} by {{ config.extra.author }} - {%- endif %} -{%- if page.taxonomies.categories %} [{% for cat in page.taxonomies.categories %}{{ cat }}{% endfor %}]{% endif %} -{%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #{{ tag }} {% endfor -%}{%- endif %} -{%- if config.extra.readtime %} - {{ page.reading_time }} {{ config.extra.readtime_string | default(value="min") }} {% endif %} + {%- endfor %} + {%- elif config.extra.author and config.extra.author_show %}{{ config.extra.author }} + {%- endif %} {{ page.date | date(format="%B %d, %Y") }} +{%- if page.taxonomies.categories %} [{% for cat in page.taxonomies.categories %}{{ cat }}{% endfor %}]{% endif %} +{%- if page.taxonomies.tags %} {%- for tag in page.taxonomies.tags %} #{{ tag }} {% endfor -%}{%- endif %} +{%- if config.extra.readtime %} {{ page.reading_time }} {{ config.extra.readtime_string | default(value="min") }} {% endif %} {%- endmacro title %} diff --git a/templates/macros/social.html b/templates/macros/social.html index c1b0726..96f0056 100644 --- a/templates/macros/social.html +++ b/templates/macros/social.html @@ -1,45 +1,45 @@ {%- macro social_links(social_config) %} {%- set base_url = get_url(path="", lang=lang) %} {%- if config.generate_feed %}{%- if config.extra.social.feed %} - {% endif %}{% endif %} + {% endif %}{% endif %} {%- if social_config.mail %} - {% endif %} + {% endif %} {%- if social_config.mastodon %} - {% endif %} + {% endif %} {%- if social_config.element %} - {% endif %} + {% endif %} {%- if social_config.matrix %} - {% endif %} + {% endif %} {%- if social_config.twitter %} - {% endif %} + {% endif %} {%- if social_config.facebook %} - {% endif %} + {% endif %} {%- if social_config.linkedin %} - {% endif %} + {% endif %} {%- if social_config.researchgate %} - {% endif %} + {% endif %} {%- if social_config.gitlab %} - {% endif %} + {% endif %} {%- if social_config.github %} - {% endif %} + {% endif %} {%- if social_config.bitbucket %} - {% endif %} + {% endif %} {%- if social_config.python %} - {% endif %} + {% endif %} {%- if social_config.docker %} - {% endif %} + {% endif %} {%- if social_config.stack %} - {% endif %} + {% endif %} {%- if social_config.instagram %} - {% endif %} + {% endif %} {%- if social_config.pinterest %} - {% endif %} + {% endif %} {%- if social_config.twitch %} - {% endif %} + {% endif %} {%- if social_config.youtube %} - {% endif %} + {% endif %} {%- if social_config.buymeacoffee %} - {% endif %} + {% endif %} {%- if social_config.github_sponsor %} - {% endif %} + {% endif %} {%- endmacro %} -- cgit v1.3.1