nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-03-25 09:21:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: Rename 'plinth_extras' template tags module to 'extras'

Browse Source 
- Remove yet another reference to 'plinth'.

Tests:

- Some basic pages work.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2026-03-13 12:42:08 -07:00 committed by James Valleroy
parent 20ed01dfbc
commit 1d14d4a4d6
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
70 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plinth/modules/backups/templates/backups.html
View File

@ -5,7 +5,7 @@
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block page_head %}
<link type="text/css" rel="stylesheet"

2
plinth/modules/backups/templates/backups_add_remote_repository.html
View File

@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block page_js %}
<script src="{% static 'backups/backups_add_remote_repository.js' %}"

2
plinth/modules/backups/templates/backups_repository.html
View File

@ -3,7 +3,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
<div class="table-responsive repository" data-repository-name="{{ repository.name }}">
<table class="table" class="archives-list">

2
plinth/modules/backups/templates/backups_upload.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block page_head %}
{% endblock %}

2
plinth/modules/backups/templates/verify_ssh_hostkey.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block content %}

2
plinth/modules/bepasty/templates/bepasty.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block configuration %}
{{ block.super }}

2
plinth/modules/calibre/templates/calibre.html
View File

@ -4,7 +4,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block configuration %}
{{ block.super }}

2
plinth/modules/diagnostics/templates/diagnostics_full.html
View File

@ -4,7 +4,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block content %}

2
plinth/modules/dynamicdns/templates/dynamicdns.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block extra_content %}
<h3>{% trans "Domains" %}</h3>

2
plinth/modules/email/templates/email.html
View File

@ -4,7 +4,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block subsubmenu %}
<a class="btn btn-default" role="button" href="/rspamd/">

2
plinth/modules/featherwiki/templates/featherwiki_configure.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block configuration %}
{{ block.super }}

2
plinth/modules/first_boot/templates/firstboot_complete.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block breadcrumbs %}
{% endblock %}

2
plinth/modules/gitweb/templates/gitweb_configure.html
View File

@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block configuration %}
{{ block.super }}

2
plinth/modules/help/templates/help_about.html
View File

@ -5,7 +5,7 @@
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block content %}

2
plinth/modules/help/templates/help_contribute.html
View File

@ -4,7 +4,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block content %}
<h2>{% trans "Contribute" %}</h2>

2
plinth/modules/help/templates/help_manual.html
View File

@ -5,7 +5,7 @@
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block page_head %}
<link type="text/css" rel="stylesheet"

2
plinth/modules/ikiwiki/templates/ikiwiki_configure.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block configuration %}
{{ block.super }}

2
plinth/modules/kiwix/templates/kiwix-add-package.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block content %}

2
plinth/modules/kiwix/templates/kiwix.html
View File

@ -4,7 +4,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block configuration %}
{{ block.super }}

2
plinth/modules/matrixsynapse/templates/matrix-synapse-pre-setup.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block pagetitle %}
<h2>{{ name }}</h2>

2
plinth/modules/matrixsynapse/templates/matrix-synapse.html
View File

@ -5,7 +5,7 @@
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block page_js %}
<script src="{% static 'matrixsynapse/matrixsynapse.js' %}" defer></script>

2
plinth/modules/miniflux/templates/miniflux.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block configuration %}
{{ block.super }}

2
plinth/modules/names/templates/names.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block status %}
{{ block.super }}

2
plinth/modules/networks/templates/connection_show.html
View File

@ -7,7 +7,7 @@
{% load static %}
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block page_head %}
<link type="text/css" rel="stylesheet"

2
plinth/modules/networks/templates/connections_fields.html
View File

@ -4,7 +4,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% if form.non_field_errors %}
<div class="alert alert-danger alert-dismissible

2
plinth/modules/networks/templates/connections_list.html
View File

@ -4,7 +4,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
<h3>{% trans "Connections" %}</h3>

2
plinth/modules/networks/templates/wifi_scan.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block content %}

2
plinth/modules/pagekite/templates/pagekite_configure.html
View File

@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block configuration %}
{{ block.super }}

2
plinth/modules/pagekite/templates/pagekite_custom_services.html
View File

@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block content %}
<h3>{% trans 'Add custom PageKite service' %}</h3>

2
plinth/modules/power/templates/power_busy_warning.html
View File

@ -3,7 +3,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% if pkg_manager_is_busy %}
<div class="alert alert-danger d-flex align-items-center">

