From d74bd8cc1c553ecf2510044fbaacfd8b755a4840 Mon Sep 17 00:00:00 2001
From: Pierre <pierre.lecomte.86@gmail.com>
Date: Fri, 6 Mar 2020 17:49:13 +0100
Subject: [PATCH] =?UTF-8?q?on=20change=20le=20nom=20de=20la=20page=20forum?=
 =?UTF-8?q?=20en=20forum=5Fprive=20pour=20=C3=A9viter=20les=20conflits=20a?=
 =?UTF-8?q?vec=20l'objet=20forum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/article-forum.html  |  2 +-
 content/forum_prive.html    | 48 +++++++++++++++++++++++++++++++++++++
 inclure/menu_principal.html |  2 +-
 paquet.xml                  |  1 +
 4 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 content/forum_prive.html

diff --git a/content/article-forum.html b/content/article-forum.html
index 2b890ad..c6b4ade 100644
--- a/content/article-forum.html
+++ b/content/article-forum.html
@@ -7,7 +7,7 @@
 <div class="cadre-blanc">
 	<h1>Forum</h1>
 
-	<a href="[(#URL_PAGE{forum})]"><i class="fas fa-arrow-circle-left"></i> Retour</a>
+	<a href="[(#URL_PAGE{forum_prive})]"><i class="fas fa-arrow-circle-left"></i> Retour</a>
 
 	<BOUCLE_sujet(ARTICLES){id_article=#ENV{id_article}}>
 
diff --git a/content/forum_prive.html b/content/forum_prive.html
new file mode 100644
index 0000000..995cf52
--- /dev/null
+++ b/content/forum_prive.html
@@ -0,0 +1,48 @@
+<section class="section-top section-bottom container">
+
+	<div class="cadre-blanc">
+	
+	<h1>Forum</h1>
+
+<?php 
+	if (isset($GLOBALS['visiteur_session']['id_auteur']) AND $GLOBALS['visiteur_session']['id_auteur']) {
+?>
+
+	<BOUCLE_intro(ARTICLES){grigri=forum}>
+		<div class="cadre-gris #EDIT{texte}">
+			[(#TEXTE|textebrut)]
+		</div>
+	</BOUCLE_intro>
+
+	<div class="boutons">
+		<a class="btn btn_editer" href="#URL_PAGE{editer_sujet}"><i class="fas fa-edit"></i> Démarrer une nouvelle discussion</a>
+	</div>
+	
+	<INCLURE{fond=inclure/sujets-forum, env, ajax}>
+
+<?php 
+	}
+	else {
+?>
+
+	<div class="row mt-4">
+		<div class="se_connecter bloc_connexion col-lg-5">
+			[(#FORMULAIRE_LOGIN{#SELF})]
+		</div>
+		<div class="ou col-lg-2 text-center"><h2>ou</h2></div>
+		<div class="creer_associer_compte bloc_connexion col-lg-5">
+			[(#FORMULAIRE_INSCRIPTION)]
+		</div>
+	</div>
+
+<?php 
+	}
+?>
+
+</div>
+
+</section>
+
+
+
+	
\ No newline at end of file
diff --git a/inclure/menu_principal.html b/inclure/menu_principal.html
index bc00bf2..588a5ef 100644
--- a/inclure/menu_principal.html
+++ b/inclure/menu_principal.html
@@ -28,7 +28,7 @@
 					if (isset($GLOBALS['visiteur_session']['id_auteur']) AND $GLOBALS['visiteur_session']['id_auteur']) {
 				?>	
 				<li class="nav-item [(#SI_PAGE{forum}|oui) active]">
-					<a class="nav-link" href="[(#URL_PAGE{forum})]">Forum</a>
+					<a class="nav-link" href="[(#URL_PAGE{forum_prive})]">Forum</a>
 				</li>
 				<?php } ?>
 				<li class="nav-item [(#SI_PAGE{nous-contacter}|oui) active]">
diff --git a/paquet.xml b/paquet.xml
index fecc623..a97314c 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -26,6 +26,7 @@
 	<necessite nom="bigform" compatibilite="[1.0.5;]" />
 	<necessite nom="compositions" compatibilite="[3.8.0;]" />
 	<necessite nom="comments" compatibilite="[3.5.0;]" />
+	<utilise nom="urls_pages" compatibilite="[1.0.11;]" />
 
 	<pipeline nom="declarer_champs_extras" inclure="base/balint.php" />
 	<pipeline nom="declarer_tables_principales" inclure="base/balint.php" />