Merge branch 'main' into MK/fix_ages

pull/148/head
Christian Merten 9 months ago
commit 24e9b0472d
Signed by: christian.merten
GPG Key ID: D953D69721B948B3

3
.gitmodules vendored

@ -1,3 +0,0 @@
[submodule "jdav_web/jet"]
path = jdav_web/jet
url = https://git.flavigny.de/jdavlb/jet/

@ -58,6 +58,7 @@ base_settings = [
'components/emails.py',
'components/texts.py',
'components/locale.py',
'components/oauth.py',
]
include(*base_settings)

@ -52,6 +52,7 @@ INSTALLED_APPS = [
'django_celery_beat',
'rules',
'jet',
'oauth2_provider',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
@ -196,3 +197,5 @@ STARTPAGE_URL_NAME_PATTERN = "[\w\-: *]"
# admins to contact on error messages
ADMINS = get_var('section', 'admins', default=[])
LOGIN_URL = '/de/kompass/login/'

@ -0,0 +1,11 @@
OAUTH2_PROVIDER = {
"OIDC_ENABLED": True,
"PKCE_REQUIRED": False,
"OAUTH2_VALIDATOR_CLASS": "logindata.oauth.CustomOAuth2Validator",
"OIDC_RSA_PRIVATE_KEY": get_var('oauth', 'oidc_rsa_private_key', default=''),
"SCOPES": {
"openid": "OpenID Connect scope",
"profile": "profile scope",
"email": "email scope",
},
}

@ -13,13 +13,14 @@ Including another URLconf
1. Import the include() function: from django.conf.urls import url, include
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
"""
from django.urls import re_path, include
from django.urls import path, re_path, include
from django.contrib import admin
from django.conf.urls.static import static
from django.conf.urls.i18n import i18n_patterns
from django.conf import settings
from django.utils.translation import gettext_lazy as _
from django.views.generic.base import RedirectView
from oauth2_provider import urls as oauth2_urls
from .views import media_access
admin.site.index_title = _('Startpage')
@ -36,6 +37,7 @@ urlpatterns = i18n_patterns(
re_path(r'^LBAlpin/Programm(/)?(20)?[0-9]{0,2}', include('ludwigsburgalpin.urls',
namespace="ludwigsburgalpin")),
re_path(r'^_nested_admin/', include('nested_admin.urls')),
path('o/', include(oauth2_urls)),
re_path(r'^', include('startpage.urls', namespace="startpage")),
)

@ -1 +0,0 @@
Subproject commit 0126d5596fcba43730ecc7e6cbc0987b12f0640d

@ -0,0 +1,13 @@
from oauth2_provider.oauth2_validators import OAuth2Validator
class CustomOAuth2Validator(OAuth2Validator):
# Set `oidc_claim_scope = None` to ignore scopes that limit which claims to return,
# otherwise the OIDC standard scopes are used.
def get_additional_claims(self, request):
if request.user.member:
context = {'email': request.user.member.email}
else:
context = {}
return dict(context, preferred_username=request.user.username)

@ -0,0 +1,439 @@
{% load i18n static jet_tags %}<!DOCTYPE html>
{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
{% jet_get_current_theme as THEME %}
{% jet_get_current_version as JET_VERSION %}
{% block html %}<html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
<head>
<title>{% block title %}{% endblock %}</title>
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}" />
<link rel="stylesheet" type="text/css" href="{% static "jet/css/vendor.css" as url %}{{ url|jet_append_version }}" />
<link rel="stylesheet" type="text/css" href="{% static "jet/css/icons/style.css" as url %}{{ url|jet_append_version }}" />
<link rel="stylesheet" type="text/css" href="{% static "jet/css/themes/"|add:THEME|add:"/base.css" as url %}{{ url|jet_append_version }}" class="base-stylesheet" />
<link rel="stylesheet" type="text/css" href="{% static "jet/css/themes/"|add:THEME|add:"/select2.theme.css" as url %}{{ url|jet_append_version }}" class="select2-stylesheet" />
<link rel="stylesheet" type="text/css" href="{% static "jet/css/themes/"|add:THEME|add:"/jquery-ui.theme.css" as url %}{{ url|jet_append_version }}" class="jquery-ui-stylesheet" />
{% block extrastyle %}{% endblock %}
{% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}" />{% endif %}
{% jet_get_date_format as date_format %}
{% jet_get_time_format as time_format %}
{% jet_get_datetime_format as datetime_format %}
<script type="text/javascript" charset="utf-8">
var DATE_FORMAT = "{{ date_format }}";
var TIME_FORMAT = "{{ time_format }}";
var DATETIME_FORMAT = "{{ datetime_format }}";
</script>
<script type="text/javascript" src="{% url 'jet:jsi18n' %}"></script>
<script src="{% static "jet/js/build/bundle.min.js" as url %}{{ url|jet_append_version }}"></script>
{% jet_static_translation_urls as translation_urls %}
{% for url in translation_urls %}
<script src="{% static url as url %}{{ url|jet_append_version }}"></script>
{% endfor %}
{% block extrahead %}{% endblock %}
{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
<!-- fixes some bug, see https://github.com/geex-arts/django-jet/issues/149 -->
<script>
django.gettext = window.gettext
</script>
</head>
{% load i18n %}
<body class="{% if request.COOKIES.sidebar_pinned != 'false' %}menu-pinned {% endif %}{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}"
data-admin-utc-offset="{% now "Z" %}">
<!-- Container -->
<div id="container">
{% if not is_popup %}
<!-- Header -->
<div id="header">
<div id="branding">
<span id="branding-menu" class="sidebar-header-menu-icon icon-menu sidebar-toggle"></span>
<span id="branding-pin" class="sidebar-link-icon icon-pin sidebar-pin"></span>
{% block branding %}{% endblock %}
</div>
{% block usertools %}
{% if user.is_active and user.is_staff or has_permission %}
<div id="user-tools">
{% block welcome-msg %}
{% trans 'Welcome,' %}
<strong>{% firstof user.get_short_name user.get_username %}</strong>.
{% endblock %}
{% block userlinks %}
{% if site_url %}
<a href="{{ site_url }}">{% trans 'View site' %}</a> /
{% endif %}
{% if user.is_active and user.is_staff %}
{% url 'django-admindocs-docroot' as docsroot %}
{% if docsroot %}
<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> /
{% endif %}
{% endif %}
{% if user.has_usable_password %}
<a href="{% url 'admin:password_change' %}">{% trans 'Change password' %}</a> /
{% endif %}
<a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>
{% endblock %}
</div>
{% endif %}
{% endblock %}
</div>
<!-- END Header -->
{% block breadcrumbs %}
<div class="breadcrumbs">
<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
{% if title %} &rsaquo; {{ title }}{% endif %}
</div>
{% endblock %}
{% endif %}
{% block messages %}
{% if messages %}
<ul class="messagelist">{% for message in messages %}
<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message|capfirst }}</li>
{% endfor %}</ul>
{% endif %}
{% endblock messages %}
<!-- Content -->
<div id="content" class="{% block coltype %}colM{% endblock %}">
{% block pretitle %}{% endblock %}
{% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
{% block content %}
{% block object-tools %}{% endblock %}
{{ content }}
{% endblock %}
{% block sidebar %}{% endblock %}
<br class="clear" />
</div>
<!-- END Content -->
{% block footer %}<div id="footer"></div>{% endblock %}
{% jet_delete_confirmation_context as delete_confirmation_context %}
{{ delete_confirmation_context }}
{% jet_change_form_sibling_links_enabled as show_siblings %}
{% if change and show_siblings %}
<div class="changeform-navigation">
{% spaceless %}
{% jet_previous_object as sibling %}
<a{% if sibling.url %} href="{{ sibling.url }}"{% endif %} class="changeform-navigation-button segmented-button left{% if not sibling %} disabled{% endif %}" title="{{ sibling.label }}">
<span class="changeform-navigation-button-icon left icon-arrow-left"></span>
<span class="changeform-navigation-button-label">
{% if sibling %}
{{ sibling.label }}
{% else %}
---
{% endif %}
</span>
</a>
{% jet_next_object as sibling %}
<a{% if sibling.url %} href="{{ sibling.url }}"{% endif %} class="changeform-navigation-button segmented-button right{% if not sibling %} disabled{% endif %}" title="{{ sibling.label }}">
<span class="changeform-navigation-button-icon right icon-arrow-right"></span>
<span class="changeform-navigation-button-label">
{% if sibling %}
{{ sibling.label }}
{% else %}
---
{% endif %}
</span>
</a>
{% endspaceless %}
</div>
{% endif %}
{% jet_get_side_menu_compact as SIDE_MENU_COMPACT %}
{% if not is_popup %}
<div class="related-popup-container scrollable">
<a href="#" class="related-popup-back">
<span class="related-popup-back-icon icon-arrow-left"></span>
<span class="related-popup-back-label">{% trans "back" %}</span>
</a>
<span class="icon-refresh loading-indicator"></span>
</div>
<div class="sidebar-header-wrapper sidebar-dependent">
<div class="sidebar-header sidebar-dependent">
<a href="#" class="sidebar-header-menu sidebar-toggle">
<span class="sidebar-header-menu-icon icon-menu"></span>
<span class="sidebar-header-menu-icon icon-cross"></span>
</a>
</div>
</div>
<div class="sidebar sidebar-dependent">
<div class="sidebar-wrapper scrollable">
<div class="sidebar-section">
{% if user.is_active and user.is_staff %}
<a href="{% url 'admin:index' %}" class="sidebar-link icon">
<span class="sidebar-link-label">
<span class="sidebar-link-icon icon-data"></span>
{% trans 'Home' %}
</span>
</a>
{% endif %}
{% if site_url %}
<a href="{{ site_url }}" class="sidebar-link icon">
<span class="sidebar-link-label">
<span class="sidebar-link-icon icon-open-external"></span>
{% trans 'View site' %}
</span>
</a>
{% endif %}
{% url 'django-admindocs-docroot' as docsroot %}
{% if docsroot %}
<a href="{{ docsroot }}" class="sidebar-link icon">
<span class="sidebar-link-label">
<span class="sidebar-link-icon icon-book"></span>
{% trans 'Documentation' %}
</span>
</a>
{% endif %}
{% if user.is_active and user.is_staff %}
{% if user.has_usable_password %}
<a href="{% url 'admin:password_change' %}" class="sidebar-link icon">
<span class="sidebar-link-label">
<span class="sidebar-link-icon icon-settings"></span>
{% trans 'Change password' %}
</span>
</a>
{% endif %}
<a href="{% url 'admin:logout' %}" class="sidebar-link icon">
<span class="sidebar-link-label">
<span class="sidebar-link-icon icon-cross"></span>
{% trans 'Log out' %}
</span>
</a>
{% endif %}
{% block nav-global %}{% endblock %}
</div>
{% if user.is_active and user.is_staff %}
{% jet_get_menu as app_list %}
{% if SIDE_MENU_COMPACT %}
{% if user.member %}
{% if user.member.led_groups|length > 0 %}
<div class="sidebar-section">
<div class="sidebar-title">
<a class="sidebar-title-link">
Meine Jugendgruppen
</a>
</div>
{% for group in user.member.led_groups %}
<div>
<a href="{% url 'admin:members_member_changelist' %}?group__id__exact={{group.pk}}" class="sidebar-link">
<span class="sidebar-right">
<span class="sidebar-right-arrow icon-arrow-right"></span>
</span>
<span class="sidebar-link-label">{{ group }}</span>
</a>
</div>
{% endfor %}
</div>
{% endif %}
{% endif %}
{% for app in app_list %}
{% if app.has_perms %}
<div class="sidebar-section">
<div class="sidebar-title">
<a{% if app.url %} href="{{ app.url }}"{% endif %} class="sidebar-title-link"{% if app.url_blank %} target="_blank"{% endif %}>
{{ app.label }}
</a>
</div>
{% for model in app.items %}
{% if model.has_perms %}
<div>
<a{% if model.url %} href="{{ model.url }}"{% endif %} class="sidebar-link"{% if model.url_blank %} target="_blank"{% endif %}>
<span class="sidebar-right">
<span class="sidebar-right-arrow icon-arrow-right"></span>
</span>
<span class="sidebar-link-label">{{ model.label }}</span>
</a>
</div>
{% endif %}
{% endfor %}
</div>
{% endif %}
{% endfor %}
{% else %}
<form action="{% url "jet:toggle_application_pin" %}" method="POST" id="toggle-application-pin-form">
{% csrf_token %}
<input type="hidden" name="app_label">
</form>
<div class="sidebar-section">
<div class="sidebar-title">
<span class="sidebar-right">
<a href="#" class="sidebar-right-edit edit-apps-list"><span class="icon-settings"></span></a>
</span>
{% trans 'Applications' %}
</div>
<div class="apps-list-pinned">
{% for app in app_list %}
{% if app.has_perms and app.pinned %}
<a{% if app.url %} href="{{ app.url }}"{% endif %} class="sidebar-link popup-section-link app-item" data-app-label="{{ app.app_label }}" data-popup-section-class="sidebar-popup-section-{{ app.app_label }}" data-order="{{ forloop.counter }}"{% if app.url_blank %} target="_blank"{% endif %}>
<span class="sidebar-left collapsible">
<span class="sidebar-left-pin icon-star pin-toggle"></span>
<span class="sidebar-left-unpin icon-cross pin-toggle"></span>
</span>
<span class="sidebar-right">
<span class="sidebar-right-arrow icon-arrow-right"></span>
</span>
<span class="sidebar-link-label">
{{ app.label }}
</span>
</a>
{% endif %}
{% endfor %}
</div>
<a href="#" class="sidebar-center-link apps-hide">
<span class="apps-hide-label apps-visible">{% trans "Hide applications" %}</span>
<span class="apps-hide-label apps-hidden">{% trans "Show hidden" %}</span>
</a>
<div class="apps-list">
{% for app in app_list %}
{% if app.has_perms and not app.pinned %}
<a{% if app.url %} href="{{ app.url }}"{% endif %} class="sidebar-link popup-section-link app-item" data-app-label="{{ app.app_label }}" data-popup-section-class="sidebar-popup-section-{{ app.app_label }}" data-order="{{ forloop.counter }}"{% if app.url_blank %} target="_blank"{% endif %}>
<span class="sidebar-left collapsible">
<span class="sidebar-left-pin icon-star pin-toggle"></span>
<span class="sidebar-left-unpin icon-cross pin-toggle"></span>
</span>
<span class="sidebar-right">
<span class="sidebar-right-arrow icon-arrow-right"></span>
</span>
<span class="sidebar-link-label">
{{ app.label }}
</span>
</a>
{% endif %}
{% endfor %}
</div>
</div>
{% endif %}
<div class="sidebar-section last">
<div class="dialog-confirm" id="bookmarks-add-dialog" title="{% trans "Add bookmark" %}">
<form action="{% url "jet:add_bookmark" %}" method="POST" id="bookmarks-add-form">
{% csrf_token %}
<p>{% trans "Title" %}:</p>
<input type="text" name="title" class="fill_width">
<p>{% trans "URL" %}:</p>
<input type="text" name="url" class="fill_width">
</form>
</div>
<form action="{% url "jet:remove_bookmark" %}" method="POST" id="bookmarks-remove-form">
{% csrf_token %}
<input type="hidden" name="id">
</form>
<div class="dialog-confirm" id="bookmarks-remove-dialog" title="{% trans "Delete bookmark" %}">
<p>{% trans "Are you sure want to delete this bookmark?" %}</p>
</div>
<div class="sidebar-title">
<span class="sidebar-right">
<a href="#" class="sidebar-right-plus bookmarks-add" title="{% trans "Add bookmark" %}"{% if title %} data-title="{{ title }}"{% endif %}><span class="icon-add"></span></a>
</span>
{% trans 'bookmarks' %}
</div>
<div class="bookmarks-list">
{% jet_get_bookmarks user as bookmarks %}
{% for bookmark in bookmarks %}
<a href="{{ bookmark.url }}" class="sidebar-link bookmark-item">
<span class="sidebar-right collapsible">
<span class="sidebar-right-remove bookmarks-remove" data-bookmark-id="{{ bookmark.pk }}">{% trans "Remove" %}</span>
</span>
<span class="sidebar-link-label">{{ bookmark.title }}</span>
</a>
{% endfor %}
<a class="sidebar-link bookmark-item clone">
<span class="sidebar-right collapsible">
<span class="sidebar-right-remove bookmarks-remove">{% trans "Remove" %}</span>
</span>
<span class="sidebar-link-label"></span>
</a>
</div>
</div>
{% endif %}
</div>
{% if app_list and not SIDE_MENU_COMPACT %}
<div class="sidebar-popup-container">
<div class="sidebar-popup scrollable">
<a href="#" class="sidebar-close sidebar-back">
<span class="sidebar-close-icon icon-arrow-left"></span>
</a>
{% for app in app_list %}
{% if app.has_perms %}
<div class="sidebar-popup-section sidebar-popup-section-{{ app.app_label }}">
<div class="sidebar-popup-title">
{{ app.label }}
</div>
<input class="sidebar-popup-search" placeholder="{% trans "Search" %}...">
<ul class="sidebar-popup-list">
{% if app.url %}
<li class="sidebar-popup-list-item app-{{ app.app_label }}{{ app.current|yesno:" current," }}">
<a href="{{ app.url }}" class="sidebar-popup-list-item-link">{% trans 'Application page' %}</a>
</li>
{% endif %}
{% for model in app.items %}
{% if model.has_perms %}
<li class="sidebar-popup-list-item{% if model.name %} model-{{ model.name }}{% endif %}{{ model.current|yesno:" current," }}">
<a{% if model.url %} href="{{ model.url }}"{% endif %} class="sidebar-popup-list-item-link"{% if model.url_blank %} target="_blank"{% endif %}>
{{ model.label }}
</a>
</li>
{% endif %}
{% endfor %}
</ul>
</div>
{% endif %}
{% endfor %}
</div>
</div>
{% endif %}
</div>
{% endif %}
{% jet_get_themes as THEMES %}
{% if THEMES %}
<li class="user-tools-contrast-block theme-chooser">
<div class="user-tools-contrast-block-title">{% trans "current theme" %}</div>
<div class="user-tools-theme-link-container">
{% spaceless %}
{% for conf_theme in THEMES %}
{% if conf_theme.theme %}
<a href="#"
class="user-tools-theme-link choose-theme{% if conf_theme.theme == THEME %} selected{% endif %}"
data-theme="{{ conf_theme.theme }}"
data-base-stylesheet="{% static "jet/css/themes/"|add:conf_theme.theme|add:"/base.css" %}?v={{ JET_VERSION }}"
data-select2-stylesheet="{% static "jet/css/themes/"|add:conf_theme.theme|add:"/select2.theme.css" %}?v={{ JET_VERSION }}"
data-jquery-ui-stylesheet="{% static "jet/css/themes/"|add:conf_theme.theme|add:"/jquery-ui.theme.css" %}?v={{ JET_VERSION }}"
{% if conf_theme.title %} title="{{ conf_theme.title }}"{% endif %}
style="background-color: {{ conf_theme.color|default:"white" }};"
></a>
{% endif %}
{% endfor %}
{% endspaceless %}
</div>
</li>
{% endif %}
</div>
<!-- END Container -->
</body>
</html>{% endblock %}

@ -2,6 +2,18 @@
{% load i18n static common %}
{% block content %}
<script>
/*
Remove breadcrumbs from index page. We can't just override the breadcrumbs block in
this template, because this also removes breadcrumbs from all descendents.
TODO: Find a better solution.
*/
var els = document.getElementsByClassName('breadcrumbs');
for (var i = 0; i < els.length; ++i) {
var item = els[i];
item.remove();
}
</script>
<div id="content-main">
<div>

@ -1,12 +1,15 @@
alabaster==0.7.16
amqp==5.0.9
asgiref==3.4.1
asgiref==3.8.1
auditlog3==1.0.1
babel==2.16.0
bcrypt==4.0.1
beautifulsoup4==4.13.3
billiard==3.6.4.0
bleach==6.0.0
celery==5.2.3
certifi==2021.10.8
cffi==1.17.1
charset-normalizer==2.0.10
click==8.0.3
click-didyoumean==0.3.0
@ -14,29 +17,38 @@ click-plugins==1.1.1
click-repl==0.2.0
coverage==7.5.4
cron-descriptor==1.2.35
cryptography==44.0.2
Deprecated==1.2.13
Django==4.0.1
Django==4.2.20
django-appconf==1.0.5
django-celery-beat==2.5.0
django-celery-email==3.0.0
django-jet-reboot==1.3.10
django-markdownify==0.9.3
django-markdownx==4.0.2
django-nested-admin==4.0.2
django-oauth-toolkit==3.0.1
django-split-settings==1.2.0
django-timezone-field==5.0
docutils==0.21.2
et_xmlfile==2.0.0
idna==3.3
imagesize==1.4.1
importlib-metadata==6.2.0
importlib_resources==6.5.2
Jinja2==3.1.4
jwcrypto==1.5.6
kombu==5.2.3
Markdown==3.4.3
MarkupSafe==3.0.2
mysqlclient==2.1.0
oauthlib==3.2.2
openpyxl==3.1.5
packaging==24.2
Pillow==9.0.0
prompt-toolkit==3.0.24
pycountry==24.6.1
pycparser==2.22
Pygments==2.18.0
pymemcache==4.0.0
pyparsing==3.0.6
@ -47,10 +59,12 @@ python-monkey-business==1.0.0
pytz==2021.3
redis==4.1.0
requests==2.32.3
rstr==3.2.2
rules==3.3
schwifty==2024.11.0
six==1.16.0
snowballstemmer==2.2.0
soupsieve==2.6
Sphinx==7.4.7
sphinxawesome-theme==5.3.2
sphinxcontrib-applehelp==2.0.0

Loading…
Cancel
Save