Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "add stabile political message to dashboard" #182

Merged
merged 1 commit into from
Nov 18, 2024
Merged

Revert "add stabile political message to dashboard" #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions locale/de_DE/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -40,51 +39,51 @@ msgstr ""
"Bitte versuche es später nochmal. Falls das Problem bestehen bleibt, schaue "
"auf unsere <a href=\"%(problems_url)s\">Fehlermeldeseite</a>."

#: 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?"
Expand Down Expand Up @@ -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"
Expand Down
29 changes: 14 additions & 15 deletions locale/en_US/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -31,51 +31,51 @@ msgid ""
"href=\"%(problems_url)s\">problem reporting page</a>."
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 ""
Expand Down Expand Up @@ -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"
Expand Down
24 changes: 12 additions & 12 deletions locale/en_Uwu/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -42,51 +42,51 @@ msgstr ""
"again later. If the problem persists, see our <a "
"href=\"%(problems_url)s\">problem reporting page</a>."

#: 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?"
Expand Down
28 changes: 13 additions & 15 deletions locale/fr_FR/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -39,51 +39,51 @@ msgstr ""
"problème persiste, consultez notre <a href=\"%(problems_url)s\"> page de "
"rapports d'incidents </a>."

#: 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?"
Expand Down Expand Up @@ -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"
Expand Down
20 changes: 0 additions & 20 deletions mafiasi/base/static/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 0 additions & 10 deletions mafiasi/base/static/js/stabile_message.mjs
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions mafiasi/base/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
<!DOCTYPE html>
Expand Down Expand Up @@ -130,16 +129,11 @@ <h2>{% block ptitle %}{% endblock %}</h2>
<script src="{% static 'js/snow.js' %}" type="module"></script>
{% endif %}

<aside id="stabile-message">
<span>{% stabile_message %}</span>
</aside>

<script src="{% static 'js/jquery-2.0.3.js' %}" type="text/javascript"></script>
<script src="{% static 'js/jquery-ui-1.12.1.custom.js' %}" type="text/javascript"></script>
<script src="{% static 'js/common.js' %}" type="text/javascript"></script>
<script src="{% static 'js/bootstrap.js' %}" type="text/javascript"></script>
<script src="{% static 'js/misc.js' %}" type="text/javascript"></script>
<script src="{% static 'js/stabile_message.mjs' %}" type="module"></script>
{% block js %}
{% endblock js %}
</body>
Expand Down
Loading
Loading