diff --git a/jdav_web/startpage/templates/startpage/navigation.html b/jdav_web/startpage/templates/startpage/navigation.html index 04391ea..731e0ef 100644 --- a/jdav_web/startpage/templates/startpage/navigation.html +++ b/jdav_web/startpage/templates/startpage/navigation.html @@ -1,4 +1,4 @@ -{% load static %} +{% load static common %} +{% settings_value 'STARTPAGE_REDIRECT_URL' as redirect_url %} diff --git a/jdav_web/startpage/urls.py b/jdav_web/startpage/urls.py index 417f6fc..56d1eeb 100644 --- a/jdav_web/startpage/urls.py +++ b/jdav_web/startpage/urls.py @@ -4,17 +4,24 @@ from django.urls import re_path from . import views app_name = "startpage" -urlpatterns = [ - re_path(r'^$', views.index, name='index'), - re_path(r'^impressum/?$', views.static_view('startpage/impressum.html'), name='impressum'), - re_path(r'^aktuelles/?$', views.aktuelles, name='aktuelles'), - re_path(r'^berichte/?$', views.berichte, name='berichte'), - re_path(r'^gruppen/?$', views.static_view('startpage/gruppen.html'), name='gruppen'), - re_path(r'^gruppen/faq/?$', views.static_view('startpage/gruppen/faq.html'), name='faq'), - re_path(r'^gruppen/(?P{pattern}+)/?$'.format(pattern=settings.STARTPAGE_URL_NAME_PATTERN), - views.gruppe_detail, name='gruppe_detail'), - re_path(r'^(?P{pattern}+)/(?P{pattern}+)/?$'.format(pattern=settings.STARTPAGE_URL_NAME_PATTERN), - views.post, name='post'), - re_path(r'^(?P{pattern}+)/?$'.format(pattern=settings.STARTPAGE_URL_NAME_PATTERN), - views.section, name='section'), -] + +if settings.STARTPAGE_REDIRECT_URL != '': + urlpatterns = [ + re_path(r'^$', views.redirect, name='index'), + re_path(r'^impressum/?$', views.static_view('startpage/impressum.html'), name='impressum'), + ] +else: + urlpatterns = [ + re_path(r'^$', views.index, name='index'), + re_path(r'^impressum/?$', views.static_view('startpage/impressum.html'), name='impressum'), + re_path(r'^aktuelles/?$', views.aktuelles, name='aktuelles'), + re_path(r'^berichte/?$', views.berichte, name='berichte'), + re_path(r'^gruppen/?$', views.static_view('startpage/gruppen.html'), name='gruppen'), + re_path(r'^gruppen/faq/?$', views.static_view('startpage/gruppen/faq.html'), name='faq'), + re_path(r'^gruppen/(?P{pattern}+)/?$'.format(pattern=settings.STARTPAGE_URL_NAME_PATTERN), + views.gruppe_detail, name='gruppe_detail'), + re_path(r'^(?P{pattern}+)/(?P{pattern}+)/?$'.format(pattern=settings.STARTPAGE_URL_NAME_PATTERN), + views.post, name='post'), + re_path(r'^(?P{pattern}+)/?$'.format(pattern=settings.STARTPAGE_URL_NAME_PATTERN), + views.section, name='section'), + ] diff --git a/jdav_web/startpage/views.py b/jdav_web/startpage/views.py index 66b70bc..780ae44 100644 --- a/jdav_web/startpage/views.py +++ b/jdav_web/startpage/views.py @@ -1,4 +1,4 @@ -from django.shortcuts import redirect, get_object_or_404 +from django.shortcuts import redirect as django_redirect, get_object_or_404 from django import shortcuts from django.conf import settings from django.urls import reverse @@ -28,6 +28,10 @@ def index(request): return render(request, 'startpage/index.html', context) +def redirect(request): + return django_redirect(settings.STARTPAGE_REDIRECT_URL) + + # static view factory def static_view(template_path): def view(request):