From b154b64156219343820eb0f8846952032c3cc21f Mon Sep 17 00:00:00 2001
From: Pierre <pierre.lecomte.86@gmail.com>
Date: Tue, 1 Dec 2020 11:31:15 +0100
Subject: [PATCH] Ajout des pages charte, contact, retouche du sommaire

---
 content/charte.html         |  8 ++++++--
 content/nous-contacter.html | 24 ++++++++++--------------
 content/presse.html         | 11 +++++++++++
 content/sommaire.html       |  4 ----
 inclure/menu-presse.html    | 15 +++++++++++++++
 inclure/menu_principal.html |  3 +++
 6 files changed, 45 insertions(+), 20 deletions(-)
 create mode 100644 content/presse.html
 create mode 100644 inclure/menu-presse.html

diff --git a/content/charte.html b/content/charte.html
index cb0f859..1b15d63 100644
--- a/content/charte.html
+++ b/content/charte.html
@@ -1,6 +1,10 @@
 <section class="container section-top section-bottom">
 	<div class="cadre-blanc">
-		<h1>Charte d'usage</h1>
-		Comment échanger entre nous de manière efficace et agréable.
+		<BOUCLE_presentation(ARTICLES){grigri=charte}{0,1}{! par date}>
+			<h1 class="#EDIT{titre}">#TITRE</h1>
+			<div class="#EDIT{texte}">
+				#TEXTE
+			</div>
+		</BOUCLE_presentation>
 	</div>
 </section>
\ No newline at end of file
diff --git a/content/nous-contacter.html b/content/nous-contacter.html
index 907015d..fa7bc9b 100644
--- a/content/nous-contacter.html
+++ b/content/nous-contacter.html
@@ -1,17 +1,13 @@
-<section class="section-top section-bottom" id="page-contact">
-	<div class="container">
-		<h2 class="h3">Nous contacter</h2>
-		<div class="row">
-			<div class="col-lg-6">
-				<BOUCLE_contact(AUTEURS){id_auteur=#CONFIG{balint/id_contact}}{0,1}{tout}>
-					#FORMULAIRE_NOUS_CONTACTER{#ID_AUTEUR}
-				</BOUCLE_contact>
+<section class="container section-top section-bottom">
+	<div class="cadre-blanc">
+		<BOUCLE_presentation(ARTICLES){grigri=contact}{0,1}{! par date}>
+			<h1 class="#EDIT{titre}">#TITRE</h1>
+			<div class="#EDIT{texte}">
+				#TEXTE
 			</div>
-			<div class="col-lg-6 text-center">
-				<BOUCLE_image_rousseau(DOCUMENTS){credits=nous-contacter}{extension==jpg|png|gif}{statut in prop,prepa,publie}{0,1}>
-					[(#FICHIER|balise_img{Jardin du Luxembourg peint par Henri Rousseau}|image_recadre{510:420,-,focus}|image_reduire{510,420})]				
-				</BOUCLE_image_rousseau>
-			</div>
-		</div>
+		</BOUCLE_presentation>
+		<BOUCLE_contact(AUTEURS){id_auteur=#CONFIG{balint/id_contact}}{0,1}{tout}>
+			#FORMULAIRE_NOUS_CONTACTER{#ID_AUTEUR}
+		</BOUCLE_contact>
 	</div>
 </section>
\ No newline at end of file
diff --git a/content/presse.html b/content/presse.html
new file mode 100644
index 0000000..e044056
--- /dev/null
+++ b/content/presse.html
@@ -0,0 +1,11 @@
+[(#REM) On affiche le premier article par défaut]
+<BOUCLE_menu_methode(ARTICLES){titre_mot=presse}{0,1}{si #ENV{id_article}|non}{par rang}>
+	[(#ID_ARTICLE|setenv{id_article})]
+</BOUCLE_menu_methode>
+
+<section id="methode" class="container section-top section-bottom">
+	<div class="cadre-blanc">
+		<h1>La méthode</h1>
+		<INCLURE{fond=inclure/page_statique,nom=presse,env,ajax}>
+	</div>
+</section>
\ No newline at end of file
diff --git a/content/sommaire.html b/content/sommaire.html
index f7532e9..c5d6a9c 100644
--- a/content/sommaire.html
+++ b/content/sommaire.html
@@ -22,10 +22,6 @@
 					<h2 class="a-la-une h3">Derniers articles</h2>
 					<INCLURE{fond=inclure/a_la_une_contenu,env,ajax}>
 				</div>
-				<div class="dernieres-nouvelles mt-3 p-3">
-					<h2 class="a-la-une h3">Les groupes</h2>
-					<INCLURE{fond=inclure/choix_ville,env} />
-				</div>
 			</div>
 			<aside class="col col-lg-3">
 				<div id="agenda" class="mt-4 mt-lg-3">
diff --git a/inclure/menu-presse.html b/inclure/menu-presse.html
new file mode 100644
index 0000000..677404d
--- /dev/null
+++ b/inclure/menu-presse.html
@@ -0,0 +1,15 @@
+<nav id="menu-methode" class="navbar navbar-expand-lg navbar-dark">
+	<button class="navbar-toggler collapsed d-flex d-lg-none" type="button" data-toggle="collapse" data-target="#liste-deroulante-methode" aria-controls="liste-deroulante-methode" aria-expanded="false" aria-label="Toggle navigation">
+		<i class="fa fa-angle-down" aria-hidden="true"></i>
+		<span class="navbar-brand">Autres rubriques</span>
+	</button>
+	<div class="collapse navbar-collapse" id="liste-deroulante-methode">
+		<ul class="navbar-nav ml-auto flex-column">
+		<BOUCLE_menu_methode(ARTICLES){titre_mot=presse}{par rang}>
+			<li class="nav-item [(#ENV{id_article}|=={#ID_ARTICLE}|oui) active]">
+				<a class="nav-link ajax" href="[(#URL_PAGE{presse}|parametre_url{id_article,#ID_ARTICLE})]">#TITRE</a>
+			</li>
+		</BOUCLE_menu_methode>
+		</ul>
+	</div>
+</nav>
\ No newline at end of file
diff --git a/inclure/menu_principal.html b/inclure/menu_principal.html
index 2ac7442..0ac9b03 100644
--- a/inclure/menu_principal.html
+++ b/inclure/menu_principal.html
@@ -26,6 +26,9 @@
 				<li class="nav-item [(#SI_PAGE{charte}|oui) active]">
 					<a class="nav-link" href="[(#URL_PAGE{charte})]">Charte</a>
 				</li>
+				<li class="nav-item [(#SI_PAGE{presse}|oui) active]">
+					<a class="nav-link" href="[(#URL_PAGE{presse})]">Presse</a>
+				</li>
 				<li class="nav-item [(#SI_PAGE{nous-contacter}|oui) active]">
 					<a class="nav-link" href="[(#URL_PAGE{nous-contacter})]">Contact</a>
 				</li>