From 1d14d4a4d69b8cf30425a3faf15ff82957d033c6 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Fri, 13 Mar 2026 12:42:08 -0700 Subject: [PATCH] ui: Rename 'plinth_extras' template tags module to 'extras' - Remove yet another reference to 'plinth'. Tests: - Some basic pages work. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/backups/templates/backups.html | 2 +- .../templates/backups_add_remote_repository.html | 2 +- .../backups/templates/backups_repository.html | 2 +- .../modules/backups/templates/backups_upload.html | 2 +- .../backups/templates/verify_ssh_hostkey.html | 2 +- plinth/modules/bepasty/templates/bepasty.html | 2 +- plinth/modules/calibre/templates/calibre.html | 2 +- .../diagnostics/templates/diagnostics_full.html | 2 +- .../modules/dynamicdns/templates/dynamicdns.html | 2 +- plinth/modules/email/templates/email.html | 2 +- .../templates/featherwiki_configure.html | 2 +- .../first_boot/templates/firstboot_complete.html | 2 +- .../modules/gitweb/templates/gitweb_configure.html | 2 +- plinth/modules/help/templates/help_about.html | 2 +- plinth/modules/help/templates/help_contribute.html | 2 +- plinth/modules/help/templates/help_manual.html | 2 +- .../ikiwiki/templates/ikiwiki_configure.html | 2 +- .../modules/kiwix/templates/kiwix-add-package.html | 2 +- plinth/modules/kiwix/templates/kiwix.html | 2 +- .../templates/matrix-synapse-pre-setup.html | 2 +- .../matrixsynapse/templates/matrix-synapse.html | 2 +- plinth/modules/miniflux/templates/miniflux.html | 2 +- plinth/modules/names/templates/names.html | 2 +- .../networks/templates/connection_show.html | 2 +- .../networks/templates/connections_fields.html | 2 +- .../networks/templates/connections_list.html | 2 +- plinth/modules/networks/templates/wifi_scan.html | 2 +- .../pagekite/templates/pagekite_configure.html | 2 +- .../templates/pagekite_custom_services.html | 2 +- .../power/templates/power_busy_warning.html | 2 +- plinth/modules/samba/templates/samba.html | 2 +- plinth/modules/security/templates/security.html | 2 +- plinth/modules/sharing/templates/sharing.html | 2 +- .../snapshot/templates/snapshot_manage.html | 2 +- .../snapshot/templates/snapshot_not_supported.html | 2 +- plinth/modules/storage/templates/storage.html | 2 +- .../tiddlywiki/templates/tiddlywiki_configure.html | 2 +- .../upgrades/templates/backports-firstboot.html | 2 +- .../templates/upgrades-dist-upgrade-confirm.html | 2 +- .../upgrades/templates/upgrades-dist-upgrade.html | 2 +- .../upgrades/templates/upgrades_configure.html | 2 +- .../modules/users/templates/users_firstboot.html | 2 +- plinth/modules/users/templates/users_list.html | 2 +- plinth/modules/wireguard/templates/wireguard.html | 2 +- .../wireguard/templates/wireguard_show_client.html | 2 +- .../wireguard/templates/wireguard_show_server.html | 2 +- plinth/templates/app-header.html | 2 +- plinth/templates/app-logs.html | 2 +- plinth/templates/app.html | 2 +- plinth/templates/base.html | 2 +- plinth/templates/breadcrumbs.html | 2 +- plinth/templates/card.html | 2 +- plinth/templates/clients-button.html | 2 +- plinth/templates/clients.html | 2 +- plinth/templates/first_setup.html | 2 +- plinth/templates/help-menu.html | 2 +- plinth/templates/index.html | 2 +- plinth/templates/internal-zone.html | 2 +- plinth/templates/messages.html | 2 +- plinth/templates/notifications-dropdown.html | 2 +- plinth/templates/notifications.html | 2 +- plinth/templates/operation-notification.html | 2 +- plinth/templates/operations.html | 2 +- plinth/templates/port-forwarding-info.html | 2 +- plinth/templates/setup.html | 2 +- plinth/templates/tags.html | 2 +- plinth/templates/theme-menu.html | 2 +- plinth/templates/toolbar.html | 2 +- .../templatetags/{plinth_extras.py => extras.py} | 0 plinth/tests/test_templatetags.py | 14 +++++++------- 70 files changed, 75 insertions(+), 75 deletions(-) rename plinth/templatetags/{plinth_extras.py => extras.py} (100%) diff --git a/plinth/modules/backups/templates/backups.html b/plinth/modules/backups/templates/backups.html index cf5393a4d..c94c3612a 100644 --- a/plinth/modules/backups/templates/backups.html +++ b/plinth/modules/backups/templates/backups.html @@ -5,7 +5,7 @@ {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% block page_head %} diff --git a/plinth/modules/backups/templates/backups_upload.html b/plinth/modules/backups/templates/backups_upload.html index e03625e86..8e0ac8bf1 100644 --- a/plinth/modules/backups/templates/backups_upload.html +++ b/plinth/modules/backups/templates/backups_upload.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block page_head %} {% endblock %} diff --git a/plinth/modules/backups/templates/verify_ssh_hostkey.html b/plinth/modules/backups/templates/verify_ssh_hostkey.html index 92a73600e..8ea547027 100644 --- a/plinth/modules/backups/templates/verify_ssh_hostkey.html +++ b/plinth/modules/backups/templates/verify_ssh_hostkey.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block content %} diff --git a/plinth/modules/bepasty/templates/bepasty.html b/plinth/modules/bepasty/templates/bepasty.html index 70f416f40..7964c86a8 100644 --- a/plinth/modules/bepasty/templates/bepasty.html +++ b/plinth/modules/bepasty/templates/bepasty.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block configuration %} {{ block.super }} diff --git a/plinth/modules/calibre/templates/calibre.html b/plinth/modules/calibre/templates/calibre.html index ca7558e6b..76f32f00d 100644 --- a/plinth/modules/calibre/templates/calibre.html +++ b/plinth/modules/calibre/templates/calibre.html @@ -4,7 +4,7 @@ {% endcomment %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block configuration %} {{ block.super }} diff --git a/plinth/modules/diagnostics/templates/diagnostics_full.html b/plinth/modules/diagnostics/templates/diagnostics_full.html index 4d4d2257f..11b200a55 100644 --- a/plinth/modules/diagnostics/templates/diagnostics_full.html +++ b/plinth/modules/diagnostics/templates/diagnostics_full.html @@ -4,7 +4,7 @@ {% endcomment %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block content %} diff --git a/plinth/modules/dynamicdns/templates/dynamicdns.html b/plinth/modules/dynamicdns/templates/dynamicdns.html index b6a372460..7eaf9c74e 100644 --- a/plinth/modules/dynamicdns/templates/dynamicdns.html +++ b/plinth/modules/dynamicdns/templates/dynamicdns.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block extra_content %}