2
plinth/modules/samba/templates/samba.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% load static %}
{% block page_head %}

2
plinth/modules/security/templates/security.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block status %}
<div class="btn-toolbar">

2
plinth/modules/sharing/templates/sharing.html
View File

@ -5,7 +5,7 @@
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block page_head %}
<link type="text/css" rel="stylesheet"

2
plinth/modules/snapshot/templates/snapshot_manage.html
View File

@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block page_js %}
<script src="{% static 'snapshot/snapshot.js' %}" defer></script>

2
plinth/modules/snapshot/templates/snapshot_not_supported.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block configuration %}
<div id="snapshot-not-supported" class="alert alert-danger d-flex align-items-center">

2
plinth/modules/storage/templates/storage.html
View File

@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block page_head %}
<link type="text/css" rel="stylesheet"

2
plinth/modules/tiddlywiki/templates/tiddlywiki_configure.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block configuration %}
{{ block.super }}

2
plinth/modules/upgrades/templates/backports-firstboot.html
View File

@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block content %}
<h1>{% trans "Frequent Feature Updates" %}</h1>

2
plinth/modules/upgrades/templates/upgrades-dist-upgrade-confirm.html
View File

@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block content %}
<h3>{% trans "Confirm Distribution Update?" %}</h3>

2
plinth/modules/upgrades/templates/upgrades-dist-upgrade.html
View File

@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block content %}
<h3>{% trans "Distribution Update" %}</h3>

2
plinth/modules/upgrades/templates/upgrades_configure.html
View File

@ -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 %}

2
plinth/modules/users/templates/users_firstboot.html
View File

@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block content %}
<h2>{% trans "Administrator Account" %}</h2>

2
plinth/modules/users/templates/users_list.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block configuration %}

2
plinth/modules/wireguard/templates/wireguard.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block configuration %}
<h3>{% trans "As a Server" %}</h3>

2
plinth/modules/wireguard/templates/wireguard_show_client.html
View File

@ -4,7 +4,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block content %}

2
plinth/modules/wireguard/templates/wireguard_show_server.html
View File

@ -4,7 +4,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block content %}

2
plinth/templates/app-header.html
View File

@ -5,7 +5,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
<header class="app-header {% if not app_info.icon_filename %} app-header-single-column {% endif %}">

2
plinth/templates/app-logs.html
View File

@ -4,7 +4,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block content %}
<h2>{% trans "Logs" %}: {{ app_info.name }}</h2>

2
plinth/templates/app.html
View File

@ -7,7 +7,7 @@
{% load bootstrap %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% load static %}
{% block content %}

2
plinth/templates/base.html
View File

@ -1,6 +1,6 @@
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% comment %}
# SPDX-License-Identifier: AGPL-3.0-or-later

2
plinth/templates/breadcrumbs.html
View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
{% endcomment %}
{% load plinth_extras %}
{% load extras %}
<nav aria-label="breadcrumb">
<ol class="breadcrumb">

2
plinth/templates/card.html
View File

@ -4,7 +4,7 @@
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
<div class="card">
<a href="{{ item.url }}">

2
plinth/templates/clients-button.html
View File

@ -3,7 +3,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% if clients %}
{% with client_platforms=clients|clients_get_platforms %}

2
plinth/templates/clients.html
View File

@ -3,7 +3,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% load static %}
{% if clients %}

2
plinth/templates/first_setup.html
View File

@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block body_class %}
no-brand

2
plinth/templates/help-menu.html
View File

@ -3,7 +3,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
<li id="id_help_menu" class="dropdown nav-item">
<a href="{% url 'help:index' %}" title="{% trans "Help" %}"

2
plinth/templates/index.html
View File

@ -5,7 +5,7 @@
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block body_class %}index-page{% endblock %}

2
plinth/templates/internal-zone.html
View File

@ -3,7 +3,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block internal_zone_warning %}
{% for component in firewall %}

2
plinth/templates/messages.html
View File

@ -3,7 +3,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% for message in messages %}
<div class="alert alert-{{ message.tags }} alert-dismissible

2
plinth/templates/notifications-dropdown.html
View File

@ -5,7 +5,7 @@
{# Template to display a drop down button for notifications in the navbar #}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% if notifications %}
<li class="nav-item notifications-dropdown">

2
plinth/templates/notifications.html
View File

@ -6,7 +6,7 @@
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% if notifications %}
<div id="notifications" class="notifications collapse no-no-js" hx-swap-oob="true">

