feat(startpage): allow disabling startpage

We add back the functionality to disable the startpage. If a non-empty redirect url is configured,
all startpage urls are disabled except for the index page which redirects to the given url.
cm-remove-jet
Christian Merten 9 months ago
parent bdbbaa41a2
commit 443ef326cf
Signed by: christian.merten
GPG Key ID: D953D69721B948B3

@ -1,4 +1,4 @@
{% load static %} {% load static common %}
<script> <script>
window.onscroll = () => { window.onscroll = () => {
@ -36,18 +36,22 @@ window.onclick = function(event) {
} }
</script> </script>
{% settings_value 'STARTPAGE_REDIRECT_URL' as redirect_url %}
<div class="navigation"> <div class="navigation">
<div id="myNavbar" class="navbar"> <div id="myNavbar" class="navbar">
<a href="/"><img style="margin: 0; padding: 0;"src="{% static 'general/img/jdav_logo_sektion.png' %}"></a> <a href="/"><img style="margin: 0; padding: 0;"src="{% static 'general/img/jdav_logo_sektion.png' %}"></a>
{% if not redirect_url %}
<div> <div>
<button onclick="myFunction()"class="dropbtn">Menü</button> <button onclick="myFunction()"class="dropbtn">Menü</button>
<a class="nav" href="/kompass">Login</a> <a class="nav" href="/kompass">Login</a>
</div> </div>
{% endif %}
</div> </div>
<div class="dropdown"> <div class="dropdown">
<div id="myDropdown" class="dropdown-content"> <div id="myDropdown" class="dropdown-content">
{% if not redirect_url %}
<div class="menu-level-1"> <div class="menu-level-1">
<ul> <ul>
<li> <li>
@ -117,6 +121,7 @@ window.onclick = function(event) {
</li> </li>
</ul> </ul>
</div> </div>
{% endif %}
</div> </div>
</div> </div>
</div> </div>

@ -4,6 +4,13 @@ from django.urls import re_path
from . import views from . import views
app_name = "startpage" app_name = "startpage"
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 = [ urlpatterns = [
re_path(r'^$', views.index, name='index'), re_path(r'^$', views.index, name='index'),
re_path(r'^impressum/?$', views.static_view('startpage/impressum.html'), name='impressum'), re_path(r'^impressum/?$', views.static_view('startpage/impressum.html'), name='impressum'),

@ -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 import shortcuts
from django.conf import settings from django.conf import settings
from django.urls import reverse from django.urls import reverse
@ -28,6 +28,10 @@ def index(request):
return render(request, 'startpage/index.html', context) return render(request, 'startpage/index.html', context)
def redirect(request):
return django_redirect(settings.STARTPAGE_REDIRECT_URL)
# static view factory # static view factory
def static_view(template_path): def static_view(template_path):
def view(request): def view(request):

Loading…
Cancel
Save