{% trans "Domains" %}

diff --git a/plinth/modules/email/templates/email.html b/plinth/modules/email/templates/email.html index b44163d37..bc6e092a7 100644 --- a/plinth/modules/email/templates/email.html +++ b/plinth/modules/email/templates/email.html @@ -4,7 +4,7 @@ {% endcomment %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block subsubmenu %} diff --git a/plinth/modules/featherwiki/templates/featherwiki_configure.html b/plinth/modules/featherwiki/templates/featherwiki_configure.html index 15f2b0557..4ede8049e 100644 --- a/plinth/modules/featherwiki/templates/featherwiki_configure.html +++ b/plinth/modules/featherwiki/templates/featherwiki_configure.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block configuration %} {{ block.super }} diff --git a/plinth/modules/first_boot/templates/firstboot_complete.html b/plinth/modules/first_boot/templates/firstboot_complete.html index d3a7217a6..15a3a93e4 100644 --- a/plinth/modules/first_boot/templates/firstboot_complete.html +++ b/plinth/modules/first_boot/templates/firstboot_complete.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block breadcrumbs %} {% endblock %} diff --git a/plinth/modules/gitweb/templates/gitweb_configure.html b/plinth/modules/gitweb/templates/gitweb_configure.html index c386daa69..e2c6a7d54 100644 --- a/plinth/modules/gitweb/templates/gitweb_configure.html +++ b/plinth/modules/gitweb/templates/gitweb_configure.html @@ -6,7 +6,7 @@ {% load bootstrap %} {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% block configuration %} {{ block.super }} diff --git a/plinth/modules/help/templates/help_about.html b/plinth/modules/help/templates/help_about.html index 5dc4bcc35..436408c0b 100644 --- a/plinth/modules/help/templates/help_about.html +++ b/plinth/modules/help/templates/help_about.html @@ -5,7 +5,7 @@ {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% block content %} diff --git a/plinth/modules/help/templates/help_contribute.html b/plinth/modules/help/templates/help_contribute.html index 0921803ee..fd906f92f 100644 --- a/plinth/modules/help/templates/help_contribute.html +++ b/plinth/modules/help/templates/help_contribute.html @@ -4,7 +4,7 @@ {% endcomment %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block content %}

