diff --git a/fet2020/fet2020/urls.py b/fet2020/fet2020/urls.py index 8e865e75..d2ea50ed 100644 --- a/fet2020/fet2020/urls.py +++ b/fet2020/fet2020/urls.py @@ -37,9 +37,9 @@ urlpatterns = [ path("ckeditor/", include("ckeditor_uploader.urls")), path("gallery/", include("gallery.urls"), name="gallery"), path("index.html", views.index, name="home"), - path("jobs/", include(jobs_urlpatterns), name="jobs"), - path("members/", include("members.urls"), name="members"), - path("member/", include(member_urlpatterns), name="member"), + 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"), diff --git a/fet2020/members/urls.py b/fet2020/members/urls.py index 0dc10943..b1094a76 100644 --- a/fet2020/members/urls.py +++ b/fet2020/members/urls.py @@ -1,17 +1,19 @@ from django.urls import path +from . import apps from . import views +app_name = apps.MembersConfig.name urlpatterns = [ - path("", views.index, name="members"), - path("/", views.members_view, name="members_view"), + path("", views.index, name="index"), + path("/", views.members, name="members"), ] member_urlpatterns = [ - path("/", views.profile_view, name="member"), + path("/", views.profile, name="member"), ] jobs_urlpatterns = [ - path("/", views.jobs_view, name="jobs"), + path("/", views.jobs, name="jobs"), ] diff --git a/fet2020/members/views.py b/fet2020/members/views.py index 99a70b35..83dcf893 100644 --- a/fet2020/members/views.py +++ b/fet2020/members/views.py @@ -53,7 +53,7 @@ def index(request): return render(request, "members/members.html", context) -def jobs_view(request, slug=None): +def jobs(request, slug=None): pinned_job_groups, unpinned_job_groups = __get_job_groups() try: @@ -78,7 +78,7 @@ def jobs_view(request, slug=None): return render(request, "members/jobs.html", context) -def members_view(request, filter=None): +def members(request, filter=None): pinned_job_groups, unpinned_job_groups = __get_job_groups() for elem in Member.MemberRole: @@ -101,7 +101,7 @@ def members_view(request, filter=None): return render(request, "members/members.html", context) -def profile_view(request, member_id=None): +def profile(request, member_id=None): pinned_job_groups, unpinned_job_groups = __get_job_groups() member = Member.all_members.filter(id=member_id).first() diff --git a/fet2020/templates/base.html b/fet2020/templates/base.html index 549df7d1..6c6ca613 100644 --- a/fet2020/templates/base.html +++ b/fet2020/templates/base.html @@ -69,7 +69,7 @@ x-transition:leave-end="transform opacity-0 scale-90" >
  • News
  • -
  • Fachschaft
  • +
  • Fachschaft
  • Galerie
  • Blackboard
  • Kontakt
  • diff --git a/fet2020/templates/layout.html b/fet2020/templates/layout.html index beaf1823..b0164c05 100644 --- a/fet2020/templates/layout.html +++ b/fet2020/templates/layout.html @@ -61,7 +61,7 @@ {% endif %}
  • News
  • -
  • Fachschaft
  • +
  • Fachschaft
  • Galerie
  • Blackboard
  • Kontakt
  • diff --git a/fet2020/templates/members/index.html b/fet2020/templates/members/index.html index 4afdc805..513ee4f2 100644 --- a/fet2020/templates/members/index.html +++ b/fet2020/templates/members/index.html @@ -51,15 +51,15 @@
  • - Fachschaft + Fachschaft
  • - Pension + Pension
  • - Alle Mitglieder + Alle Mitglieder
  • {% if request.user.is_authenticated %}