Home Explore Help
Sign In
MrDuhaz
/
blog-duhaz-v3
1
0
Fork 0
Files
Browse Source

core update

Mr Duhaz 1 year ago
parent
49b4719819
commit
ef10730a92
3 changed files with 153 additions and 91 deletions
Unified View Show Diff Stats
  1. 39 21
      core/templates/base.html
  2. 93 70
      core/templates/base_no_card.html
  3. 21 0
      core/views.py

+ 39 - 21
core/templates/base.html
View File 

@@ -9,7 +9,7 @@
 
 	{% block add_meta_description %}{% endblock %}
 
 	{% block add_meta_description %}{% endblock %}
 
 	<title>{{page.c_sitename}}{% if page.p_meta_title %} | {{page.p_meta_title}}{% elif page.p_titre %} | {{page.p_titre}}{% endif %}</title>
 
 	<title>{{page.c_sitename}}{% if page.p_meta_title %} | {{page.p_meta_title}}{% elif page.p_titre %} | {{page.p_titre}}{% endif %}</title>
 
 	<link rel="shortcut icon" href="/static/favicon.ico">
 
 	<link rel="shortcut icon" href="/static/favicon.ico">
 
-	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
 
+	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
 
 	<link href="//fonts.googleapis.com/css2?family=Kufam&display=swap" rel="stylesheet">
 
 	<link href="//fonts.googleapis.com/css2?family=Kufam&display=swap" rel="stylesheet">
 
 	<script src="https://kit.fontawesome.com/7cf2a101ac.js"></script>
 
 	<script src="https://kit.fontawesome.com/7cf2a101ac.js"></script>
 
 	{% if not request.user.is_authenticated %}
 
 	{% if not request.user.is_authenticated %}
 
@@ -33,7 +33,7 @@
 
 	</style>
 
 	</style>
 
 </head>
 
 </head>
 
 <body class="d-flex flex-column h-100">
 
 <body class="d-flex flex-column h-100">
 
-<header style="color: #fff; font-family: Omnes;">
 
+	<header style="color: #fff; font-family: Kufam', cursive;">
 
 	<nav class="navbar navbar-expand-lg navbar-dark" style="background-color: {{page.c_bgcolor}};"> 
 	<nav class="navbar navbar-expand-lg navbar-dark" style="background-color: {{page.c_bgcolor}};"> 
 		<div class="container-fluid">
 
 		<div class="container-fluid">
 
 		<div class="collapse navbar-collapse" id="navbarSupportedContent">
 
 		<div class="collapse navbar-collapse" id="navbarSupportedContent">
 
@@ -46,7 +46,7 @@
 
 			{% if p_menu_parent.grouper != none %}
 
 			{% if p_menu_parent.grouper != none %}
 
 			<div class="navbar-nav dropdown">
 
 			<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>
 
 			<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">
 
+				<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
 
 				{% for item in p_menu_parent.list|dictsortreversed:"p_menu_poid" %}
 
 				{% 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>
 
 					<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 %}
 
 				{% endfor %}
 
@@ -63,7 +63,7 @@
 
 		{% if page.c_menulogin == 'True' %}
 
 		{% if page.c_menulogin == 'True' %}
 
 			<div class="navbar-nav dropdown">
 
 			<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>
 
 				<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" style="margin-top: 28px; margin-left: 5px;" aria-labelledby="navbarDropdownMenuLink">
 
+				<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
 
 					{% if not request.user.is_authenticated %}
 
 					{% if not request.user.is_authenticated %}
 
 						<a class="dropdown-item" href="{% url 'core_login' %}" ><i class="fas fa-sign-in-alt"></i> Connexion</a>
 
 						<a class="dropdown-item" href="{% url 'core_login' %}" ><i class="fas fa-sign-in-alt"></i> Connexion</a>
 
 					{% elif request.user.is_authenticated %}
 
 					{% elif request.user.is_authenticated %}
 
@@ -75,6 +75,7 @@
 
 		{% endif %}
 
 		{% endif %}
 
 		</div>
 
 		</div>
 
 		<div class="pos-f-t d-lg-none justify-content-end">
 
 		<div class="pos-f-t d-lg-none justify-content-end">
 