{% trans "Contribute" %}

diff --git a/plinth/modules/help/templates/help_manual.html b/plinth/modules/help/templates/help_manual.html index 917df69e9..591f73e71 100644 --- a/plinth/modules/help/templates/help_manual.html +++ b/plinth/modules/help/templates/help_manual.html @@ -5,7 +5,7 @@ {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% block page_head %} {{ name }} diff --git a/plinth/modules/matrixsynapse/templates/matrix-synapse.html b/plinth/modules/matrixsynapse/templates/matrix-synapse.html index 0b4183b26..b7c1e9f62 100644 --- a/plinth/modules/matrixsynapse/templates/matrix-synapse.html +++ b/plinth/modules/matrixsynapse/templates/matrix-synapse.html @@ -5,7 +5,7 @@ {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% block page_js %} diff --git a/plinth/modules/miniflux/templates/miniflux.html b/plinth/modules/miniflux/templates/miniflux.html index eda61abb8..a6cca7dd6 100644 --- a/plinth/modules/miniflux/templates/miniflux.html +++ b/plinth/modules/miniflux/templates/miniflux.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block configuration %} {{ block.super }} diff --git a/plinth/modules/names/templates/names.html b/plinth/modules/names/templates/names.html index 4115bf1f7..baf379081 100644 --- a/plinth/modules/names/templates/names.html +++ b/plinth/modules/names/templates/names.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block status %} {{ block.super }} diff --git a/plinth/modules/networks/templates/connection_show.html b/plinth/modules/networks/templates/connection_show.html index 32a6d32f8..35bf7e2de 100644 --- a/plinth/modules/networks/templates/connection_show.html +++ b/plinth/modules/networks/templates/connection_show.html @@ -7,7 +7,7 @@ {% load static %} {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block page_head %} diff --git a/plinth/modules/networks/templates/wifi_scan.html b/plinth/modules/networks/templates/wifi_scan.html index 69c0fad0c..50e34bdbd 100644 --- a/plinth/modules/networks/templates/wifi_scan.html +++ b/plinth/modules/networks/templates/wifi_scan.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block content %} diff --git a/plinth/modules/pagekite/templates/pagekite_configure.html b/plinth/modules/pagekite/templates/pagekite_configure.html index 69229661d..4b1f0e777 100644 --- a/plinth/modules/pagekite/templates/pagekite_configure.html +++ b/plinth/modules/pagekite/templates/pagekite_configure.html @@ -6,7 +6,7 @@ {% load bootstrap %} {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% block configuration %} {{ block.super }} diff --git a/plinth/modules/pagekite/templates/pagekite_custom_services.html b/plinth/modules/pagekite/templates/pagekite_custom_services.html index b6e3ad9a3..d5f077468 100644 --- a/plinth/modules/pagekite/templates/pagekite_custom_services.html +++ b/plinth/modules/pagekite/templates/pagekite_custom_services.html @@ -6,7 +6,7 @@ {% load bootstrap %} {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% block content %}

