From 7b5263e6cd6d3c7cc9d209486e2d7def9454ec2f Mon Sep 17 00:00:00 2001
From: Pierre <pierre.lecomte.86@gmail.com>
Date: Tue, 1 Dec 2020 00:12:27 +0100
Subject: [PATCH] les pages "Dossiers" et "Agora" se fusionnent en Agora avec
 article et forum

---
 content/agora.html                            | 19 ++++----
 content/dossiers.html                         |  6 ---
 content/forums.html                           | 11 -----
 css/_sq_balint.scss                           | 10 ++---
 css/mon_site.css                              | 22 +++++-----
 inclure/article_contenu_1col.html             | 24 ++++++++++
 ...{article-forum.html => article_forum.html} | 25 ++---------
 inclure/dossiers_contenu.html                 | 17 -------
 inclure/menu-agora.html                       | 15 +++++++
 inclure/menu-forums.html                      | 15 -------
 inclure/page_agora.html                       | 19 ++++++++
 inclure/sidebar_agora.html                    | 44 +++++++++++++++++++
 12 files changed, 130 insertions(+), 97 deletions(-)
 delete mode 100644 content/dossiers.html
 delete mode 100644 content/forums.html
 create mode 100644 inclure/article_contenu_1col.html
 rename inclure/{article-forum.html => article_forum.html} (59%)
 delete mode 100644 inclure/dossiers_contenu.html
 create mode 100644 inclure/menu-agora.html
 delete mode 100644 inclure/menu-forums.html
 create mode 100644 inclure/page_agora.html
 create mode 100644 inclure/sidebar_agora.html