+			<a class="navbar-brand" href="{% url 'core_index' %}"><i class="{{page.c_sitelogo}}"></i> {{page.c_sitename}} </a>d
 
 		<div class="collapse" id="navbarToggleExternalContent">
 
 		<div class="collapse" id="navbarToggleExternalContent">
 
 			<div class="p-3" style="background-color: {{page.c_bgcolor}};">
 
 			<div class="p-3" style="background-color: {{page.c_bgcolor}};">
 
 				{% if page.p_menu_haut %}
 
 				{% if page.p_menu_haut %}
 
@@ -100,7 +101,7 @@
 
 			<span class="navbar-toggler-icon"></span>
 
 			<span class="navbar-toggler-icon"></span>
 
 			 </button>
 
 			 </button>
 
 		</nav>
 
 		</nav>
 
-	</div>
 
+		</div>
 
 	</div>
 
 	</div>
 
 	</nav>
 
 	</nav>
 
 </header>
 
 </header>
 
@@ -109,7 +110,7 @@
 
 	<div class="row p-2">
 
 	<div class="row p-2">
 
 		{% block left_panel %}
 
 		{% block left_panel %}
 
 		{% endblock %}
 
 		{% endblock %}
 
-		<div class="col-lg-9 p-0">
 
+		<div class="col-lg-9 p-lg-1 p-md-0 mb-sm-1">
 
 			{% if messages %}
 
 			{% if messages %}
 
 				<div class="card-body messages p-0 mr-3 ml-3">
 
 				<div class="card-body messages p-0 mr-3 ml-3">
 
 				{% for message in messages %}
 
 				{% for message in messages %}
 
@@ -120,32 +121,49 @@
 
 				{% endfor %}
 
 				{% endfor %}
 
 				</div>
 
 				</div>
 
 			{% endif %}
 
 			{% endif %}
 
-			<div class="card" style="background-color: rgba(250,250,250,0.88);" >
 
+			{% if page.c_card_mp == 'True'%}<div class="card" style="background-color: rgba(250,250,250,0.88);" >
 
 				{% if page.p_see_title_and_des_in_templates == True %}
 
 				{% if page.p_see_title_and_des_in_templates == True %}
 
 				<div class="card-header">
 
 				<div class="card-header">
 
 						<h2>{% block title %}{% if page.p_icone != "" %}<i class="{{page.p_icone}}"></i> {% endif %}{{page.p_titre|safe}}{% endblock %}</h2>
 
 						<h2>{% block title %}{% if page.p_icone != "" %}<i class="{{page.p_icone}}"></i> {% endif %}{{page.p_titre|safe}}{% endblock %}</h2>
 
 				</div>
 
 				</div>
 
 				{% endif %}
 
 				{% endif %}
 
-				{% if page.p_include %}
 
-					{% include page.p_include %}
 
-				{% else %}
 
-					{% block main %}{% endblock %}
 
-				{% endif %}
 
-			</div>
 
+			{% endif %}
 
+			{% if page.p_include %}
 
+				{% include page.p_include %}
 
+			{% else %}
 
+				{% block main %}{% endblock %}
 
+			{% endif %}
 
+			{% if page.c_card_mp != 'None'%}</div>{% endif %}
 
 		</div>
 
 		</div>
 
-		{% if not request.user.is_authenticated or page.p_right %}
 
-		<div class="col-lg-3">
 
-			<div class="card" style="background-color: rgba(250,250,250,0.88);" >
 
+		<div class="col-lg-3 p-lg-1 p-md-0 mb-sm-1">
 
+			{% if page.c_card_rp == 'True'%}<div class="card" style="background-color: rgba(250,250,250,0.88);" >{% endif %}
 
+				{% if page.c_includ_rp != 'None'%}{% include page.c_includ_rp %}{% endif %}
 
 				{% block right_panel %}
 
 				{% block right_panel %}
 
 				{% endblock %}
 
 				{% endblock %}
 
-			</div>
 
+				{% if not request.user.is_authenticated and page.p_right and not "account/" in request.path %}
 
+					<div class="card-body">
 
+						<h5 class="card-title"> Une Pub </h5>
 