2
plinth/templates/operation-notification.html
View File

@ -4,7 +4,7 @@
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
<p>
{% if data.state == "waiting" %}

2
plinth/templates/operations.html
View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
{% endcomment %}
{% load plinth_extras %}
{% load extras %}
{% for operation in operations %}
<div class="app-operation">

2
plinth/templates/port-forwarding-info.html
View File

@ -3,7 +3,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% if port_forwarding_info.ports %}
<h3>{% trans "Port Forwarding" %}</h3>

2
plinth/templates/setup.html
View File

@ -6,7 +6,7 @@
{% load bootstrap %}
{% load i18n %}
{% load static %}
{% load plinth_extras %}
{% load extras %}
{% block content %}

2
plinth/templates/tags.html
View File

@ -3,7 +3,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% if tags %}
<div class="container">

2
plinth/templates/theme-menu.html
View File

@ -3,7 +3,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
<li id="id_theme_menu" class="dropdown nav-item">
<a href="#" title="{% trans "Toggle theme (auto)" %}"

2
plinth/templates/toolbar.html
View File

@ -3,7 +3,7 @@
{% endcomment %}
{% load i18n %}
{% load plinth_extras %}
{% load extras %}
{% block toolbar %}

0
plinth/templatetags/plinth_extras.py → plinth/templatetags/extras.py
View File

14
plinth/tests/test_templatetags.py
View File

@ -5,7 +5,7 @@ Test module for custom Django template tags.
from unittest.mock import patch
from plinth.templatetags import plinth_extras
from plinth.templatetags import extras
def _assert_active_url(menu, url):
@ -44,7 +44,7 @@ def test_highlighting():
['/abc/123/ab/', '/abc/123/'], ['/abc/123/', '/abc/123/']]
for check_path, expected_active_path in tests:
menu = plinth_extras.mark_active_menuitem(menu, check_path)
menu = extras.mark_active_menuitem(menu, check_path)
_assert_active_url(menu, expected_active_path)
assert _verify_active_menuitems(menu)
@ -55,7 +55,7 @@ def test_icon(resolve_static_path, tmp_path):
icon1 = tmp_path / 'icon1.svg'
icon1.write_text('<svg><cirlcle></circle></svg>')
resolve_static_path.return_value = icon1
return_value = plinth_extras.icon('icon1')
return_value = extras.icon('icon1')
assert return_value == ('<svg class="svg-icon" data-icon-name="icon1" '
'><cirlcle></circle></svg>')
@ -68,12 +68,12 @@ def test_icon_attributes(resolve_static_path, tmp_path):
resolve_static_path.return_value = icon1
attributes = {'class': 'test-class'}
return_value = plinth_extras.icon('icon1', **attributes)
return_value = extras.icon('icon1', **attributes)
assert return_value == ('<svg class="test-class" data-icon-name="icon1" '
'><cirlcle></circle></svg>')
attributes = {'data-test': 'test-value'}
return_value = plinth_extras.icon('icon1', **attributes)
return_value = extras.icon('icon1', **attributes)
assert return_value == ('<svg data-test="test-value" class="svg-icon" '
'data-icon-name="icon1" ><cirlcle></circle></svg>')
@ -87,7 +87,7 @@ def test_icon_auto_ids(resolve_static_path, random_string, tmp_path):
icon2.write_text('<svg><cirlcle id="autoidmagic-foo"></circle>'
'<path id="autoidmagic-bar"></path></svg>')
resolve_static_path.return_value = icon2
return_value = plinth_extras.icon('icon2')
return_value = extras.icon('icon2')
assert return_value == ('<svg class="svg-icon" data-icon-name="icon2" >'
'<cirlcle id="randomvalue-foo"></circle>'
'<path id="randomvalue-bar"></path></svg>')
@ -100,6 +100,6 @@ def test_icon_xml_stripping(resolve_static_path, tmp_path):
icon2.write_text('<?xml version="1.0" encoding="utf-8">\n'
'<svg><cirlcle></circle></svg>')
resolve_static_path.return_value = icon2
return_value = plinth_extras.icon('icon2')
return_value = extras.icon('icon2')
assert return_value == ('<svg class="svg-icon" data-icon-name="icon2" >'
'<cirlcle></circle></svg>')