Merge branch 'master' into plausible

templates/base.html

@@ -100,8 +100,21 @@
   {% include "partial/ga.html" %}
   {% include "partial/ggst.html" %}
 
+
   {% include "partial/plausible.html" %}
 
+  {% if PGP_KEY %}
+    <link rel="pgpkey" type="application/pgp-keys" href="{{ SITEURL }}/{{ PGP_KEY }}">
+  {% endif %}
+
+  {% if WEBMENTION_URL %}
+    <link rel="webmention" href="{{ WEBMENTION_URL }}" />
+  {% endif %}
+
+  {% if PINGBACK_URL %}
+    <link rel="pingback" href="{{ PINGBACK_URL }}" />
+  {% endif %}
+
   {% if not PLUGINS or 'seo' not in PLUGINS %}
     {% if REL_CANONICAL %}
       {% if page %}

templates/partial/jsonld_article.html

@@ -1,4 +1,4 @@
-{% if not PLUGINS or 'seo' not in PLUGINS %}
+{% if not PLUGINS or 'seo' not in PLUGINS or 'pelican.plugins.seo' not in PLUGINS%}
   {% if SITELOGO %}
     {% set default_cover = SITELOGO %}
   {% else %}

templates/partial/neighbors.html

@@ -1,4 +1,4 @@
-{% if PLUGINS and 'neighbors' in PLUGINS %}
+{% if PLUGINS and ('neighbors' in PLUGINS or 'pelican.plugins.neighbors' in PLUGINS) %}
   <div class="neighbors">
   {% if article.prev_article %}
     <a class="btn float-left" href="{{ SITEURL }}/{{ article.prev_article.url }}" title="{{ article.prev_article.title|striptags }}">

templates/partial/og.html

@@ -1,4 +1,4 @@
-{% if not PLUGINS or 'seo' not in PLUGINS %}
+{% if not PLUGINS or 'seo' not in PLUGINS or 'pelican.plugins.seo' not in PLUGINS %}
   {% if OG_LOCALE %}
     {% set default_locale = OG_LOCALE %}
   {% else %}

templates/partial/og_article.html

@@ -1,4 +1,4 @@
-{% if not PLUGINS or 'seo' not in PLUGINS %}
+{% if not PLUGINS or 'seo' not in PLUGINS or 'pelican.plugins.seo' not in PLUGINS %}
   {% if OG_LOCALE %}
     {% set default_locale = OG_LOCALE %}
   {% else %}

templates/partial/sidebar.html

@@ -23,7 +23,7 @@
     </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...') }}"/>
+      <input class="stork-input" type="text" autocomplete="off" name="q" data-stork="sitesearch" placeholder="{{ _('Search...') }}" onclick="loadStorkIndex()"/>
       <div class="stork-output" data-stork="sitesearch-output"></div>
     </div>
     {% endif %}

templates/partial/stork.html

@@ -1,13 +1,15 @@
 {% if 'pelican.plugins.search' in PLUGINS %}
+  <script>
+    window.loadStorkIndex = function () {
+      {% if not STORK_VERSION %}
+      stork.initialize("{{ SITEURL }}/{{ THEME_STATIC_DIR }}/stork/stork.wasm")
+      {% endif %}
+      stork.register("sitesearch", "{{ SITEURL }}/search-index.st", { showProgress: false });
+    }
+  </script>
   {% if STORK_VERSION %}
   <script src="https://files.stork-search.net/releases/v{{ STORK_VERSION }}/stork.js"></script>
-  <script>
-    stork.register("sitesearch", "{{ SITEURL }}/search-index.st", {showProgress: false});
-  </script>
   {% else %}
   <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/stork/stork.js"></script>
-  <script>
-    stork.register("sitesearch", "{{ SITEURL }}/search-index.st", {showProgress: false});
-  </script>
   {% endif %}
 {% endif %}

templates/search.html

@@ -2,14 +2,14 @@
 {% extends 'base.html' %}
 {% block title %}{{ _('Search') }} - {{ SITENAME|striptags }}{% endblock title %}
 {% block content %}
+
 <article class="single">
   <header>
     <h1 id="categories">{{ _('Search Results') }}</h1>
   </header>
   <div id="tipue_search_content"></div>
 </article>
-{% endblock content %}
-{% block additional_js %}
+{% endblock content %} {% block additional_js %}
 <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/tipuesearch/jquery.min.js"></script>
 <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/tipuesearch/tipuesearch.min.js"></script>
 <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/tipuesearch/tipuesearch_set.min.js"></script>
@@ -23,5 +23,4 @@
     });
   });
 </script>
-{% endblock additional_js %}
-{% endif %}
+{% endblock %} {% endif %}