From 0a533d682565f80b4e9190c20554e584ded636d1 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 2 Mar 2024 19:00:17 +0100 Subject: [PATCH] Remove more leftovers from annotateit.org (#3765) --- CHANGES.txt | 1 + .../base-jinja/templates/annotation_helper.tmpl | 16 ---------------- .../themes/base/templates/annotation_helper.tmpl | 16 ---------------- .../themes/bootblog4-jinja/templates/base.tmpl | 1 - nikola/data/themes/bootblog4/templates/base.tmpl | 1 - .../themes/bootstrap4-jinja/templates/base.tmpl | 1 - .../data/themes/bootstrap4/templates/base.tmpl | 1 - 7 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 nikola/data/themes/base-jinja/templates/annotation_helper.tmpl delete mode 100644 nikola/data/themes/base/templates/annotation_helper.tmpl diff --git a/CHANGES.txt b/CHANGES.txt index 5ef6e3de6c..ac1d4fa81c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -13,6 +13,7 @@ Bugfixes (Issue #3750) * Fix the new plugin manager not loading plugins if the plugin folder is a symlink (Issue #3741) * Fix the ``nikola plugin`` command not working (Issue #3736) +* Remove no longer used leftovers of annotations support (Issue #3764) Other ----- diff --git a/nikola/data/themes/base-jinja/templates/annotation_helper.tmpl b/nikola/data/themes/base-jinja/templates/annotation_helper.tmpl deleted file mode 100644 index 86d09b2739..0000000000 --- a/nikola/data/themes/base-jinja/templates/annotation_helper.tmpl +++ /dev/null @@ -1,16 +0,0 @@ -{% macro css() %} - -{% endmacro %} - -{% macro code() %} - - - -{% endmacro %} diff --git a/nikola/data/themes/base/templates/annotation_helper.tmpl b/nikola/data/themes/base/templates/annotation_helper.tmpl deleted file mode 100644 index 70077ab3cd..0000000000 --- a/nikola/data/themes/base/templates/annotation_helper.tmpl +++ /dev/null @@ -1,16 +0,0 @@ -<%def name="css()"> - - - -<%def name="code()"> - - - - diff --git a/nikola/data/themes/bootblog4-jinja/templates/base.tmpl b/nikola/data/themes/bootblog4-jinja/templates/base.tmpl index 0adf4471e9..43b91ff6fd 100644 --- a/nikola/data/themes/bootblog4-jinja/templates/base.tmpl +++ b/nikola/data/themes/bootblog4-jinja/templates/base.tmpl @@ -1,6 +1,5 @@ {# -*- coding: utf-8 -*- #} {% import 'base_helper.tmpl' as base with context %} -{% import 'annotation_helper.tmpl' as notes with context %} {{ set_locale(lang) }} {{ base.html_headstart() }} {% block extra_head %} diff --git a/nikola/data/themes/bootblog4/templates/base.tmpl b/nikola/data/themes/bootblog4/templates/base.tmpl index 69b9d30c92..c924c87473 100644 --- a/nikola/data/themes/bootblog4/templates/base.tmpl +++ b/nikola/data/themes/bootblog4/templates/base.tmpl @@ -1,6 +1,5 @@ ## -*- coding: utf-8 -*- <%namespace name="base" file="base_helper.tmpl" import="*" /> -<%namespace name="notes" file="annotation_helper.tmpl" import="*" /> ${set_locale(lang)} ${base.html_headstart()} <%block name="extra_head"> diff --git a/nikola/data/themes/bootstrap4-jinja/templates/base.tmpl b/nikola/data/themes/bootstrap4-jinja/templates/base.tmpl index 0748bb2afd..d8c834e128 100644 --- a/nikola/data/themes/bootstrap4-jinja/templates/base.tmpl +++ b/nikola/data/themes/bootstrap4-jinja/templates/base.tmpl @@ -1,6 +1,5 @@ {# -*- coding: utf-8 -*- #} {% import 'base_helper.tmpl' as base with context %} -{% import 'annotation_helper.tmpl' as notes with context %} {{ set_locale(lang) }} {{ base.html_headstart() }} {% block extra_head %} diff --git a/nikola/data/themes/bootstrap4/templates/base.tmpl b/nikola/data/themes/bootstrap4/templates/base.tmpl index 21b6141694..a8f46b4f11 100644 --- a/nikola/data/themes/bootstrap4/templates/base.tmpl +++ b/nikola/data/themes/bootstrap4/templates/base.tmpl @@ -1,6 +1,5 @@ ## -*- coding: utf-8 -*- <%namespace name="base" file="base_helper.tmpl" import="*" /> -<%namespace name="notes" file="annotation_helper.tmpl" import="*" /> ${set_locale(lang)} ${base.html_headstart()} <%block name="extra_head">