From d76975bf694ab433a4324697e21808b2e9dd9cf6 Mon Sep 17 00:00:00 2001
From: Dorian Lesbre <dorian.lesbre@gmail.com>
Date: Mon, 11 Jan 2021 11:31:57 +0100
Subject: [PATCH] Fixed navbar not recognizing login screen as current
---
db.sqlite3 | Bin 131072 -> 131072 bytes
home/templates/base.html | 18 ++++++++++++------
home/urls.py | 2 +-
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/db.sqlite3 b/db.sqlite3
index c8b5e5936f833f2a42496d18cf0235d46cc9bd13..d28b23f32df9451563352423f8debb7473b6c237 100644
GIT binary patch
delta 80
zcmZo@;Am*zm>|t4KT*b+QGR2>l6W=-0R{%XLmL}+@i8&lZEUn+ob-W%iT}=K!G^2+
hj4Bfw6&4*3XqvEX0wYTTSS|k}pww-CM!AWOQUL5081n!C
delta 453
zcmajbJx=350ES^(Y!GY_iyDZKpasp08Aw=d5yjZD6^|9m#P&20+e$pc3`u~5Bn@7)
z2Y@?pfd~n0%@MYupyDL_6m+ZYpHHv!6~$6fEZwfEmAkcuTA82RA1|uqC#C!}|MjPQ
zee**txxY*GtI@ekk|Cb%jRCG+WKbqUFdkmiI-}VH?DeT3a?j}L#E2)<s85JR7?m-O
zgA{q;5g@!RJ?n5c<~DqHm{=zBg2BEmYIzp<{YY=mXykM|VT*app4jY)MaaB{nU#05
zh=^3wSR9gb8sbx%_ZhVYc_OoMQ<8CV=1)7JJ&L0?=rr(`OQ)D5$QQ|>lgH>%B(lYt
z4X69*%o<Eldm5oUPf_n9I-}g@UT}omz~sa*8R3p2+?jt$Bo&@v=7h)44eC1OJ?vRF
zrqU7i8Tg3+g4+OYL%0FKfesD;-l?Kpy^6mpilS;SiuUrbQvB7nHW%FG|9yE=JQnJ=
W!J?|YD%$J&?pdp>FVvU+U3mkF!;cUE
diff --git a/home/templates/base.html b/home/templates/base.html
index 9905f46..bf3dc55 100644
--- a/home/templates/base.html
+++ b/home/templates/base.html
@@ -25,25 +25,31 @@
<nav>
<a href="/" rel="text/html"
- class={% if slug == "home" %}"current"{% else %}"internal"{% endif %}>
+ class={% if request.path == "/" %}"current"{% else %}"internal"{% endif %}>
Accueil
</a>
<a href="/inscription/" rel="text/html"
- class={% if slug == "inscription" %}"current"{% else %}"internal"{% endif %}>
+ class={% if request.path == "/inscription/" %}"current"{% else %}"internal"{% endif %}>
Inscriptions
</a>
<a href="/activites/" rel="text/html"
- class={% if slug == "activites" %}"current"{% else %}"internal"{% endif %}>
+ class={% if request.path == "/activites/" %}"current"{% else %}"internal"{% endif %}>
Activités
</a>
<a href="/faq/" rel="text/html"
- class={% if slug == "faq" %}"current"{% else %}"internal"{% endif %}>
+ class={% if request.path == "/faq/" %}"current"{% else %}"internal"{% endif %}>
FAQ
</a>
{% if request.user.is_authenticated %}
- <a class="logout" href="{% url "accounts:logout" %}">Déconnexion</a>
+ <a href="{% url "accounts:logout" %}"
+ class={% if request.path == "/accounts/logout/" %}"logout current"{% else %}"logout"{% endif %}>
+ Déconnexion
+ </a>
{% else %}
- <a class="login" href="{% url "accounts:login" %}?next={{ request.get_full_path }}">Connexion</a>
+ <a href="{% url "accounts:login" %}"
+ class={% if request.path == "/accounts/login/" %}"login current"{% else %}"login"{% endif %}>
+ Connexion
+ </a>
{% endif %}
</nav>
diff --git a/home/urls.py b/home/urls.py
index 7d5eb71..ae31bcd 100644
--- a/home/urls.py
+++ b/home/urls.py
@@ -15,5 +15,5 @@ urlpatterns = [
'sitemap.xml', sitemap, {'sitemaps': sitemaps},
name='django.contrib.sitemaps.views.sitemap'
),
- path('accounts/', include("accounts.urls")),
+ path('accounts/', include("accounts.urls")),
]
--
GitLab