diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 0000000..f68b0f1 --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,2 @@ +This repository contains third-party assets. Attributions are either placed in the file itself or +in a file `NOTICE.txt` in the respective folder. diff --git a/README.md b/README.md index e37f645..b62aa3a 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ want to contribute code, please open a [pull request](https://git.jdav-hd.merten The following is a short description of where to find the documentation with more information. -# Documentation +# Documentation -Documentation is handled by [sphinx](https://www.sphinx-doc.org/) and located in `docs/`. +Documentation is handled by [sphinx](https://www.sphinx-doc.org/) and located in `docs/`. The sphinx documentation contains information about: - Development Setup @@ -40,7 +40,14 @@ cd docs/ make html # MacOS (with firefox) -open -a firefox $(pwd)/docs/build/html/index.html +open -a firefox $(pwd)/docs/build/html/index.html # Linux (I guess?!?) -firefox ${pwd}/docs/build/html/index.html +firefox ${pwd}/docs/build/html/index.html ``` + +# License + +This code is licensed under the [GNU Affero General Public License](https://www.gnu.org/licenses/agpl-3.0.en.html). +For the full license text, see `LICENCSE`. + +See the `NOTICE.txt` file for attributions. diff --git a/jdav_web/startpage/locale/de/LC_MESSAGES/django.po b/jdav_web/startpage/locale/de/LC_MESSAGES/django.po index 1ba8c5b..9b815e8 100644 --- a/jdav_web/startpage/locale/de/LC_MESSAGES/django.po +++ b/jdav_web/startpage/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-03-08 16:16+0100\n" +"POT-Creation-Date: 2025-09-07 02:13+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -48,7 +48,7 @@ msgstr "Abschnitt" msgid "Sections" msgstr "Abschnitte" -#: startpage/models.py +#: startpage/models.py startpage/tests.py msgid "deactivated" msgstr "deaktiviert" @@ -80,7 +80,7 @@ msgstr "Einträge" msgid "file" msgstr "Datei" -#: startpage/models.py +#: startpage/models.py startpage/tests.py msgid "Empty" msgstr "Leer" @@ -138,5 +138,29 @@ msgstr "" "Dies ist nur ein Platzhalter. Bitte überschreibe diesen Platzhalter wie in " "der Dokumentation beschrieben mit einem benutzerdefinierten Text." +#: startpage/templates/startpage/impressum.html +msgid "Attributions" +msgstr "Copyright Informationen" + +#: startpage/templates/startpage/impressum.html +msgid "The source code of this website is licensed under" +msgstr "Der Quelltext dieser Webseite ist lizenziert unter" + +#: startpage/templates/startpage/impressum.html +msgid "Copyright © 2025 JDAV Sektion " +msgstr "Copyright © 2025 JDAV Sektion " + +#: startpage/templates/startpage/impressum.html +msgid "for the content of this website." +msgstr "für den Inhalt dieser Webseite." + +#: startpage/templates/startpage/impressum.html +msgid "External assets used on this website:" +msgstr "Lizenzhinweise für Ressourcen Dritter:" + +#: startpage/templates/startpage/impressum.html +msgid "Background image" +msgstr "Hintergrundbild" + #~ msgid "Awesome JDAV website being able to do a lot!" #~ msgstr "Tolle JDAV Webseite die ganz viel kann!" diff --git a/jdav_web/startpage/templates/startpage/base.html b/jdav_web/startpage/templates/startpage/base.html index ae69f54..edec920 100644 --- a/jdav_web/startpage/templates/startpage/base.html +++ b/jdav_web/startpage/templates/startpage/base.html @@ -7,7 +7,7 @@ - + diff --git a/jdav_web/startpage/templates/startpage/impressum.html b/jdav_web/startpage/templates/startpage/impressum.html index 97e8914..71a1a21 100644 --- a/jdav_web/startpage/templates/startpage/impressum.html +++ b/jdav_web/startpage/templates/startpage/impressum.html @@ -1,8 +1,31 @@ {% extends "startpage/base_subsite.html" %} -{% load static %} +{% load static common i18n %} {% block content %} {% include "startpage/impressum_content.html" %} +{% block attribution %} +

{% trans "Attributions" %}

+ +

+{% trans "The source code of this website is licensed under" %} +AGPLv3. +{% trans "Copyright © 2025 JDAV Sektion " %} {% settings_value 'SEKTION' %} +{% trans "for the content of this website." %} +

+ +

+{% trans "External assets used on this website:" %} +

+ + + +{% endblock %} + {% endblock %} diff --git a/jdav_web/startpage/templates/startpage/navigation.html b/jdav_web/startpage/templates/startpage/navigation.html index 731e0ef..267afcf 100644 --- a/jdav_web/startpage/templates/startpage/navigation.html +++ b/jdav_web/startpage/templates/startpage/navigation.html @@ -44,7 +44,7 @@ window.onclick = function(event) { {% if not redirect_url %}
- Login + Login
{% endif %} diff --git a/jdav_web/startpage/templates/startpage/people_grid.html b/jdav_web/startpage/templates/startpage/people_grid.html index 9b17f1a..0b853e8 100644 --- a/jdav_web/startpage/templates/startpage/people_grid.html +++ b/jdav_web/startpage/templates/startpage/people_grid.html @@ -8,7 +8,7 @@ {% if member.image %} {% else %} - + {% endif %}
{{ member.name }}
diff --git a/jdav_web/startpage/templates/startpage/post_people_detail.html b/jdav_web/startpage/templates/startpage/post_people_detail.html index 62d7d65..cec3330 100644 --- a/jdav_web/startpage/templates/startpage/post_people_detail.html +++ b/jdav_web/startpage/templates/startpage/post_people_detail.html @@ -13,7 +13,7 @@ {% if member.image %} {% else %} - + {% endif %}
{{ member.name }}
diff --git a/jdav_web/startpage/templates/startpage/post_people_grid.html b/jdav_web/startpage/templates/startpage/post_people_grid.html index fcbaad1..663e85f 100644 --- a/jdav_web/startpage/templates/startpage/post_people_grid.html +++ b/jdav_web/startpage/templates/startpage/post_people_grid.html @@ -9,7 +9,7 @@ {% if member.image %} {% else %} - + {% endif %}
{{ member.name }}
diff --git a/jdav_web/static/admin/img/NOTICE.txt b/jdav_web/static/admin/img/NOTICE.txt new file mode 100644 index 0000000..dfcb413 --- /dev/null +++ b/jdav_web/static/admin/img/NOTICE.txt @@ -0,0 +1,3 @@ +- `climber.png`: + Paul Sherman (https://commons.wikimedia.org/wiki/File:Rock_climbing_vector.svg), + Public Domain, via Wikimedia Commons diff --git a/jdav_web/static/downtime/502.html b/jdav_web/static/downtime/502.html index 439f9c4..9328436 100644 --- a/jdav_web/static/downtime/502.html +++ b/jdav_web/static/downtime/502.html @@ -2,7 +2,7 @@ - + Wartungsarbeiten diff --git a/jdav_web/static/downtime/favicon.png b/jdav_web/static/downtime/favicon.png deleted file mode 100644 index f2a0608..0000000 Binary files a/jdav_web/static/downtime/favicon.png and /dev/null differ diff --git a/jdav_web/static/downtime/favicon.svg b/jdav_web/static/downtime/favicon.svg new file mode 100644 index 0000000..e2b399e --- /dev/null +++ b/jdav_web/static/downtime/favicon.svg @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + diff --git a/jdav_web/static/jet/NOTICES.txt b/jdav_web/static/jet/NOTICES.txt new file mode 100644 index 0000000..acb4139 --- /dev/null +++ b/jdav_web/static/jet/NOTICES.txt @@ -0,0 +1,4 @@ +The files in this folder are adapted from the Django JET project +(formerly at https://github.com/geex-arts/django-jet, now at https://github.com/assem-ch/django-jet-reboot). + +Django JET is released under AGPLv3 (https://www.gnu.org/licenses/agpl-3.0.en.html). diff --git a/jdav_web/static/startpage/css/base.css b/jdav_web/static/startpage/css/base.css index 2530db7..187cefe 100644 --- a/jdav_web/static/startpage/css/base.css +++ b/jdav_web/static/startpage/css/base.css @@ -154,38 +154,30 @@ h6 { box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); } -/* Links inside the navbar */ -.navbar a.nav { +/* The dropdown container */ +.dropdown { + float: left; + overflow: hidden; +} + +/* Dropdown button */ +.dropbtn { float: right; font-size: 16px; color: black; text-align: center; padding: 11px 17px; text-decoration: none; + background-color: rgba(255, 255, 255, 0.9); border: 1px solid black; border-radius: 25px; vertical-align: middle; margin-left: auto; + cursor: pointer; } -/* The dropdown container */ -.dropdown { - float: left; - overflow: hidden; -} - -/* Dropdown button */ -.dropbtn { - font-size: 19px; - border: none; - outline: none; - color: black; - padding: 14px 16px; - background-color: rgba(255, 255, 255, 0); - font: inherit; /* Important for vertical align on mobile phones */ - margin: 0; /* Important for vertical align on mobile phones */ - float: right; - cursor: pointer; +.dropbtn:hover { + background-color: rgba(240, 240, 240, 1.0); } /* Add a red background color to navbar links on hover */ @@ -345,6 +337,10 @@ a, a:visited { text-decoration: none; } +a.dropbtn { + color: black; +} + .helptext { font-size: 9pt; } diff --git a/jdav_web/static/startpage/fonts/NOTICE.txt b/jdav_web/static/startpage/fonts/NOTICE.txt new file mode 100644 index 0000000..2d538e2 --- /dev/null +++ b/jdav_web/static/startpage/fonts/NOTICE.txt @@ -0,0 +1,4 @@ +The fonts in this directory are licensed under the Open Font License (https://openfontlicense.org/). + +- Roboto font: https://fonts.google.com/specimen/Roboto +- Oswald font: https://fonts.google.com/specimen/Oswald diff --git a/jdav_web/static/startpage/img/NOTICE.txt b/jdav_web/static/startpage/img/NOTICE.txt new file mode 100644 index 0000000..029cb67 --- /dev/null +++ b/jdav_web/static/startpage/img/NOTICE.txt @@ -0,0 +1,3 @@ +- `background.jpeg`: + Reza (https://commons.wikimedia.org/wiki/File:Alps_Panorama_(4954145205).jpg), + CC BY 2.0 , via Wikimedia Commons diff --git a/jdav_web/static/startpage/img/background.jpeg b/jdav_web/static/startpage/img/background.jpeg index 10be4e1..c843289 100644 Binary files a/jdav_web/static/startpage/img/background.jpeg and b/jdav_web/static/startpage/img/background.jpeg differ diff --git a/jdav_web/static/startpage/img/favicon.png b/jdav_web/static/startpage/img/favicon.png deleted file mode 100644 index f2a0608..0000000 Binary files a/jdav_web/static/startpage/img/favicon.png and /dev/null differ diff --git a/jdav_web/static/startpage/img/favicon.svg b/jdav_web/static/startpage/img/favicon.svg new file mode 100644 index 0000000..e2b399e --- /dev/null +++ b/jdav_web/static/startpage/img/favicon.svg @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + diff --git a/jdav_web/static/startpage/img/placeholder.jpg b/jdav_web/static/startpage/img/placeholder.jpg deleted file mode 100644 index 8b29218..0000000 Binary files a/jdav_web/static/startpage/img/placeholder.jpg and /dev/null differ diff --git a/jdav_web/static/startpage/img/placeholder.svg b/jdav_web/static/startpage/img/placeholder.svg new file mode 100644 index 0000000..8721d95 --- /dev/null +++ b/jdav_web/static/startpage/img/placeholder.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jdav_web/templates/admin/base_site.html b/jdav_web/templates/admin/base_site.html index 6fc7db6..b6bd195 100644 --- a/jdav_web/templates/admin/base_site.html +++ b/jdav_web/templates/admin/base_site.html @@ -12,7 +12,7 @@

{# Your logo here #} - Your Company Name + KOMPASS

KOMPASS