diff --git a/content/agora.html b/content/agora.html
index 21cbc99..4ad2960 100644
--- a/content/agora.html
+++ b/content/agora.html
@@ -1,13 +1,12 @@
-[(#REM) On affiche la première rubrique par défaut]
+[(#REM) On affiche le premier article par défaut]
 
-<section id="espace_membre" class="section-top section-bottom container">
-		
+<BOUCLE_menu_agora(ARTICLES){titre_mot=agora}{0,1}{si #ENV{id_article}|non}{par rang}>
+	[(#ID_ARTICLE|setenv{id_article})]
+</BOUCLE_menu_agora>
+
+<section id="agora" class="container section-top section-bottom">
 	<div class="cadre-blanc">
-		<h1 class="mb-4">Agora</h1>
-	
-		<INCLURE{fond=inclure/forum_discussion,env}/>
-
+		<h1>Agora</h1>
+			<INCLURE{fond=inclure/page_agora,nom=agora,env,ajax}>
 	</div>
-
-</section>
-
+</section>
\ No newline at end of file
diff --git a/content/dossiers.html b/content/dossiers.html
deleted file mode 100644
index e6709df..0000000
--- a/content/dossiers.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<section id="seminaires" class="section-top section-bottom container">
-	<div class="cadre-blanc">
-		<h1 class="mb-4">Dossiers</h1>
-			<INCLURE{fond=inclure/dossiers_contenu,env,ajax}>
-	</div>
-</section>
\ No newline at end of file
diff --git a/content/forums.html b/content/forums.html
deleted file mode 100644
index 6923b1d..0000000
--- a/content/forums.html
+++ /dev/null
@@ -1,11 +0,0 @@
-[(#REM) On affiche le premier article par défaut]
-<BOUCLE_menu_association(ARTICLES){titre_mot=forums}{0,1}{si #ENV{id_article}|non}{par rang}>
-	[(#ID_ARTICLE|setenv{id_article})]
-</BOUCLE_menu_association>
-
-<section id="association" class="container section-top section-bottom">
-	<div class="cadre-blanc">
-		<h1>Forums</h1>
-			<INCLURE{fond=inclure/page_statique,nom=forums,env,ajax}>
-	</div>
-</section>
\ No newline at end of file
diff --git a/css/_sq_balint.scss b/css/_sq_balint.scss
index 5306b0c..6c8df29 100644
--- a/css/_sq_balint.scss
+++ b/css/_sq_balint.scss
@@ -574,10 +574,10 @@ body{
 
 
 /**********************************************************************/
-/************************ PAGE ASSOCIATION ****************************/
+/************************ PAGE STATIQUE ****************************/
 /**********************************************************************/
 
-#menu-association, #menu-methode, #menu-groupes, #menu-medias, #menu-espace_membre{
+#menu-agora, #menu-methode, #menu-groupes, #menu-medias, #menu-espace_membre{
 	background: $couleur-liens;
 	margin: 1rem 0;
 	border-radius: 0.2rem;
@@ -621,7 +621,7 @@ body{
 }
 
 @include media-breakpoint-up(lg) {
-	#menu-groupes, #menu-medias, #menu-espace_membre{
+	#menu-groupes, #menu-agora, #menu-medias, #menu-espace_membre{
 		li:not(:last-of-type){
 			border: none;
 		}
@@ -665,9 +665,9 @@ body{
 .articles-groupe{
 	display: inline-block;
 	padding: 1rem;
-	background: $couleur-liens;
+	background: $gris-clair;
 	border-radius: 0.5rem 0.5rem 0 0;
-	color: white;
+	color: $dark;
 }
 
 
diff --git a/css/mon_site.css b/css/mon_site.css
index 16555da..93b26ad 100644
--- a/css/mon_site.css
+++ b/css/mon_site.css
@@ -12536,36 +12536,36 @@ body {
 }
 
 /**********************************************************************/
-/************************ PAGE ASSOCIATION ****************************/
+/************************ PAGE STATIQUE ****************************/
 /**********************************************************************/
-#menu-association, #menu-methode, #menu-groupes, #menu-medias, #menu-espace_membre {
+#menu-agora, #menu-methode, #menu-groupes, #menu-medias, #menu-espace_membre {
   background: #C84227;
   margin: 1rem 0;
   border-radius: 0.2rem;
   padding: 0;
 }
 
-#menu-association .active a, #menu-methode .active a, #menu-groupes .active a, #menu-medias .active a, #menu-espace_membre .active a {
+#menu-agora .active a, #menu-methode .active a, #menu-groupes .active a, #menu-medias .active a, #menu-espace_membre .active a {
   color: #fff99d;
 }
 
-#menu-association ul, #menu-methode ul, #menu-groupes ul, #menu-medias ul, #menu-espace_membre ul {
+#menu-agora ul, #menu-methode ul, #menu-groupes ul, #menu-medias ul, #menu-espace_membre ul {
   width: 100%;
 }
 
-#menu-association li, #menu-methode li, #menu-groupes li, #menu-medias li, #menu-espace_membre li {
+#menu-agora li, #menu-methode li, #menu-groupes li, #menu-medias li, #menu-espace_membre li {
   padding: 0.5rem;
 }
 
-#menu-association li a, #menu-methode li a, #menu-groupes li a, #menu-medias li a, #menu-espace_membre li a {
+#menu-agora li a, #menu-methode li a, #menu-groupes li a, #menu-medias li a, #menu-espace_membre li a {
   color: white;
 }
 
-#menu-association li:not(:last-of-type), #menu-methode li:not(:last-of-type), #menu-groupes li:not(:last-of-type), #menu-medias li:not(:last-of-type), #menu-espace_membre li:not(:last-of-type) {
+#menu-agora li:not(:last-of-type), #menu-methode li:not(:last-of-type), #menu-groupes li:not(:last-of-type), #menu-medias li:not(:last-of-type), #menu-espace_membre li:not(:last-of-type) {
   border-bottom: solid 1px #f8f9fa;
 }
 
-#menu-association .navbar-toggler, #menu-methode .navbar-toggler, #menu-groupes .navbar-toggler, #menu-medias .navbar-toggler, #menu-espace_membre .navbar-toggler {
+#menu-agora .navbar-toggler, #menu-methode .navbar-toggler, #menu-groupes .navbar-toggler, #menu-medias .navbar-toggler, #menu-espace_membre .navbar-toggler {
   border: none;
   color: white;
   width: 100%;
@@ -12587,7 +12587,7 @@ body {
 }
 
 @media (min-width: 992px) {
-  #menu-groupes li:not(:last-of-type), #menu-medias li:not(:last-of-type), #menu-espace_membre li:not(:last-of-type) {
+  #menu-groupes li:not(:last-of-type), #menu-agora li:not(:last-of-type), #menu-medias li:not(:last-of-type), #menu-espace_membre li:not(:last-of-type) {
     border: none;
   }
 }
@@ -12634,9 +12634,9 @@ body {
 .articles-groupe {
   display: inline-block;
   padding: 1rem;
-  background: #C84227;
+  background: #f2f2f2;
   border-radius: 0.5rem 0.5rem 0 0;
-  color: white;
+  color: #595959;
 }
 
 /**********************************************************************/
diff --git a/inclure/article_contenu_1col.html b/inclure/article_contenu_1col.html
new file mode 100644
index 0000000..e9bd699
--- /dev/null
+++ b/inclure/article_contenu_1col.html
@@ -0,0 +1,24 @@
+<BOUCLE_contenu(ARTICLES){id_article=#ENV{id_article}}>
+	<h2 class="h3 #EDIT{titre}">#TITRE</h2>
+
+	<?php if (isset($GLOBALS['visiteur_session']['statut']) AND $GLOBALS['visiteur_session']['statut'] == '0minirezo') { ?>
+		<div class="boutons a-droite">
+			<a href="[(#URL_PAGE{editer_article}|parametre_url{id_article,#ENV{id_article}})]" class="btn">Éditer</a>
+		</div>
+	<?php } ?>
+
+	<div class="#EDIT{texte}">#TEXTE</div>
+</BOUCLE_contenu>
+
+[(#REM) On affiche les documents à la fin]
+<div class="h4 mt-4">Documents utiles</div>
+<div class="row">
+	<BOUCLE_fichiers(DOCUMENTS){id_article=#ID_ARTICLE}{extension==pdf|doc|docx|odt|xls|xlsx|jpg|jpeg|png|gif|bmp}{tout}>
+			<div class="col-6 col-md-3 fichier text-center">
+				<a href="#FICHIER" [(#EXTENSION|in_array{#LISTE{jpg,jpeg,png,gif,bmp}}|oui) class="mediabox" rel='galerie_#ENV{nom}']>
+					[(#LOGO_DOCUMENT|image_reduire{0,120})]
+				</a>
+				[<div class="#EDIT{titre}">(#TITRE)</div>]
+			</div>
+	</BOUCLE_fichiers>
+</div>
\ No newline at end of file
diff --git a/inclure/article-forum.html b/inclure/article_forum.html
similarity index 59%
rename from inclure/article-forum.html
rename to inclure/article_forum.html
index d81d309..e7f33c7 100644
--- a/inclure/article-forum.html
+++ b/inclure/article_forum.html
@@ -1,27 +1,8 @@
-<a href="[(#URL_PAGE{#ENV{type-page}}|parametre_url{rub_forum,#ENV{rub_forum}})]"><i class="fas fa-arrow-circle-left"></i> Retour</a>
-
 <BOUCLE_sujet(ARTICLES){id_article=#ENV{id_article}}>
 	<div id="sujet-forum" class="sujet-forum">
-		<h2>Forum - #TITRE</h2>
-		<div class="infos-sujet mt-2 font-italic">Démarré par #LESAUTEURS le [(#DATE|date_interface)]</div>
-		<div>[(#TEXTE)]</div>
-
-		<div class="boutons a-droite">
-			<INCLURE{fond=inclure/boutons_modifier_sujet, env, id_article=#ID_ARTICLE}/>
-		</div>
-
-		<B_docs>
-		<div class="liste-documents row mt-3 mb-3">
-			<BOUCLE_docs(DOCUMENTS){id_article}>
-			<div class="col-2 text-center">
-				<a href="#FICHIER">
-					[(#LOGO_DOCUMENT|image_reduire{0,75})]
-					[<div class="titre_img #EDIT{titre}">(#TITRE)</div>]
-				</a>
-			</div>
-			</BOUCLE_docs>
-		</div>
-		</B_docs>	
+		<h2>Forum</h2>
+		<h3>#TITRE</h3>
+		<a href="[(#URL_PAGE{#ENV{type-page}}|parametre_url{id_article,#ENV{id_article}})]"><i class="fas fa-arrow-circle-left"></i> Retour au dossier</a>
 	</div>
 	
 	<BOUCLE_reponses(FORUMS){id_article}{tout}>
diff --git a/inclure/dossiers_contenu.html b/inclure/dossiers_contenu.html
deleted file mode 100644
index ff7a273..0000000
--- a/inclure/dossiers_contenu.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="page-groupes">
-	<B_articles>
-	<div class="row liste-articles-encadres">
-	#ANCRE_PAGINATION
-	<BOUCLE_articles(ARTICLES){titre_mot=dossiers}{par rang}{pagination 6}>
-		<div class="col-lg-4 mt-4 mt-lg-3">
-			<INCLURE{fond=inclure/bloc_article, env, id_article}/>
-		</div>
-	</BOUCLE_articles>
-	</div>
-	[<div class="pagination mt-3">(#PAGINATION{page_precedent_suivant})</div>]
-	</B_articles>
-</div>
-
-
-
-
diff --git a/inclure/menu-agora.html b/inclure/menu-agora.html
new file mode 100644
index 0000000..35098f9
--- /dev/null
+++ b/inclure/menu-agora.html
@@ -0,0 +1,15 @@
+<nav id="menu-agora" 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-agora" aria-controls="liste-deroulante-agora" aria-expanded="false" aria-label="Toggle navigation">
+		<i class="fa fa-angle-down" aria-hidden="true"></i>
+		<span class="navbar-brand d-lg-none">Autres rubriques</span>
+	</button>
+	<div class="collapse navbar-collapse" id="liste-deroulante-agora">
+		<ul class="navbar-nav">
+		<BOUCLE_menu_agora(ARTICLES){titre_mot=agora}{par rang}>
+			<li class="nav-item [(#ENV{id_article}|=={#ID_ARTICLE}|oui) active]">
+				<a class="nav-link ajax" href="[(#URL_PAGE{agora}|parametre_url{id_article,#ID_ARTICLE})]">#TITRE</a>
+			</li>
+		</BOUCLE_menu_agora>
+		</ul>
+	</div>
+</nav>
\ No newline at end of file
diff --git a/inclure/menu-forums.html b/inclure/menu-forums.html
deleted file mode 100644
index 23e1d8d..0000000
--- a/inclure/menu-forums.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<nav id="menu-association" 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-association" aria-controls="liste-deroulante-association" 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-association">
-		<ul class="navbar-nav ml-auto flex-column">
-		<BOUCLE_menu_association(ARTICLES){titre_mot=forums}{par rang}>
-			<li class="nav-item [(#ENV{id_article}|=={#ID_ARTICLE}|oui) active]">
-				<a class="nav-link ajax" href="[(#URL_PAGE{association}|parametre_url{id_article,#ID_ARTICLE})]">#TITRE</a>
-			</li>
-		</BOUCLE_menu_association>
-		</ul>
-	</div>
-</nav>
\ No newline at end of file
diff --git a/inclure/page_agora.html b/inclure/page_agora.html
new file mode 100644
index 0000000..156882d
--- /dev/null
+++ b/inclure/page_agora.html
@@ -0,0 +1,19 @@
+<div>
+	<INCLURE{fond=inclure/menu-#ENV{nom},env}>
+</div>
+
+<div class="row">
+	<div class="col-lg-8 asso-contenu">
+		<BOUCLE_contenu(CONDITION){si #ENV{forum}|oui}>
+		<INCLURE{fond=inclure/article_forum,env}>
+		</BOUCLE_contenu>
+		<INCLURE{fond=inclure/article_contenu_1col,env}>
+		<//B_contenu>
+
+	</div>
+
+	<aside class="col col-lg-4 dernieres-nouvelles">
+		<INCLURE{fond=inclure/sidebar_agora,env} />
+	</aside>
+
+</div>
\ No newline at end of file
diff --git a/inclure/sidebar_agora.html b/inclure/sidebar_agora.html
new file mode 100644
index 0000000..ed523db
--- /dev/null
+++ b/inclure/sidebar_agora.html
@@ -0,0 +1,44 @@
+[(#REM) Rappel : ici #ENV{id_article} correspond à l'id du groupe.]
+
+<div class="bloc-groupe mt-4 mt-lg-0">
+	<BOUCLE_contenu(CONDITION){si #ENV{forum}|non}>
+	
+	<h3>Apportez vos réflexions !</br></h3>
+	<a href="[(#URL_PAGE{agora}|parametre_url{id_article,#ENV{id_article}}|parametre_url{forum,oui})]" class="infos-article ajax" title="Voir le forum">
+		<h4 class='h5 m-0 mb-3'><i class="fas fa-arrow-circle-right"></i> Accès au forum</h4>
+	</a>
+
+	<div class="h4 mt-4">Dernières contributions</div>
+	<div class="liste-articles">
+		<BOUCLE_sujets(FORUMS){id_article=#ENV{id_article}}{!par date}{0,3}{tout}>
+			<div class="mt-4 mt-lg-0 mb-3">
+				<a href="[(#URL_PAGE{agora}|parametre_url{id_article,#ENV{id_article}}|parametre_url{forum,oui})]" class="ajax" title="Voir le forum">
+					#TITRE
+				</a>
+				<div class="infos-article">
+					[(#DATE|date_interface)]
+				</div>
+				<div class="infos-article">
+					par #AUTEUR
+				</div>
+			</div>
+		</BOUCLE_sujets>
+		<div>Il n'y a pas encore d'échanges.</div>
+		<//B_sujets>
+	</div>
+
+	</BOUCLE_contenu>
+	<h3>Documents utiles</h3>
+	<div class="row mb-3">
+	<BOUCLE_fichiers(DOCUMENTS){id_article=#ID_ARTICLE}{extension==pdf|doc|docx|odt|xls|xlsx|jpg|png|gif}{tout}>
+		<div class="col-6 col-md-4 fichier text-center">
+			<a href="#FICHIER" class="">
+				[(#LOGO_DOCUMENT|image_reduire{0,120})]
+			</a>
+			[<div class="#EDIT{titre}">(#TITRE)</div>]
+		</div>
+	</BOUCLE_fichiers>
+	</div>
+	<//B_contenu>
+
+</div>
\ No newline at end of file