aboutsummaryrefslogtreecommitdiff
path: root/theme
diff options
context:
space:
mode:
Diffstat (limited to 'theme')
m---------theme/Flex0
-rwxr-xr-xtheme/custom/base.html180
-rw-r--r--theme/custom/partial/sidebar.html98
3 files changed, 118 insertions, 160 deletions
diff --git a/theme/Flex b/theme/Flex
-Subproject cf45bc041258cd2696bb1b9a48f0631f9cf2042
+Subproject e63fdae267319fdfb5a0788fe2de9e75ce06356
diff --git a/theme/custom/base.html b/theme/custom/base.html
index debd12b..da00963 100755
--- a/theme/custom/base.html
+++ b/theme/custom/base.html
@@ -3,6 +3,7 @@
{{ msg % kwargs }}
{%- endmacro -%}
{% endif %}
+
<!DOCTYPE html>
<html lang="{{ DEFAULT_LANG }}">
<head>
@@ -31,9 +32,9 @@
<meta name="HandheldFriendly" content="True" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
{% if page in hidden_pages %}
- <meta name="robots" content="noindex, nofollow" />
+ <meta name="robots" content="noindex, nofollow" />
{% else %}
- <meta name="robots" content="{{ ROBOTS }}" />
+ <meta name="robots" content="{{ ROBOTS }}" />
{% endif %}
{% if USE_GOOGLE_FONTS != False %}
@@ -102,38 +103,14 @@
<link href="{{ SITEURL }}/{{ CUSTOM_CSS }}" rel="stylesheet">
{% endif %}
- {% if FEED_ALL_ATOM %}
- <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom">
- {% endif %}
-
- {% if FEED_ALL_RSS %}
- <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS">
- {% endif %}
+ {% include "partial/icon.html" %}
- {% if FAVICON %}
- <link rel="shortcut icon" href="{{ FAVICON }}" type="image/x-icon">
- <link rel="icon" href="{{ FAVICON }}" type="image/x-icon">
- {% endif %}
+ {% include "partial/color.html" %}
- {% if GOOGLE_ANALYTICS %}
- {% include "partial/ga.html" %}
- {% endif %}
-
- {% if GOOGLE_GLOBAL_SITE_TAG %}
- {% include "partial/ggst.html" %}
- {% endif %}
+ {% include "partial/feed.html" %}
- {% if BROWSER_COLOR %}
- <!-- Chrome, Firefox OS and Opera -->
- <meta name="theme-color" content="{{ BROWSER_COLOR }}">
- <!-- Windows Phone -->
- <meta name="msapplication-navbutton-color" content="{{ BROWSER_COLOR }}">
- <!-- iOS Safari -->
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
- <!-- Microsoft EDGE -->
- <meta name="msapplication-TileColor" content="{{ BROWSER_COLOR }}">
- {% endif %}
+ {% include "partial/ga.html" %}
+ {% include "partial/ggst.html" %}
{% if not PLUGINS or 'seo' not in PLUGINS %}
{% if REL_CANONICAL %}
@@ -168,99 +145,15 @@
});
</script>
{% endif %}
- {% if GOOGLE_TAG_MANAGER %}
- {% include "partial/gtm.html" %}
- {% endif %}
- {% if MICROSOFT_CLARITY %}
- {% include "partial/clarity.html" %}
- {% endif %}
+
+ {% include "partial/gtm.html" %}
+ {% include "partial/clarity.html" %}
</head>
<body {% if not THEME_COLOR_AUTO_DETECT_BROWSER_PREFERENCE %}class="{{ THEME_COLOR|default('light') }}-theme"{% endif %}>
- {% if GOOGLE_TAG_MANAGER %}
- {% include "partial/gtm_noscript.html" %}
- {% endif %}
- <aside>
- <div>
- <a href="{{ SITEURL }}/">
- {% if SITELOGO %}
- <img src="{{ SITELOGO }}" alt="{{ SITETITLE }}" title="{{ SITETITLE }}">
- {% else %}
- <img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/profile.png" alt="{{ SITETITLE }}" title="{{ SITETITLE }}">
- {% endif %}
- </a>
-
- <h1>
- <a href="{{ SITEURL }}/">{{ SITETITLE }}</a>
- </h1>
-
- {% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}
-
- {% if PLUGINS and 'tipue_search' in PLUGINS %}
- <form class="navbar-search" action="{{ SITEURL }}/search.html" role="search">
- <input type="text" name="q" id="tipue_search_input" placeholder="{{ _('Search...') }}">
- </form>
- {% endif %}
-
- {% if pages or LINKS %}
- <nav>
- <ul class="list">
- {# Open links in new window depending on the LINKS_IN_NEW_TAB setting #}
- {% macro get_target(link) -%}
- {%- if LINKS_IN_NEW_TAB in ('all', true) -%}
- _blank
- {%- elif LINKS_IN_NEW_TAB == "external" and not link.startswith("/") and not link.startswith(SITEURL) -%}
- _blank
- {%- else -%}
- _self
- {%- endif -%}
- {%- endmacro %}
-
- {% if PAGES_SORT_ATTRIBUTE -%}
- {% set pages = pages|sort(attribute=PAGES_SORT_ATTRIBUTE) %}
- {%- endif %}
-
- {% if DISPLAY_PAGES_ON_MENU %}
- {% for page in pages %}
- <li>
- <a target="{{ get_target(SITEURL) }}"
- href="{{ SITEURL }}/{{ page.url }}{% if not DISABLE_URL_HASH %}#{{ page.slug }}{% endif %}">
- {{ page.title }}
- </a>
- </li>
- {% endfor %}
- {% endif %}
-
- {% for name, link in LINKS %}
- <li>
- <a target="{{ get_target(link) }}" href="{{ link }}" >{{ name }}</a>
- </li>
- {% endfor %}
- </ul>
- </nav>
- {% endif %}
+ {% include "partial/gtm_noscript.html" %}
- <ul class="social">
- {% for name, link in SOCIAL %}
- <li>
- <a {% if name == 'mastodon' %}rel="me"{% endif %} class="sc-{{ name }}" href="{{ link }}" target="_blank">
- <i class="{% if name in ['envelope', 'rss'] %}fas{% else %}fab{% endif %} fa-{{ name }}"></i>
- </a>
- </li>
- {% endfor %}
- </ul>
- <button class="theme-switch"><i class="fa fa-adjust fa-2x" aria-hidden="true" onclick="modeSwitcher()"></i></button>
- </div>
+ {% include "partial/sidebar.html" %}
- {% if GOOGLE_ADSENSE and GOOGLE_ADSENSE.ads.aside %}
- <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
- <ins class="adsbygoogle ads-aside"
- data-ad-client="{{ GOOGLE_ADSENSE.ca_id }}"
- data-ad-slot="{{ GOOGLE_ADSENSE.ads.aside }}"></ins>
- <script>
- (adsbygoogle = window.adsbygoogle || []).push({});
- </script>
- {% endif %}
- </aside>
<main>
{% if GOOGLE_ADSENSE and GOOGLE_ADSENSE.ads.main_menu %}
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
@@ -272,53 +165,20 @@
</script>
{% endif %}
- {% if MAIN_MENU %}
- <nav>
- <a href="{{ SITEURL }}/">{{ _('Home') }}</a>
-
- {% for title, link in MENUITEMS %}
- <a href="{{ link }}">{{ _(title) }}</a>
- {% endfor %}
-
- {% if FEED_ALL_ATOM %}
- <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">{{ _('Atom') }}</a>
- {% endif %}
-
- {% if FEED_ALL_RSS %}
- <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}">{{ _('RSS') }}</a>
- {% endif %}
- </nav>
- {% endif %}
+ {% include "partial/nav.html" %}
{% block content %}
{% endblock %}
- <footer>
- {% if CC_LICENSE %}
- {% include "partial/cc_license.html" %}
- {% else %}
- {% include "partial/copyright.html" %}
- {% endif %}
- </footer>
+ {% include "partial/footer.html" %}
</main>
- {% if GUAGES %}
- {% include "partial/guages.html" %}
- {% endif %}
-
- {% if ADD_THIS_ID %}
- <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid={{ ADD_THIS_ID }}" async="async"></script>
- {% endif %}
-
- {% if (PIWIK_URL and PIWIK_SITE_ID) or (MATOMO_URL and MATOMO_SITE_ID) %}
- {% include "partial/matomo.html" %}
- {% endif %}
-
{% include "partial/jsonld.html" %}
-
- {% if GITHUB_CORNER_URL %}
- {% include 'partial/github.html' %}
- {% endif %}
+ {% include "partial/guages.html" %}
+ {% include "partial/addthis.html" %}
+ {% include "partial/matomo.html" %}
+ {% include 'partial/github.html' %}
+ {% include 'partial/stork.html' %}
{% block additional_js %}{% endblock %}
</body>
diff --git a/theme/custom/partial/sidebar.html b/theme/custom/partial/sidebar.html
new file mode 100644
index 0000000..e4ae53f
--- /dev/null
+++ b/theme/custom/partial/sidebar.html
@@ -0,0 +1,98 @@
+<aside>
+ <div>
+ <a href="{{ SITEURL }}/">
+ {% if SITELOGO %}
+ <img src="{{ SITELOGO }}" alt="{{ SITETITLE }}" title="{{ SITETITLE }}">
+ {% else %}
+ <img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/profile.png" alt="{{ SITETITLE }}" title="{{ SITETITLE }}">
+ {% endif %}
+ </a>
+
+ <h1>
+ <a href="{{ SITEURL }}/">{{ SITETITLE }}</a>
+ </h1>
+
+ {% if SITESUBTITLE %}
+ <p>{{ SITESUBTITLE }}</p>
+ {% endif %}
+
+ {% if PLUGINS %}
+ {% if ('tipue_search' in PLUGINS or 'pelican.plugins.tipue_search' in PLUGINS) %}
+ <form class="navbar-search" action="{{ SITEURL }}/search.html" role="search">
+ <input type="text" name="q" id="tipue_search_input" placeholder="{{ _('Search...') }}">
+ </form>
+ {% elif 'pelican.plugins.search' in PLUGINS %}
+ <div class="stork">
+ <input class="stork-input" type="text" autocomplete="off" name="q" data-stork="sitesearch" placeholder="{{ _('Search...') }}"/>
+ <div class="stork-output" data-stork="sitesearch-output"></div>
+ </div>
+ {% endif %}
+ {% endif %}
+
+ {% if (pages and DISPLAY_PAGES_ON_MENU) or LINKS %}
+ <nav>
+ <ul class="list">
+ {# Open links in new window depending on the LINKS_IN_NEW_TAB setting #}
+ {% macro get_target(link) -%}
+ {%- if LINKS_IN_NEW_TAB in ('all', true) -%}
+ _blank
+ {%- elif LINKS_IN_NEW_TAB == "external" and not link.startswith("/") and not link.startswith(SITEURL) -%}
+ _blank
+ {%- else -%}
+ _self
+ {%- endif -%}
+ {%- endmacro %}
+
+ {% if PAGES_SORT_ATTRIBUTE -%}
+ {% set pages = pages|sort(attribute=PAGES_SORT_ATTRIBUTE) %}
+ {%- endif %}
+
+ {% if DISPLAY_PAGES_ON_MENU %}
+ {% for page in pages %}
+ <li>
+ <a target="{{ get_target(SITEURL) }}"
+ href="{{ SITEURL }}/{{ page.url }}{% if not DISABLE_URL_HASH %}#{{ page.slug }}{% endif %}">
+ {{ page.title }}
+ </a>
+ </li>
+ {% endfor %}
+ {% endif %}
+
+ {% for name, link in LINKS %}
+ <li>
+ <a target="{{ get_target(link) }}" href="{{ link }}" >{{ name }}</a>
+ </li>
+ {% endfor %}
+ </ul>
+ </nav>
+ {% endif %}
+
+ {% if SOCIAL %}
+ {% set solid = ['at', 'envelope', 'mailbox', 'rss'] %}
+ {% set relme = ['at', 'envelope', 'mailbox', 'mastodon'] %}
+ <ul class="social">
+ {% for name, link in SOCIAL %}
+ <li>
+ <a class="sc-{{ name }}"
+ {% if name in relme %}rel="me"{% endif %}
+ href="{{ link }}"
+ target="_blank">
+ <i class="{% if name in solid %}fa-solid{% else %}fa{% endif %} fa-{{ name }}"></i>
+ </a>
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+ <button class="theme-switch"><i class="fa fa-adjust fa-2x" aria-hidden="true" onclick="modeSwitcher()"></i></button>
+ </div>
+
+ {% if GOOGLE_ADSENSE and GOOGLE_ADSENSE.ads.aside %}
+ <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+ <ins class="adsbygoogle ads-aside"
+ data-ad-client="{{ GOOGLE_ADSENSE.ca_id }}"
+ data-ad-slot="{{ GOOGLE_ADSENSE.ads.aside }}"></ins>
+ <script>
+ (adsbygoogle = window.adsbygoogle || []).push({});
+ </script>
+ {% endif %}
+</aside>