From 545d2ab8817959b75e27e6223b285d49d68ff57e Mon Sep 17 00:00:00 2001 From: lilly Date: Mon, 18 Nov 2024 23:35:43 +0100 Subject: [PATCH] Revert "add stabile political message to dashboard" This reverts commit 554a8573d9a17a2d29335288c2d4c8bd38dfccae. --- locale/de_DE/LC_MESSAGES/django.po | 29 +++++++++---------- locale/en_US/LC_MESSAGES/django.po | 29 +++++++++---------- locale/en_Uwu/LC_MESSAGES/django.po | 24 ++++++++-------- locale/fr_FR/LC_MESSAGES/django.po | 28 +++++++++--------- mafiasi/base/static/css/main.css | 20 ------------- mafiasi/base/static/js/stabile_message.mjs | 10 ------- mafiasi/base/templates/base.html | 6 ---- mafiasi/base/templatetags/stabile_message.py | 30 -------------------- 8 files changed, 52 insertions(+), 124 deletions(-) delete mode 100644 mafiasi/base/static/js/stabile_message.mjs delete mode 100644 mafiasi/base/templatetags/stabile_message.py diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index c9e3e88..a7a4923 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -3,8 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Mafiasi\n" "Report-Msgid-Bugs-To: \n" - -"POT-Creation-Date: 2024-11-18 22:47+0100\n" +"POT-Creation-Date: 2024-10-08 09:35+0200\n" "PO-Revision-Date: 2024-09-03 23:52+0200\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -40,51 +39,51 @@ msgstr "" "Bitte versuche es später nochmal. Falls das Problem bestehen bleibt, schaue " "auf unsere Fehlermeldeseite." -#: mafiasi/base/templates/base.html:48 +#: mafiasi/base/templates/base.html:47 msgid "Disable surprise" msgstr "Überraschung abschalten" -#: mafiasi/base/templates/base.html:58 +#: mafiasi/base/templates/base.html:57 msgid "Groups" msgstr "Gruppen" -#: mafiasi/base/templates/base.html:66 +#: mafiasi/base/templates/base.html:65 #: mafiasi/mailinglist/templates/mailinglist/show_list.html:46 msgid "Settings" msgstr "Einstellungen" -#: mafiasi/base/templates/base.html:69 +#: mafiasi/base/templates/base.html:68 #, python-format msgid "Logged in as %(username)s" msgstr "Angemeldet als %(username)s" -#: mafiasi/base/templates/base.html:72 +#: mafiasi/base/templates/base.html:71 msgid "Logout" msgstr "Abmelden" -#: mafiasi/base/templates/base.html:78 +#: mafiasi/base/templates/base.html:77 #: mafiasi/registration/templates/registration/request_account.html:38 #: mafiasi/registration/templates/registration/request_account.html:77 msgid "Register" msgstr "Registrieren" -#: mafiasi/base/templates/base.html:80 +#: mafiasi/base/templates/base.html:79 msgid "Login" msgstr "Login" -#: mafiasi/base/templates/base.html:109 +#: mafiasi/base/templates/base.html:108 msgid "Imprint" msgstr "Impressum" -#: mafiasi/base/templates/base.html:111 +#: mafiasi/base/templates/base.html:110 msgid "Data privacy statement" msgstr "Datenschutzerklärung" -#: mafiasi/base/templates/base.html:113 +#: mafiasi/base/templates/base.html:112 msgid "Technical info" msgstr "Technik" -#: mafiasi/base/templates/base.html:115 +#: mafiasi/base/templates/base.html:114 #: mafiasi/base/templates/base/problems.html:4 msgid "Problems?" msgstr "Probleme?" @@ -1572,9 +1571,7 @@ msgstr "Mensa" msgid "" "Look at what is available in the canteens and filter according to diet, " "allergens, etc." -msgstr "" -"Schaue was es in den Mensen zu essen gibt und filtere nach Ernährungsweise, " -"Allergenen usw." +msgstr "Schaue was es in den Mensen zu essen gibt und filtere nach Ernährungsweise, Allergenen usw." #: mafiasi/modulkompass/apps.py:11 msgid "Modulkompass" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index dabe63a..3b035d4 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Mafiasi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-18 22:47+0100\n" +"POT-Creation-Date: 2024-10-08 09:35+0200\n" "PO-Revision-Date: 2024-01-18 22:42+0100\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -31,51 +31,51 @@ msgid "" "href=\"%(problems_url)s\">problem reporting page." msgstr "" -#: mafiasi/base/templates/base.html:48 +#: mafiasi/base/templates/base.html:47 msgid "Disable surprise" msgstr "" -#: mafiasi/base/templates/base.html:58 +#: mafiasi/base/templates/base.html:57 msgid "Groups" msgstr "" -#: mafiasi/base/templates/base.html:66 +#: mafiasi/base/templates/base.html:65 #: mafiasi/mailinglist/templates/mailinglist/show_list.html:46 msgid "Settings" msgstr "" -#: mafiasi/base/templates/base.html:69 +#: mafiasi/base/templates/base.html:68 #, python-format msgid "Logged in as %(username)s" msgstr "" -#: mafiasi/base/templates/base.html:72 +#: mafiasi/base/templates/base.html:71 msgid "Logout" msgstr "" -#: mafiasi/base/templates/base.html:78 +#: mafiasi/base/templates/base.html:77 #: mafiasi/registration/templates/registration/request_account.html:38 #: mafiasi/registration/templates/registration/request_account.html:77 msgid "Register" msgstr "" -#: mafiasi/base/templates/base.html:80 +#: mafiasi/base/templates/base.html:79 msgid "Login" msgstr "" -#: mafiasi/base/templates/base.html:109 +#: mafiasi/base/templates/base.html:108 msgid "Imprint" msgstr "" -#: mafiasi/base/templates/base.html:111 +#: mafiasi/base/templates/base.html:110 msgid "Data privacy statement" msgstr "" -#: mafiasi/base/templates/base.html:113 +#: mafiasi/base/templates/base.html:112 msgid "Technical info" msgstr "" -#: mafiasi/base/templates/base.html:115 +#: mafiasi/base/templates/base.html:114 #: mafiasi/base/templates/base/problems.html:4 msgid "Problems?" msgstr "" @@ -1429,9 +1429,8 @@ msgstr "Canteen" msgid "" "Look at what is available in the canteens and filter according to diet, " "allergens, etc." -msgstr "" -"Look at what is available in the canteens and filter according to diet, " -"allergens, etc." +msgstr "Look at what is available in the canteens and filter according to diet, " + "allergens, etc." #: mafiasi/modulkompass/apps.py:11 msgid "Modulkompass" diff --git a/locale/en_Uwu/LC_MESSAGES/django.po b/locale/en_Uwu/LC_MESSAGES/django.po index ffa3100..8a32d45 100644 --- a/locale/en_Uwu/LC_MESSAGES/django.po +++ b/locale/en_Uwu/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Mafiasi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-18 22:47+0100\n" +"POT-Creation-Date: 2024-10-08 09:35+0200\n" "PO-Revision-Date: 2024-01-09 22:14+0000\n" "Last-Translator: kritzl \n" "Language-Team: \n" @@ -42,51 +42,51 @@ msgstr "" "again later. If the problem persists, see our problem reporting page." -#: mafiasi/base/templates/base.html:48 +#: mafiasi/base/templates/base.html:47 msgid "Disable surprise" msgstr "Me no like this mess ._." -#: mafiasi/base/templates/base.html:58 +#: mafiasi/base/templates/base.html:57 msgid "Groups" msgstr "frens" -#: mafiasi/base/templates/base.html:66 +#: mafiasi/base/templates/base.html:65 #: mafiasi/mailinglist/templates/mailinglist/show_list.html:46 msgid "Settings" msgstr "Change me ＞﹏＜" -#: mafiasi/base/templates/base.html:69 +#: mafiasi/base/templates/base.html:68 #, python-format msgid "Logged in as %(username)s" msgstr "U is %(username)s" -#: mafiasi/base/templates/base.html:72 +#: mafiasi/base/templates/base.html:71 msgid "Logout" msgstr "Bye bye 👋" -#: mafiasi/base/templates/base.html:78 +#: mafiasi/base/templates/base.html:77 #: mafiasi/registration/templates/registration/request_account.html:38 #: mafiasi/registration/templates/registration/request_account.html:77 msgid "Register" msgstr "Become fren <3" -#: mafiasi/base/templates/base.html:80 +#: mafiasi/base/templates/base.html:79 msgid "Login" msgstr "Get inside" -#: mafiasi/base/templates/base.html:109 +#: mafiasi/base/templates/base.html:108 msgid "Imprint" msgstr "Pawprint" -#: mafiasi/base/templates/base.html:111 +#: mafiasi/base/templates/base.html:110 msgid "Data privacy statement" msgstr "How me uses ur data" -#: mafiasi/base/templates/base.html:113 +#: mafiasi/base/templates/base.html:112 msgid "Technical info" msgstr "Complicated thingies" -#: mafiasi/base/templates/base.html:115 +#: mafiasi/base/templates/base.html:114 #: mafiasi/base/templates/base/problems.html:4 msgid "Problems?" msgstr "Problems?" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index feab645..b1a757a 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Mafiasi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-18 22:47+0100\n" +"POT-Creation-Date: 2024-10-08 09:35+0200\n" "PO-Revision-Date: 2024-09-03 23:54+0200\n" "Last-Translator: Markus Neblung \n" "Language-Team: \n" @@ -39,51 +39,51 @@ msgstr "" "problème persiste, consultez notre page de " "rapports d'incidents ." -#: mafiasi/base/templates/base.html:48 +#: mafiasi/base/templates/base.html:47 msgid "Disable surprise" msgstr "Désactiver la surprise" -#: mafiasi/base/templates/base.html:58 +#: mafiasi/base/templates/base.html:57 msgid "Groups" msgstr "Groupes" -#: mafiasi/base/templates/base.html:66 +#: mafiasi/base/templates/base.html:65 #: mafiasi/mailinglist/templates/mailinglist/show_list.html:46 msgid "Settings" msgstr "Paramètres" -#: mafiasi/base/templates/base.html:69 +#: mafiasi/base/templates/base.html:68 #, python-format msgid "Logged in as %(username)s" msgstr "Connecté en tant que %(username)s" -#: mafiasi/base/templates/base.html:72 +#: mafiasi/base/templates/base.html:71 msgid "Logout" msgstr "Déconnecter" -#: mafiasi/base/templates/base.html:78 +#: mafiasi/base/templates/base.html:77 #: mafiasi/registration/templates/registration/request_account.html:38 #: mafiasi/registration/templates/registration/request_account.html:77 msgid "Register" msgstr "Enregistrez-Vous" -#: mafiasi/base/templates/base.html:80 +#: mafiasi/base/templates/base.html:79 msgid "Login" msgstr "Connectez-Vouz" -#: mafiasi/base/templates/base.html:109 +#: mafiasi/base/templates/base.html:108 msgid "Imprint" msgstr "Empreinte" -#: mafiasi/base/templates/base.html:111 +#: mafiasi/base/templates/base.html:110 msgid "Data privacy statement" msgstr "Politique de confidentialité" -#: mafiasi/base/templates/base.html:113 +#: mafiasi/base/templates/base.html:112 msgid "Technical info" msgstr "Information technique" -#: mafiasi/base/templates/base.html:115 +#: mafiasi/base/templates/base.html:114 #: mafiasi/base/templates/base/problems.html:4 msgid "Problems?" msgstr "Problèmes?" @@ -1580,9 +1580,7 @@ msgstr "Cantine" msgid "" "Look at what is available in the canteens and filter according to diet, " "allergens, etc." -msgstr "" -"Regarde ce qu'il y a à manger dans les restaurants universitaires et filtre " -"en fonction du régime alimentaire, des allergènes, etc." +msgstr "Regarde ce qu'il y a à manger dans les restaurants universitaires et filtre en fonction du régime alimentaire, des allergènes, etc." #: mafiasi/modulkompass/apps.py:11 msgid "Modulkompass" diff --git a/mafiasi/base/static/css/main.css b/mafiasi/base/static/css/main.css index 1983f7a..0ca2504 100644 --- a/mafiasi/base/static/css/main.css +++ b/mafiasi/base/static/css/main.css @@ -81,26 +81,6 @@ body { border-radius: 10px; } -/* ------- Stabile Message ------*/ -#stabile-message { - position: fixed; - bottom: 1vw; - left: auto; - right: 1vw; - margin: 0; - cursor: pointer; - user-select: none; - - border: none; - padding: 10px 16px; - background: #23527c; - color: white; - border-radius: 4px; - letter-spacing: 0ch; - font-size: large; - font-style: normal; -} - /* ------- MISC -------*/ .clickable { cursor: pointer; diff --git a/mafiasi/base/static/js/stabile_message.mjs b/mafiasi/base/static/js/stabile_message.mjs deleted file mode 100644 index f40a641..0000000 --- a/mafiasi/base/static/js/stabile_message.mjs +++ /dev/null @@ -1,10 +0,0 @@ -document.addEventListener("DOMContentLoaded", () => { - const dialog = document.getElementById("stabile-message"); - - // close dialog when clicked - const close = () => dialog.style.display = "none"; - dialog.addEventListener("click", close); - - // alternatively, also close dialog after 20 seconds - setTimeout(close, 20 * 1000); -}) diff --git a/mafiasi/base/templates/base.html b/mafiasi/base/templates/base.html index 6f65561..0e68bf4 100644 --- a/mafiasi/base/templates/base.html +++ b/mafiasi/base/templates/base.html @@ -2,7 +2,6 @@ {% load group_tags %} {% load settings_value %} {% load static %} -{% load stabile_message %} {% value_from_settings BANNER_IMG as banner_img %} {% value_from_settings FAVICON_PATH as favicon_path %} @@ -130,16 +129,11 @@

