Skip to content

Commit

Permalink
Add CML favicon
Browse files Browse the repository at this point in the history
  • Loading branch information
@timonegk
timonegk committed Jul 24, 2024
1 parent 10b79bc commit a92b70e
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 49 deletions.
24 changes: 12 additions & 12 deletions locale/de_DE/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mafiasi\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-01 00:25+0200\n"
"POT-Creation-Date: 2024-07-24 21:20+0200\n"
"PO-Revision-Date: 2024-05-01 00:26+0200\n"
"Last-Translator: Markus Neblung <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -39,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:46
#: mafiasi/base/templates/base.html:47
msgid "Disable surprise"
msgstr "Überraschung abschalten"

#: mafiasi/base/templates/base.html:56
#: mafiasi/base/templates/base.html:57
msgid "Groups"
msgstr "Gruppen"

#: mafiasi/base/templates/base.html:64
#: mafiasi/base/templates/base.html:65
#: mafiasi/mailinglist/templates/mailinglist/show_list.html:46
msgid "Settings"
msgstr "Einstellungen"

#: mafiasi/base/templates/base.html:67
#: mafiasi/base/templates/base.html:68
#, python-format
msgid "Logged in as %(username)s"
msgstr "Angemeldet als %(username)s"

#: mafiasi/base/templates/base.html:70
#: mafiasi/base/templates/base.html:71
msgid "Logout"
msgstr "Abmelden"

#: mafiasi/base/templates/base.html:76
#: 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:78
#: mafiasi/base/templates/base.html:79
msgid "Login"
msgstr "Login"

#: mafiasi/base/templates/base.html:107
#: mafiasi/base/templates/base.html:108
msgid "Imprint"
msgstr "Impressum"

#: mafiasi/base/templates/base.html:109
#: mafiasi/base/templates/base.html:110
msgid "Data privacy statement"
msgstr "Datenschutzerklärung"

#: mafiasi/base/templates/base.html:111
#: mafiasi/base/templates/base.html:112
msgid "Technical info"
msgstr "Technik"

#: mafiasi/base/templates/base.html:113
#: mafiasi/base/templates/base.html:114
#: mafiasi/base/templates/base/problems.html:4
msgid "Problems?"
msgstr "Probleme?"
Expand Down
24 changes: 12 additions & 12 deletions locale/en_US/LC_MESSAGES/django.po
View file
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-05-01 00:25+0200\n"
"POT-Creation-Date: 2024-07-24 21:20+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:46
#: mafiasi/base/templates/base.html:47
msgid "Disable surprise"
msgstr ""

#: mafiasi/base/templates/base.html:56
#: mafiasi/base/templates/base.html:57
msgid "Groups"
msgstr ""

#: mafiasi/base/templates/base.html:64
#: mafiasi/base/templates/base.html:65
#: mafiasi/mailinglist/templates/mailinglist/show_list.html:46
msgid "Settings"
msgstr ""

#: mafiasi/base/templates/base.html:67
#: mafiasi/base/templates/base.html:68
#, python-format
msgid "Logged in as %(username)s"
msgstr ""

#: mafiasi/base/templates/base.html:70
#: mafiasi/base/templates/base.html:71
msgid "Logout"
msgstr ""

#: mafiasi/base/templates/base.html:76
#: 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:78
#: mafiasi/base/templates/base.html:79
msgid "Login"
msgstr ""

#: mafiasi/base/templates/base.html:107
#: mafiasi/base/templates/base.html:108
msgid "Imprint"
msgstr ""

#: mafiasi/base/templates/base.html:109
#: mafiasi/base/templates/base.html:110
msgid "Data privacy statement"
msgstr ""

#: mafiasi/base/templates/base.html:111
#: mafiasi/base/templates/base.html:112
msgid "Technical info"
msgstr ""

#: mafiasi/base/templates/base.html:113
#: mafiasi/base/templates/base.html:114
#: mafiasi/base/templates/base/problems.html:4
msgid "Problems?"
msgstr ""
Expand Down
24 changes: 12 additions & 12 deletions locale/en_Uwu/LC_MESSAGES/django.po
View file
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-05-01 00:25+0200\n"
"POT-Creation-Date: 2024-07-24 21:20+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:46
#: mafiasi/base/templates/base.html:47
msgid "Disable surprise"
msgstr "Me no like this mess ._."

#: mafiasi/base/templates/base.html:56
#: mafiasi/base/templates/base.html:57
msgid "Groups"
msgstr "frens"

#: mafiasi/base/templates/base.html:64
#: mafiasi/base/templates/base.html:65
#: mafiasi/mailinglist/templates/mailinglist/show_list.html:46
msgid "Settings"
msgstr "Change me ＞﹏＜"

#: mafiasi/base/templates/base.html:67
#: mafiasi/base/templates/base.html:68
#, python-format
msgid "Logged in as %(username)s"
msgstr "U is %(username)s"