+						<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 
+						<!-- Pub-1 -->
 
+						<ins class="adsbygoogle"
 
+							style="display:block"
 
+							data-ad-client="ca-pub-0171697375250839"
 
+							data-ad-slot="9918621322"
 
+							data-ad-format="auto"
 
+							data-full-width-responsive="true">
 
+						</ins>
 
+						<script>
 
+							(adsbygoogle = window.adsbygoogle || []).push({});
 
+						</script>
 
+				{% endif %}
 
+			{% if page.c_card_rp != 'None'%}</div>{% endif %}
 
 		</div>
 
 		</div>
 
-		{% endif %}
 
 	</div>
 
 	</div>
 
 </div>
 
 </div>
 
 </main>
 
 </main>
 
 <footer class="footer mt-auto py-1 text-white" style="background-color: {{page.c_bgcolor}};">
 
 <footer class="footer mt-auto py-1 text-white" style="background-color: {{page.c_bgcolor}};">
 
 	<div class="container">
 
 	<div class="container">
 
+		{{page.c_sitename}} - Jan. 2024
 
 		{% if page.p_menu_pied %}
 
 		{% if page.p_menu_pied %}
 
 		{% for item in 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 %}
 
 			<a class="link-light" href="{{item.p_adresse}}">{{item.p_titre}}</a>{% if not forloop.last %}, {% endif %}
 
@@ -154,9 +172,9 @@
 
 	</div>
 
 	</div>
 
 </footer>
 
 </footer>
 
 {% block modals %}{% endblock %}
 
 {% block modals %}{% endblock %}
 
-<script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
 
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
+<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.min.js" crossorigin="anonymous"></script>
 
+<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
 
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.min.js" integrity="sha384-+sLIOodYLS7CIrQpBjl+C7nPvqq+FbNUBDunl/OZv93DB7Ln/533i8e/mZXLi/P+" crossorigin="anonymous"></script>
 
 {% block script %}
 
 {% block script %}
 
 {% endblock %}
 
 {% endblock %}
 
 </body>
 
 </body>

+ 93 - 70
core/templates/base_no_card.html
View File 

@@ -9,7 +9,7 @@
 
 {% block add_meta_description %}{% endblock %}
 
 {% block add_meta_description %}{% endblock %}
 
 <title>{% if page.p_meta_title %}{{page.p_meta_title}} | {% elif page.p_titre %}{{page.p_titre}} | {% endif %}{{page.c_sitename}}</title>
 
 <title>{% if page.p_meta_title %}{{page.p_meta_title}} | {% elif page.p_titre %}{{page.p_titre}} | {% endif %}{{page.c_sitename}}</title>
 
 <link rel="shortcut icon" href="/static/favicon.ico">
 
 <link rel="shortcut icon" href="/static/favicon.ico">
 
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
 
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
 
 <link href="//fonts.googleapis.com/css2?family=Kufam&display=swap" rel="stylesheet">
 
 <link href="//fonts.googleapis.com/css2?family=Kufam&display=swap" rel="stylesheet">
 
 
 
 <script src="https://kit.fontawesome.com/7cf2a101ac.js"></script>
 
 <script src="https://kit.fontawesome.com/7cf2a101ac.js"></script>
 
@@ -38,61 +38,72 @@
 
 	<header style="color: #fff; font-family: Kufam', cursive;">
 
 	<header style="color: #fff; font-family: Kufam', cursive;">
 
 	<nav class="navbar navbar-expand-lg navbar-dark" style="background-color: {{page.c_bgcolor}};"> 
 	<nav class="navbar navbar-expand-lg navbar-dark" style="background-color: {{page.c_bgcolor}};"> 
 		<div class="container-fluid">
 
 		<div class="container-fluid">
 
-			<a class="navbar-brand" href="{% url 'core_index' %}"><i class="{{page.c_sitelogo}}"></i> {{page.c_sitename}} </a>
 
 		<div class="collapse navbar-collapse" id="navbarSupportedContent">
 
 		<div class="collapse navbar-collapse" id="navbarSupportedContent">
 