{% block ptitle %}{% endblock %}

{% endif %} - - - {% block js %} {% endblock js %} diff --git a/mafiasi/base/templatetags/stabile_message.py b/mafiasi/base/templatetags/stabile_message.py deleted file mode 100644 index 1f24476..0000000 --- a/mafiasi/base/templatetags/stabile_message.py +++ /dev/null @@ -1,30 +0,0 @@ -import random - -from django import template - -register = template.Library() - - -possible_texts = [ - "Du bist die Brandmauer gegen Rechts", - "„Unpolitisch“ ist politisch", - "Die AfD ist die mit Abstand größte Gefahr für unsere Gesellschaft! #AfDVerbotJetzt", - "Sich an Antifaschismus stören ist so 1933", - "Dieser Service wird nicht von Faschisten betrieben", - "Menschenrechte statt rechte Menschen", - "Kein Mensch ist illegal", - "„Nie wieder“ ist immer, nicht nur alle 4 Jahre beim Kreuzchen machen", - "Kein Platz für Rassismus", - "Trans rights are human rights", - "Trans rights or riot nights", - "Die Brandmauer ist überall. Auch im Studium!", - "Nazis morden, der Staat schiebt ab – das ist das gleiche Rassistenpack", - "AfDler verpisst euch – keiner vermisst euch", - "Seenotrettung ist kein Verbrechen", - "Nein heißt Nein, No means No, wer das sagt der meints auch so", -] - - -@register.simple_tag -def stabile_message() -> str: - return random.choice(possible_texts)