Mr Duhaz 1 vuosi sitten
vanhempi
sitoutus
d4d3d17795
2 muutettua tiedostoa jossa 44 lisäystä ja 48 poistoa
  1. 23 25
      core/templates/base.html
  2. 21 23
      core/templates/base_no_card.html

+ 23 - 25
core/templates/base.html

@@ -39,30 +39,29 @@
 		<div class="container-fluid">
 		<a class="navbar-brand" href="{% url 'core_index' %}"><i class="fas fa-laptop-house"></i> M'sieur Duhaz, le blog </a>
 		<div class="collapse navbar-collapse" id="navbarSupportedContent">
-		{% if page.p_menu_haut %}
-		<ul class="navbar-nav mr-auto">
-		{% for item in page.p_menu_haut %}
-			<li class="nav-item"><a class="nav-link" href="{{item.p_adresse}}">{% if item.p_icone %}<i class="{{item.p_icone}}" ></i> {% endif %}{{item.p_titre}}</a></li>
-		{% endfor %}
-		</ul>
-		{% endif %}
-		{% comment %}
-		<div class="navbar-nav dropdown">
-			<a class="nav-link dropdown-toggle mr-5" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-id-badge" ></i> Mon profil</a>
-			<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-				{% if request.user.is_authenticated %}
-					{% if request.user.is_staff %}
-						<a class="dropdown-item" href="{% url 'admin:index' %}" ><i class="fas fa-cog" ></i> Admin</a>
+			{% if page.p_menu_haut %}
+				<ul class="navbar-nav mr-auto">
+				{% regroup page.p_menu_haut by p_menu_parent as menu_with_parent %}
+		
+				{% for p_menu_parent in menu_with_parent%}
+					{% if p_menu_parent.grouper != none %}
+					<div class="navbar-nav dropdown">
+					<a class="nav-link dropdown-toggle mr-5" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-bars" ></i> {{ p_menu_parent.grouper }}</a>
+						<div class="dropdown-menu" style="margin-top: 28px; margin-left: 5px;" aria-labelledby="navbarDropdownMenuLink">
+						{% for item in p_menu_parent.list|dictsortreversed:"p_menu_poid" %}
+							<a class="dropdown-item" {%if item.p_type == "lien_ext" %}target="_blank"{% endif %}  href="{{item.p_adresse}}">{% if item.p_icone %}<i class="{{item.p_icone}}" ></i> {% endif %}{{item.p_titre}}</a></li>
+						{% endfor %}
+						</div>
+					</div>
+					{% else %}
+						{% for item in p_menu_parent.list %}
+							<li class="nav-item"><a class="nav-link" {%if item.p_type == "lien_ext" %}target="_blank"{% endif %}  href="{{item.p_adresse}}">{% if item.p_icone %}<i class="{{item.p_icone}}" ></i> {% endif %}{{item.p_titre}}</a></li>
+						{% endfor %}
 					{% endif %}
-				{% else %}
-					<a class="dropdown-item" href="{% url 'core_login' %}?next={{ request.path }}" ><i class="fas fa-sign-in-alt" ></i> Se connecter</a>
-					<a class="dropdown-item" href="{% url 'core_registration' %}?next={{ request.path }}" ><i class="fas fa-edit" ></i> Inscription</a>
-				{% endif %}
+				{% endfor %}
+				</ul>
+			{% endif %}
 			</div>
-		</div>
-		{% endcomment %}
-		
-		</div>
 		{% if page.p_menu_haut or page.blog_cat %}
 		<div class="pos-f-t d-lg-none justify-content-end">
 		<div class="collapse" id="navbarToggleExternalContent">
@@ -151,11 +150,10 @@
 	</div>
 </div>
 </main>
-<footer class="footer mt-auto py-3 text-white" style="background-color: rgba(45, 57, 72, 0.91);">
+<footer class="footer mt-auto py-1 text-white" style="background-color: rgba(45, 57, 72, 0.91);">
 	<div class="container">
-		Duhaz.fr - dec.2023
+		Blog.Duhaz.fr - Jan. 2024
 		{% if page.p_menu_pied %}