{% trans 'Add custom PageKite service' %}

diff --git a/plinth/modules/power/templates/power_busy_warning.html b/plinth/modules/power/templates/power_busy_warning.html index b0549532b..4d0fe6e5d 100644 --- a/plinth/modules/power/templates/power_busy_warning.html +++ b/plinth/modules/power/templates/power_busy_warning.html @@ -3,7 +3,7 @@ {% endcomment %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% if pkg_manager_is_busy %}
diff --git a/plinth/modules/samba/templates/samba.html b/plinth/modules/samba/templates/samba.html index 80f91476c..9a150bab8 100644 --- a/plinth/modules/samba/templates/samba.html +++ b/plinth/modules/samba/templates/samba.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% load static %} {% block page_head %} diff --git a/plinth/modules/security/templates/security.html b/plinth/modules/security/templates/security.html index d6a3da3c3..fc7311837 100644 --- a/plinth/modules/security/templates/security.html +++ b/plinth/modules/security/templates/security.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block status %}
diff --git a/plinth/modules/sharing/templates/sharing.html b/plinth/modules/sharing/templates/sharing.html index aa8557dac..17eda8141 100644 --- a/plinth/modules/sharing/templates/sharing.html +++ b/plinth/modules/sharing/templates/sharing.html @@ -5,7 +5,7 @@ {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% block page_head %} diff --git a/plinth/modules/snapshot/templates/snapshot_not_supported.html b/plinth/modules/snapshot/templates/snapshot_not_supported.html index 9441b970f..b30126127 100644 --- a/plinth/modules/snapshot/templates/snapshot_not_supported.html +++ b/plinth/modules/snapshot/templates/snapshot_not_supported.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block configuration %}
diff --git a/plinth/modules/storage/templates/storage.html b/plinth/modules/storage/templates/storage.html index 383bb77f0..bdb61596b 100644 --- a/plinth/modules/storage/templates/storage.html +++ b/plinth/modules/storage/templates/storage.html @@ -6,7 +6,7 @@ {% load bootstrap %} {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% block page_head %} {% trans "Frequent Feature Updates" %} diff --git a/plinth/modules/upgrades/templates/upgrades-dist-upgrade-confirm.html b/plinth/modules/upgrades/templates/upgrades-dist-upgrade-confirm.html index 0c7faeebe..69bcca510 100644 --- a/plinth/modules/upgrades/templates/upgrades-dist-upgrade-confirm.html +++ b/plinth/modules/upgrades/templates/upgrades-dist-upgrade-confirm.html @@ -6,7 +6,7 @@ {% load bootstrap %} {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% block content %}

{% trans "Confirm Distribution Update?" %}

diff --git a/plinth/modules/upgrades/templates/upgrades-dist-upgrade.html b/plinth/modules/upgrades/templates/upgrades-dist-upgrade.html index 69c463023..be6810b78 100644 --- a/plinth/modules/upgrades/templates/upgrades-dist-upgrade.html +++ b/plinth/modules/upgrades/templates/upgrades-dist-upgrade.html @@ -6,7 +6,7 @@ {% load bootstrap %} {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% block content %}

{% trans "Distribution Update" %}