#: mafiasi/base/templates/base.html:70
#: mafiasi/base/templates/base.html:71
msgid "Logout"
msgstr "Bye bye 👋"

#: mafiasi/base/templates/base.html:76
#: 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:78
#: mafiasi/base/templates/base.html:79
msgid "Login"
msgstr "Get inside"

#: mafiasi/base/templates/base.html:107
#: mafiasi/base/templates/base.html:108
msgid "Imprint"
msgstr "Pawprint"

#: mafiasi/base/templates/base.html:109
#: mafiasi/base/templates/base.html:110
msgid "Data privacy statement"
msgstr "How me uses ur data"

#: mafiasi/base/templates/base.html:111
#: mafiasi/base/templates/base.html:112
msgid "Technical info"
msgstr "Complicated thingies"

#: mafiasi/base/templates/base.html:113
#: mafiasi/base/templates/base.html:114
#: mafiasi/base/templates/base/problems.html:4
msgid "Problems?"
msgstr "Problems?"
Expand Down
24 changes: 12 additions & 12 deletions locale/fr_FR/LC_MESSAGES/django.po
View file
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-05-01 00:25+0200\n"
"POT-Creation-Date: 2024-07-24 21:20+0200\n"
"PO-Revision-Date: 2024-01-18 22:41+0100\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:46
#: mafiasi/base/templates/base.html:47
msgid "Disable surprise"
msgstr "Désactiver la surprise"

#: mafiasi/base/templates/base.html:56
#: mafiasi/base/templates/base.html:57
msgid "Groups"
msgstr "Groupes"

#: mafiasi/base/templates/base.html:64
#: mafiasi/base/templates/base.html:65
#: mafiasi/mailinglist/templates/mailinglist/show_list.html:46
msgid "Settings"
msgstr "Paramètres"

#: mafiasi/base/templates/base.html:67
#: 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:70
#: mafiasi/base/templates/base.html:71
msgid "Logout"
msgstr "Déconnecter"

#: mafiasi/base/templates/base.html:76
#: 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:78
#: mafiasi/base/templates/base.html:79
msgid "Login"
msgstr "Connectez-Vouz"

#: mafiasi/base/templates/base.html:107
#: mafiasi/base/templates/base.html:108
msgid "Imprint"
msgstr "Empreinte"

#: mafiasi/base/templates/base.html:109
#: mafiasi/base/templates/base.html:110
msgid "Data privacy statement"
msgstr "Politique de confidentialité"

#: mafiasi/base/templates/base.html:111
#: mafiasi/base/templates/base.html:112
msgid "Technical info"
msgstr "Information technique"

#: mafiasi/base/templates/base.html:113
#: mafiasi/base/templates/base.html:114
#: mafiasi/base/templates/base/problems.html:4
msgid "Problems?"
msgstr "Problèmes?"
Expand Down
Binary file added mafiasi/base/static/img/favicon_cml.ico
View file
Binary file not shown.
Binary file added mafiasi/base/static/img/favicon_cml.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion mafiasi/base/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
{% load settings_value %}
{% load static %}
{% value_from_settings BANNER_IMG as banner_img %}
{% value_from_settings FAVICON_PATH as favicon_path %}
<!DOCTYPE html>
<html {% if request.session.specialFeature %}data-feature="{{request.session.specialFeature}}"{% endif %}{% if request.session.specialFeaturePersist %}data-feature-persisted="true"{% endif %}>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>{% block wtitle %}{% endblock %} &middot; {% value_from_settings PROJECT_NAME %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="{% static 'img/favicon.ico' %}" />
<link rel="shortcut icon" href="{% static favicon_path %}" />
<link rel="stylesheet" href="{% static 'css/bootstrap.css' %}">
<link rel="stylesheet" href="{% static 'css/smoothness/jquery-ui-1.12.1.custom.css' %}">
<link rel="stylesheet" href="{% static 'css/main.css' %}">
Expand Down
2 changes: 2 additions & 0 deletions mafiasi/settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@
"MAIL_GREETING_DE",
"MAIL_GREETING_EN",
"BANNER_IMG",
"FAVICON_PATH",
"GUEST_INVITE_HINT",
"USER_LOGIN_HINT",
"GUEST_INVITE_INSTRUCTION_LINK",
Expand Down Expand Up @@ -293,6 +294,7 @@
PROJECT_NAME = env.str("MAFIASI_PROJECT_NAME", default="mafiasi.de")
PROJECT_BANNER = env.str("MAFIASI_PROJECT_BANNER", "Mafiasi Hub")
BANNER_IMG = env.str("MAFIASI_BANNER_IMG", "")
FAVICON_PATH = env.str("MAFIASI_FAVICON_PATH", "img/favicon.ico")

HKP_URL = "hkps://mafiasi.de"

Expand Down

0 comments on commit a92b70e

Please sign in to comment.