+		<a class="navbar-brand" href="{% url 'core_index' %}"><i class="{{page.c_sitelogo}}"></i> {{page.c_sitename}} </a>
 
 		{% if page.p_menu_haut %}
 
 		{% 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>
 
+		<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" 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 %}
 
-			{% endfor %}
 
-			</ul>
 
+			</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 %}
 
+		{% endfor %}
 
+		</ul>
 
+		{% endif %}
 
+		{% if page.c_menulogin == 'True' %}
 
+			<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 not request.user.is_authenticated %}
 
+						<a class="dropdown-item" href="{% url 'core_login' %}" ><i class="fas fa-sign-in-alt"></i> Connexion</a>
 
+					{% elif request.user.is_authenticated %}
 
+						<a class="dropdown-item" href="{% url 'admin:index' %}" ><i class="fas fa-cog" ></i> Admin</a>
 
+						<a class="dropdown-item" href="{% url 'core_logout' %}" ><i class="fas fa-sign-out-alt"></i> Déconnexion</a>
 
+					{% endif %}
 
+				</div>
 
+			</div>
 
 		{% endif %}
 
 		{% endif %}
 
 		</div>
 
 		</div>
 
-		{% if page.p_menu_haut or page.blog_cat %}
 
 		<div class="pos-f-t d-lg-none justify-content-end">
 
 		<div class="pos-f-t d-lg-none justify-content-end">
 
+			<a class="navbar-brand" href="{% url 'core_index' %}"><i class="{{page.c_sitelogo}}"></i> {{page.c_sitename}} </a>
 
 		<div class="collapse" id="navbarToggleExternalContent">
 
 		<div class="collapse" id="navbarToggleExternalContent">
 
-			<div class="collapse" id="navbarToggleExternalContent">
 
-				<div class="p-3" style="background-color: {{page.c_bgcolor}};">
 
-					{% if page.p_menu_haut %}
 
-						<ul class="navbar-nav">
 
-						{% for item in page.p_menu_haut %}
 
-							<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 %}
 
-						{% if page.c_menulogin == 'True' %}
 
-							<hr>
 
-							{% if not request.user.is_authenticated %}
 
-								<li class="nav-item"><a class="nav-link" href="{% url 'core_login' %}" ><i class="fas fa-sign-in-alt"></i> Connexion</a></li>
 
-							{% elif request.user.is_authenticated %}
 
-								<li class="nav-item"><a class="nav-link" href="{% url 'admin:index' %}" ><i class="fas fa-cog" ></i> Admin</a></li>
 
-								<li class="nav-item"><a class="nav-link" href="{% url 'core_logout' %}" ><i class="fas fa-sign-out-alt"></i> Déconexion</a></li>
 
-							{% endif %}
 
+			<div class="p-3" style="background-color: {{page.c_bgcolor}};">
 
+				{% if page.p_menu_haut %}
 
+					<ul class="navbar-nav">
 
+					{% for item in page.p_menu_haut %}
 
+						<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 %}
 
+					{% if page.c_menulogin == 'True' %}
 
+						<hr>
 
+						{% if not request.user.is_authenticated %}
 
+							<li class="nav-item"><a class="nav-link" href="{% url 'core_login' %}" ><i class="fas fa-sign-in-alt"></i> Connexion</a></li>
 
+						{% elif request.user.is_authenticated %}
 
+							<li class="nav-item"><a class="nav-link" href="{% url 'admin:index' %}" ><i class="fas fa-cog" ></i> Admin</a></li>
 
+							<li class="nav-item"><a class="nav-link" href="{% url 'core_logout' %}" ><i class="fas fa-sign-out-alt"></i> Déconnexion</a></li>
 
 						{% endif %}
 
 						{% endif %}
 
-						</ul>
 
 					{% endif %}
 
 					{% endif %}
 
-				</div>
 
+					</ul>
 
+				{% endif %}
 
+			</div>
 
 		</div>
 
 		</div>
 
-		<nav class="navbar navbar-dark justify-content-end" style="background-color: {{page.c_bgcolor}};">
 
