From 31d2b85b2faca240eddc07b0de05b3810de39384 Mon Sep 17 00:00:00 2001 From: moanos Date: Tue, 17 Jun 2025 16:58:17 +0200 Subject: [PATCH] refactor: remove deprecated external site warning --- .../fellchensammlung/external_site_warning.html | 15 --------------- src/fellchensammlung/urls.py | 3 +-- src/fellchensammlung/views.py | 6 +----- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 src/fellchensammlung/templates/fellchensammlung/external_site_warning.html diff --git a/src/fellchensammlung/templates/fellchensammlung/external_site_warning.html b/src/fellchensammlung/templates/fellchensammlung/external_site_warning.html deleted file mode 100644 index e2b27c2..0000000 --- a/src/fellchensammlung/templates/fellchensammlung/external_site_warning.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "fellchensammlung/base_generic.html" %} -{% load i18n %} - {% load custom_tags %} -{% block content %} -
- {% if external_site_warning %} - {{ external_site_warning.content | render_markdown }} - {% else %} - {% blocktranslate %} -

Achtung du verlässt notfellchen.org

- {% endblocktranslate %} - {% endif %} - {% translate "Weiter" %} -
-{% endblock content %} diff --git a/src/fellchensammlung/urls.py b/src/fellchensammlung/urls.py index eea5d41..b31045e 100644 --- a/src/fellchensammlung/urls.py +++ b/src/fellchensammlung/urls.py @@ -112,8 +112,7 @@ urlpatterns = [ ################### ## External Site ## ################### - path('external-site/', views.external_site_warning, name="external-site"), - path('bulma/external-site/', views.bulma_external_site_warning, name="bulma-external-site"), + path('bulma/external-site/', views.external_site_warning, name="bulma-external-site"), ############### ## TECHNICAL ## diff --git a/src/fellchensammlung/views.py b/src/fellchensammlung/views.py index 2a52a0e..8131544 100644 --- a/src/fellchensammlung/views.py +++ b/src/fellchensammlung/views.py @@ -668,7 +668,7 @@ def instance_health_check(request): return render(request, 'fellchensammlung/instance-health-check.html', context=context) -def external_site_warning(request, template_name='fellchensammlung/external_site_warning.html'): +def external_site_warning(request, template_name='fellchensammlung/bulma-external_site_warning.html'): url = request.GET.get("url") context = {"url": url} language_code = translation.get_language() @@ -679,10 +679,6 @@ def external_site_warning(request, template_name='fellchensammlung/external_site return render(request, template_name, context=context) -def bulma_external_site_warning(request): - return external_site_warning(request, 'fellchensammlung/bulma-external_site_warning.html') - - def list_rescue_organizations(request, template='fellchensammlung/bulma-animal-shelters.html'): rescue_organizations = RescueOrganization.objects.all() context = {"rescue_organizations": rescue_organizations}