-		 - 
 		{% for item in page.p_menu_pied %}
 			<a class="link-light" href="{{item.p_adresse}}">{{item.p_titre}}</a>{% if not forloop.last %}, {% endif %}
 		{% endfor %}

+ 21 - 23
core/templates/base_no_card.html

@@ -40,28 +40,27 @@
 		<a class="navbar-brand sticky-top" href="{% url 'core_index' %}"><i class="fas fa-laptop-house"></i> M'sieur Duhaz, le blog </a>
 		<div class="collapse navbar-collapse" id="navbarSupportedContent">
 		{% if page.p_menu_haut %}
-		<ul class="navbar-nav mr-auto">
-		{% for item in page.p_menu_haut %}
-			<li class="nav-item"><a class="nav-link" href="{{item.p_adresse}}">{% if item.p_icone %}<i class="{{item.p_icone}}" ></i> {% endif %}{{item.p_titre}}</a></li>
-		{% endfor %}
-		</ul>
-		{% endif %}
-		{% comment %}
-		<div class="navbar-nav dropdown">
-			<a class="nav-link dropdown-toggle mr-5" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-id-badge" ></i> Mon profil</a>
-			<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-				{% if request.user.is_authenticated %}
-					{% if request.user.is_staff %}
-						<a class="dropdown-item" href="{% url 'admin:index' %}" ><i class="fas fa-cog" ></i> Admin</a>
-					{% endif %}
+			<ul class="navbar-nav mr-auto">
+			{% regroup page.p_menu_haut by p_menu_parent as menu_with_parent %}
+	
+			{% for p_menu_parent in menu_with_parent%}
+				{% if p_menu_parent.grouper != none %}
+				<div class="navbar-nav dropdown">
+				<a class="nav-link dropdown-toggle mr-5" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-bars" ></i> {{ p_menu_parent.grouper }}</a>
+					<div class="dropdown-menu" style="margin-top: 28px; margin-left: 5px;" aria-labelledby="navbarDropdownMenuLink">
+					{% for item in p_menu_parent.list|dictsortreversed:"p_menu_poid" %}
+						<a class="dropdown-item" {%if item.p_type == "lien_ext" %}target="_blank"{% endif %}  href="{{item.p_adresse}}">{% if item.p_icone %}<i class="{{item.p_icone}}" ></i> {% endif %}{{item.p_titre}}</a></li>
+					{% endfor %}
+					</div>
+				</div>
 				{% else %}
-					<a class="dropdown-item" href="{% url 'core_login' %}?next={{ request.path }}" ><i class="fas fa-sign-in-alt" ></i> Se connecter</a>
-					<a class="dropdown-item" href="{% url 'core_registration' %}?next={{ request.path }}" ><i class="fas fa-edit" ></i> Inscription</a>
+					{% for item in p_menu_parent.list %}
+						<li class="nav-item"><a class="nav-link" {%if item.p_type == "lien_ext" %}target="_blank"{% endif %}  href="{{item.p_adresse}}">{% if item.p_icone %}<i class="{{item.p_icone}}" ></i> {% endif %}{{item.p_titre}}</a></li>
+					{% endfor %}
 				{% endif %}
-			</div>
-		</div>
-		{% endcomment %}
-		
+			{% endfor %}
+			</ul>
+		{% endif %}
 		</div>
 		{% if page.p_menu_haut or page.blog_cat %}
 		<div class="pos-f-t d-lg-none justify-content-end">
@@ -144,11 +143,10 @@
 	</div>
 </div>
 </main>
-<footer class="footer mt-auto py-3 text-white" style="background-color: rgba(45, 57, 72, 0.91);">
+<footer class="footer mt-auto py-1 text-white" style="background-color: rgba(45, 57, 72, 0.91);">
 	<div class="container">
-		Duhaz.fr - dec.2023
+		Blog.Duhaz.fr - Jan. 2024
 		{% if page.p_menu_pied %}
-		 - 
 		{% for item in page.p_menu_pied %}
 			<a class="link-light" href="{{item.p_adresse}}">{{item.p_titre}}</a>{% if not forloop.last %}, {% endif %}
 		{% endfor %}