+		<nav class="navbar navbar-dark" style="background-color: {{page.c_bgcolor}};">
 
 			<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggleExternalContent" aria-controls="navbarToggleExternalContent" aria-expanded="false" aria-label="Toggle navigation">
 
 			<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggleExternalContent" aria-controls="navbarToggleExternalContent" aria-expanded="false" aria-label="Toggle navigation">
 
 			<span class="navbar-toggler-icon"></span>
 
 			<span class="navbar-toggler-icon"></span>
 
 			 </button>
 
 			 </button>
 
 		</nav>
 
 		</nav>
 
-		{% endif %}
 
-	</div>
 
+		</div>
 
 	</div>
 
 	</div>
 
 	</nav>
 
 	</nav>
 
 </header>
 
 </header>
 
@@ -101,7 +112,7 @@
 
 	<div class="row p-2">
 
 	<div class="row p-2">
 
 		{% block left_panel %}
 
 		{% block left_panel %}
 
 		{% endblock %}
 
 		{% endblock %}
 
-		<div class="col-lg-8 p-lg-1 p-md-0 mb-sm-1">
 
+		<div class="col-lg-9 p-lg-1 p-md-0 mb-sm-1">
 
 			{% if messages %}
 
 			{% if messages %}
 
 				<div class="card-body messages p-0 mr-3 ml-3">
 
 				<div class="card-body messages p-0 mr-3 ml-3">
 
 				{% for message in messages %}
 
 				{% for message in messages %}
 
@@ -112,38 +123,50 @@
 
 				{% endfor %}
 
 				{% endfor %}
 
 				</div>
 
 				</div>
 
 			{% endif %}
 
 			{% endif %}
 
-			{% block main %}{% endblock %}
 
+			{% if page.c_card_mp == 'True'%}<div class="card" style="background-color: rgba(250,250,250,0.88);" >
 
+				{% if page.p_see_title_and_des_in_templates == True %}
 
+				<div class="card-header">
 
+						<h2>{% block title %}{% if page.p_icone != "" %}<i class="{{page.p_icone}}"></i> {% endif %}{{page.p_titre|safe}}{% endblock %}</h2>
 
+				</div>
 
+				{% endif %}
 
+			{% endif %}
 
+			{% if page.p_include %}
 
+				{% include page.p_include %}
 
+			{% else %}
 
+				{% block main %}{% endblock %}
 
+			{% endif %}
 
+			{% if page.c_card_mp != 'None'%}</div>{% endif %}
 
 		</div>
 
 		</div>
 
 		
 		
-		<div class="col-lg-4 p-lg-1 p-md-0">
 
-			<div class="card" style="background-color: rgba(250,250,250,0.88);" >
 
-				{% block right_panel %}
 
-				{% endblock %}
 
-				{% if not request.user.is_authenticated and page.p_right and not "account/" in request.path %}
 
-					<div class="card-body">
 
-						<h5 class="card-title"> Une Pub </h5>
 
-						<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 
-						<!-- Pub-1 -->
 
-						<ins class="adsbygoogle"
 
-							style="display:block"
 
-							data-ad-client="ca-pub-0171697375250839"
 
-							data-ad-slot="9918621322"
 
-							data-ad-format="auto"
 
-							data-full-width-responsive="true">
 
-						</ins>
 
-						<script>
 
-							(adsbygoogle = window.adsbygoogle || []).push({});
 
-						</script>
 
-					</div>
 
-				{% endif %}
 
-			</div>
 
+		<div class="col-lg-3 p-lg-1 p-md-0 mb-sm-1">
 
+			{% if page.c_card_rp == 'True'%}<div class="card" style="background-color: rgba(250,250,250,0.88);" >{% endif %}
 
+			{% if page.c_includ_rp != 'None'%}{% include page.c_includ_rp %}{% endif %}
 
+			{% block right_panel %}
 
+			{% endblock %}
 
+			{% if not request.user.is_authenticated and page.p_right and not "account/" in request.path %}
 
+				<div class="card-body">
 
+					<h5 class="card-title"> Une Pub </h5>
 
+					<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 
+					<!-- Pub-1 -->
 
+					<ins class="adsbygoogle"
 
+						style="display:block"
 
+						data-ad-client="ca-pub-0171697375250839"
 
+						data-ad-slot="9918621322"
 
+						data-ad-format="auto"
 
+						data-full-width-responsive="true">
 
+					</ins>
 
