From 1f33c8165ec4a5d05bbca1b7c8adfdd8450a79cf Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Tue, 19 Apr 2022 15:16:56 +0000 Subject: [PATCH] simplify urls and customflatpages --- fet2020/authentications/urls.py | 3 ++ fet2020/blackboard/urls.py | 4 ++- fet2020/blackboard/views.py | 5 ---- fet2020/fet2020/urls.py | 17 ++++------- fet2020/gallery/urls.py | 4 ++- fet2020/members/views.py | 7 ----- fet2020/templates/base.html | 26 +++++++++++------ fet2020/templates/blackboard/index.html | 39 +++++++++++++------------ fet2020/templates/gallery/index.html | 8 ++--- fet2020/templates/layout.html | 6 ++-- fet2020/templates/members/index.html | 6 ++-- fet2020/templates/members/member.html | 1 + fet2020/templates/members/members.html | 7 +++-- 13 files changed, 70 insertions(+), 63 deletions(-) diff --git a/fet2020/authentications/urls.py b/fet2020/authentications/urls.py index 24d78d0f..f4c51d8b 100644 --- a/fet2020/authentications/urls.py +++ b/fet2020/authentications/urls.py @@ -1,6 +1,9 @@ from django.urls import path + +from . import apps from . import views +app_name = apps.AuthenticationsConfig.name urlpatterns = [ path("login/", views.loginPage, name="login"), diff --git a/fet2020/blackboard/urls.py b/fet2020/blackboard/urls.py index 9ec77413..1f854ede 100644 --- a/fet2020/blackboard/urls.py +++ b/fet2020/blackboard/urls.py @@ -1,8 +1,10 @@ from django.urls import path +from . import apps from . import views +app_name = apps.BlackboardConfig.name urlpatterns = [ - path("", views.index, name="blackboard"), + path("", views.index, name="index"), ] diff --git a/fet2020/blackboard/views.py b/fet2020/blackboard/views.py index 5249d3b7..ee91cc16 100644 --- a/fet2020/blackboard/views.py +++ b/fet2020/blackboard/views.py @@ -3,7 +3,6 @@ from datetime import timedelta from django.shortcuts import render from django.utils import timezone -from core.models import CustomFlatPage from .models import JobPosting @@ -12,13 +11,9 @@ def index(request): job_postings = JobPosting.all_job_postings.filter( publish_date__gt=job_postings_cutoff ) - bb_info = CustomFlatPage.objects.filter(title__iexact="blackboard").first() - bb_empty = CustomFlatPage.objects.filter(title__iexact="blackboard empty").first() context = { "job_postings": job_postings.order_by("-publish_date"), - "bb_info": bb_info, - "bb_empty": bb_empty, } return render(request, "blackboard/index.html", context) diff --git a/fet2020/fet2020/urls.py b/fet2020/fet2020/urls.py index d2ea50ed..5c65133b 100644 --- a/fet2020/fet2020/urls.py +++ b/fet2020/fet2020/urls.py @@ -27,23 +27,22 @@ router.register(r"jobs", JobViewSet) router.register(r"jobmembers", JobMemberViewSet) urlpatterns = [ + path("", views.index, name="home"), path("admin/doc/", include("django.contrib.admindocs.urls")), - path("admin/login/", RedirectView.as_view(pattern_name="login")), + path("admin/login/", RedirectView.as_view(pattern_name="authentications:login")), path("admin/", admin.site.urls), path("auth/", include("authentications.urls")), - path("", views.index, name="home"), path("api/", include(router.urls)), - path("blackboard/", include("blackboard.urls"), name="blackboard"), + path("blackboard/", include("blackboard.urls")), path("ckeditor/", include("ckeditor_uploader.urls")), - path("gallery/", include("gallery.urls"), name="gallery"), - path("index.html", views.index, name="home"), + path("gallery/", include("gallery.urls")), + path("intern/", include("intern.urls")), path("jobs/", include(jobs_urlpatterns)), path("members/", include("members.urls")), path("member/", include(member_urlpatterns)), path("posts/", include("posts.urls")), path("search/", include("search.urls")), - path("tasks/", include("tasks.urls"), name="tasks"), - path("intern/", include("intern.urls"), name="intern"), + path("tasks/", include("tasks.urls")), path( "discord/", RedirectView.as_view(url="https://discord.com/invite/7qRuuMA"), @@ -70,8 +69,4 @@ urlpatterns = [ ), path("pages/", include("django.contrib.flatpages.urls")), re_path(r"^(?P.*/)$", flatpages.views.flatpage), - path( - "impressum/", flatpages.views.flatpage, {"url": "/impressum/"}, name="impressum" - ), - path("kontakt/", flatpages.views.flatpage, {"url": "/kontakt/"}, name="contact"), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/fet2020/gallery/urls.py b/fet2020/gallery/urls.py index 14daf8a1..55a1a3bd 100644 --- a/fet2020/gallery/urls.py +++ b/fet2020/gallery/urls.py @@ -1,10 +1,12 @@ from django.urls import path +from . import apps from . import views +app_name = apps.GalleryConfig.name urlpatterns = [ - path("", views.index, name="gallery"), + path("", views.index, name="index"), path("/", views.show_album, name="album"), path("draft//", views.show_draft_album, name="draft-album"), ] diff --git a/fet2020/members/views.py b/fet2020/members/views.py index 83dcf893..e4e97c7f 100644 --- a/fet2020/members/views.py +++ b/fet2020/members/views.py @@ -4,7 +4,6 @@ from collections import deque from django.http import Http404 from django.shortcuts import render -from core.models import CustomFlatPage from .models import Member, JobMember, JobGroup logger = logging.getLogger(__name__) @@ -41,13 +40,10 @@ def index(request): pinned_job_groups, unpinned_job_groups = __get_job_groups() members = Member.all_members.all() - fs_info = CustomFlatPage.objects.filter(title__iexact="fachschaft").first() - context = { "pinned_job_groups": pinned_job_groups, "unpinned_job_groups": unpinned_job_groups, "members": members, - "fs_info": fs_info, } return render(request, "members/members.html", context) @@ -89,13 +85,10 @@ def members(request, filter=None): logger.info("Wrong member role '{}'".format(filter)) raise Http404("no member role") - fs_info = CustomFlatPage.objects.filter(title__iexact="fachschaft").first() - context = { "pinned_job_groups": pinned_job_groups, "unpinned_job_groups": unpinned_job_groups, "members": members, - "fs_info": fs_info, } return render(request, "members/members.html", context) diff --git a/fet2020/templates/base.html b/fet2020/templates/base.html index 6c6ca613..975aa118 100644 --- a/fet2020/templates/base.html +++ b/fet2020/templates/base.html @@ -1,3 +1,4 @@ +{% load flatpages %} {% load static %} @@ -70,12 +71,16 @@ >
  • News
  • Fachschaft
    • -
  • Galerie
    • -
  • Blackboard
    • -
  • Kontakt
    • +
  • Galerie
    • +
  • Blackboard
    • + + {% get_flatpages '/kontakt/' as pages %} + {% if pages %} +
  • {{ pages.first.title }}
    • + {% endif %} {% if not request.user.is_authenticated %} -
  • Login
    • +
  • Anmelden
    • {% else %}
    - +
    Legacy
  • Logout
    • + >Abmelden
    {% endif %} @@ -138,9 +143,12 @@ -
    - Impressum -
    + {% get_flatpages '/impressum/' as pages %} + {% if pages %} +
    + {{ pages.first.title }} +
    + {% endif %}

    © {% now 'Y' %} FET - Alle Rechte vorbehalten.

    diff --git a/fet2020/templates/blackboard/index.html b/fet2020/templates/blackboard/index.html index 8d2e5e01..6566064c 100644 --- a/fet2020/templates/blackboard/index.html +++ b/fet2020/templates/blackboard/index.html @@ -1,5 +1,7 @@ {% extends 'base.html' %} +{% load flatpages %} + {% block title %}Blackboard{% endblock %} {% block content %} @@ -8,20 +10,21 @@

    Blackboard

    -
    -
    - - {% if bb_info %} - {{ bb_info.content|safe }} - {% endif %} -
    + {% get_flatpages '/blackboard-info/' as bb_infos %} + {% if bb_infos %} +
    +
    + + {{ bb_infos.first.content|safe }} +
    - {% if request.user.is_authenticated and bb_info %} - - Info-Text bearbeiten - - {% endif %} -
    + {% if request.user.is_authenticated %} + + Info-Text bearbeiten + + {% endif %} +
    + {% endif %} {% if job_postings %}
    @@ -43,13 +46,13 @@
    {% endif %} - {% else %}
    - {% if bb_empty %} + {% get_flatpages '/blackboard-blank/' as bb_blanks %} + {% if bb_blanks %}
    - {{ bb_empty.content|safe }} + {{ bb_blanks.first.content|safe }}
    {% endif %} @@ -58,8 +61,8 @@ Neuer Eintrag - {% if bb_empty %} - + {% if bb_blanks %} + Fülltext bearbeiten {% endif %} diff --git a/fet2020/templates/gallery/index.html b/fet2020/templates/gallery/index.html index a45f166a..0972cecc 100644 --- a/fet2020/templates/gallery/index.html +++ b/fet2020/templates/gallery/index.html @@ -1,18 +1,18 @@ {% extends 'base.html' %} -{% block title %}Gallery{% endblock %} +{% block title %}Gallerie{% endblock %} {% block content %}
    -

    Fotos

    +

    Gallerie

    {% for album in albums %} {% if album.status == "10" %} - + {% else %} - + {% endif %}

    {{ album.title }}

    diff --git a/fet2020/templates/layout.html b/fet2020/templates/layout.html index b0164c05..f0ea9c5e 100644 --- a/fet2020/templates/layout.html +++ b/fet2020/templates/layout.html @@ -63,12 +63,12 @@
  • Fachschaft
  • Galerie
    • -
  • Blackboard
    • +
  • Blackboard
  • Kontakt
    • {% if request.user.is_authenticated %} -
  • Logout
    • +
  • Logout
    • {% else %} -
  • Login
    • +
  • Login
    • {% endif %}
    diff --git a/fet2020/templates/members/index.html b/fet2020/templates/members/index.html index 513ee4f2..9b55efdc 100644 --- a/fet2020/templates/members/index.html +++ b/fet2020/templates/members/index.html @@ -1,5 +1,6 @@ {% extends 'base.html' %} +{% load flatpages %} {% load softhyphen_tags %} {% load static %} @@ -71,9 +72,10 @@ {% endif %} - {% if fs_info %} + {% get_flatpages '/fachschaft/' as pages %} + {% if pages %}
  • - + Fachschaft-Text bearbeiten
    • diff --git a/fet2020/templates/members/member.html b/fet2020/templates/members/member.html index 3d0358ae..ddc10d45 100644 --- a/fet2020/templates/members/member.html +++ b/fet2020/templates/members/member.html @@ -1,4 +1,5 @@ {% extends 'members/index.html' %} + {% load softhyphen_tags %} {% block title %}{{ member.firstname }} {{ member.surname }}{% endblock %} diff --git a/fet2020/templates/members/members.html b/fet2020/templates/members/members.html index d3e47a57..6ccca1fb 100644 --- a/fet2020/templates/members/members.html +++ b/fet2020/templates/members/members.html @@ -1,11 +1,14 @@ {% extends 'members/index.html' %} +{% load flatpages %} + {% block title %}Fachschaft{% endblock %} {% block members_content %} - {% if fs_info %} + {% get_flatpages '/fachschaft/' as pages %} + {% if pages %}
    - {{ fs_info.content|safe }} + {{ pages.first.content|safe }}
    {% endif %}