diff --git a/plinth/modules/upgrades/templates/upgrades_configure.html b/plinth/modules/upgrades/templates/upgrades_configure.html index a82ddf860..9d75a644a 100644 --- a/plinth/modules/upgrades/templates/upgrades_configure.html +++ b/plinth/modules/upgrades/templates/upgrades_configure.html @@ -6,7 +6,7 @@ {% load bootstrap %} {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% block status %} {{ block.super}} {% comment %} To extend instead of overwrite {% endcomment %} diff --git a/plinth/modules/users/templates/users_firstboot.html b/plinth/modules/users/templates/users_firstboot.html index 6d91229de..44f3ef30e 100644 --- a/plinth/modules/users/templates/users_firstboot.html +++ b/plinth/modules/users/templates/users_firstboot.html @@ -6,7 +6,7 @@ {% load bootstrap %} {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% block content %}

{% trans "Administrator Account" %}

diff --git a/plinth/modules/users/templates/users_list.html b/plinth/modules/users/templates/users_list.html index 8ea3ab843..6a85793bc 100644 --- a/plinth/modules/users/templates/users_list.html +++ b/plinth/modules/users/templates/users_list.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block configuration %} diff --git a/plinth/modules/wireguard/templates/wireguard.html b/plinth/modules/wireguard/templates/wireguard.html index e100f5dfc..95db00105 100644 --- a/plinth/modules/wireguard/templates/wireguard.html +++ b/plinth/modules/wireguard/templates/wireguard.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block configuration %}

{% trans "As a Server" %}

diff --git a/plinth/modules/wireguard/templates/wireguard_show_client.html b/plinth/modules/wireguard/templates/wireguard_show_client.html index 3f979116e..9a5e5ae58 100644 --- a/plinth/modules/wireguard/templates/wireguard_show_client.html +++ b/plinth/modules/wireguard/templates/wireguard_show_client.html @@ -4,7 +4,7 @@ {% endcomment %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block content %} diff --git a/plinth/modules/wireguard/templates/wireguard_show_server.html b/plinth/modules/wireguard/templates/wireguard_show_server.html index 8bfe0fe78..12adb99ec 100644 --- a/plinth/modules/wireguard/templates/wireguard_show_server.html +++ b/plinth/modules/wireguard/templates/wireguard_show_server.html @@ -4,7 +4,7 @@ {% endcomment %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block content %} diff --git a/plinth/templates/app-header.html b/plinth/templates/app-header.html index 3fb3a7001..4e25d8096 100644 --- a/plinth/templates/app-header.html +++ b/plinth/templates/app-header.html @@ -5,7 +5,7 @@ {% load bootstrap %} {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %}
diff --git a/plinth/templates/app-logs.html b/plinth/templates/app-logs.html index 7fc8c0d93..7d9e25fd9 100644 --- a/plinth/templates/app-logs.html +++ b/plinth/templates/app-logs.html @@ -4,7 +4,7 @@ {% endcomment %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% block content %}

{% trans "Logs" %}: {{ app_info.name }}

diff --git a/plinth/templates/app.html b/plinth/templates/app.html index ed74baf62..8ac4424ba 100644 --- a/plinth/templates/app.html +++ b/plinth/templates/app.html @@ -7,7 +7,7 @@ {% load bootstrap %} {% load i18n %} -{% load plinth_extras %} +{% load extras %} {% load static %} {% block content %} diff --git a/plinth/templates/base.html b/plinth/templates/base.html index 116d54ba1..fd05b7996 100644 --- a/plinth/templates/base.html +++ b/plinth/templates/base.html @@ -1,6 +1,6 @@ {% load i18n %} {% load static %} -{% load plinth_extras %} +{% load extras %} {% comment %} # SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/plinth/templates/breadcrumbs.html b/plinth/templates/breadcrumbs.html index a4c671686..b654bf77e 100644 --- a/plinth/templates/breadcrumbs.html +++ b/plinth/templates/breadcrumbs.html @@ -2,7 +2,7 @@ # SPDX-License-Identifier: AGPL-3.0-or-later {% endcomment %} -{% load plinth_extras %} +{% load extras %}