+					<script>
 
+						(adsbygoogle = window.adsbygoogle || []).push({});
 
+					</script>
 
+			{% endif %}
 
+			{% if page.c_card_rp != 'None'%}</div>{% endif %}
 
 		</div>
 
 		</div>
 
 	</div>
 
 	</div>
 
 </div>
 
 </div>
 
 </main>
 
 </main>
 
 <footer class="footer mt-auto py-1 text-white" style="background-color: {{page.c_bgcolor}};">
 
 <footer class="footer mt-auto py-1 text-white" style="background-color: {{page.c_bgcolor}};">
 
 	<div class="container">
 
 	<div class="container">
 
-		Blog.Duhaz.fr - Jan. 2024
 
+		{{page.c_sitename}} - Jan. 2024
 
 		{% if page.p_menu_pied %}
 
 		{% if page.p_menu_pied %}
 
 		{% for item in 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 %}
 
 			<a class="link-light" href="{{item.p_adresse}}">{{item.p_titre}}</a>{% if not forloop.last %}, {% endif %}
 
@@ -152,9 +175,9 @@
 
 	</div>
 
 	</div>
 
 </footer>
 
 </footer>
 
 {% block modals %}{% endblock %}
 
 {% block modals %}{% endblock %}
 
-<script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
 
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
+<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.min.js" crossorigin="anonymous"></script>
 
+<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
 
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.min.js" integrity="sha384-+sLIOodYLS7CIrQpBjl+C7nPvqq+FbNUBDunl/OZv93DB7Ln/533i8e/mZXLi/P+" crossorigin="anonymous"></script>
 
 <script>
 
 <script>
 
 </script>
 
 </script>
 
 {% block script %}
 
 {% block script %}

+ 21 - 0
core/views.py
View File 

@@ -69,6 +69,21 @@ def get_data_value(name):
 
 			data.d_type = "txt"
 
 			data.d_type = "txt"
 
 			data.d_variable = "True"
 
 			data.d_variable = "True"
 
 			data.save()
 
 			data.save()
 
+		elif name == "includ-right-panel":
 
+			data.d_titre = name
 
+			data.d_type = "txt"
 
+			data.d_variable = "None"
 
+			data.save()
 
+		elif name == "card-main-panel":
 
+			data.d_titre = name
 
+			data.d_type = "txt"
 
+			data.d_variable = "True"
 
+			data.save()
 
+		elif name == "card-right-panel":
 
+			data.d_titre = name
 
+			data.d_type = "txt"
 
+			data.d_variable = "True"
 
+			data.save()
 
 		else :
 
 		else :
 
 			data.d_variable = "Blop"
 
 			data.d_variable = "Blop"
 
 	return data.d_variable
 
 	return data.d_variable
 
@@ -96,6 +111,9 @@ def gen_page_base():
 
 	page.c_bgimage = get_data_value('background')
 
 	page.c_bgimage = get_data_value('background')
 
 	page.c_bgimagelogo = get_data_value('background-logo')
 
 	page.c_bgimagelogo = get_data_value('background-logo')
 
 	page.c_menulogin = get_data_value('login-menu')
 
 	page.c_menulogin = get_data_value('login-menu')
 
+	page.c_includ_rp = get_data_value('includ-right-panel')
 
+	page.c_card_mp = get_data_value('card-main-panel')
 
+	page.c_card_rp = get_data_value('card-right-panel')
 
 
 
 	return page
 
 	return page
 
 
 
@@ -119,6 +137,9 @@ def gen_page_sys(p_titre_slugify):
 
 	page.c_bgimage = get_data_value('background')
 
 	page.c_bgimage = get_data_value('background')
 
 	page.c_bgimagelogo = get_data_value('background-logo')
 
 	page.c_bgimagelogo = get_data_value('background-logo')
 
 	page.c_menulogin = get_data_value('login-menu')
 
 	page.c_menulogin = get_data_value('login-menu')
 
+	page.c_includ_rp = get_data_value('includ-right-panel')
 
+	page.c_card_mp = get_data_value('card-main-panel')
 
+	page.c_card_rp = get_data_value('card-right-panel')
 
 	
 	
 	return page
 
 	return page