From c1524e7ef06297095736fb07c4aa4970f1ac8369 Mon Sep 17 00:00:00 2001
From: Pierre <pierre.lecomte.86@gmail.com>
Date: Thu, 3 Dec 2020 03:41:40 +0100
Subject: [PATCH] =?UTF-8?q?adaptations=20de=20mise=20en=20page=20:=20am?=
 =?UTF-8?q?=C3=A9lioration=20du=20responsive,=20titres,=20adaptation=20du?=
 =?UTF-8?q?=20menu...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/brouillons.html           |  2 +-
 content/editer_article.html       |  4 +--
 content/editer_groupe.html        |  4 +--
 content/presse.html               |  2 +-
 content/sommaire.html             |  7 +++---
 footer/dist.html                  |  5 ----
 inclure/a_la_une_contenu.html     |  2 +-
 inclure/article_contenu_1col.html |  2 +-
 inclure/bloc_article.html         |  6 ++++-
 inclure/choix_ville.html          |  2 +-
 inclure/groupe-detail.html        |  2 +-
 inclure/menu-groupes.html         |  2 +-
 inclure/menu_principal.html       | 42 ++++++++++++++++++++++++++++---
 13 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/content/brouillons.html b/content/brouillons.html
index 6038b7c..d1359f0 100644
--- a/content/brouillons.html
+++ b/content/brouillons.html
@@ -1,6 +1,6 @@
 <section id="brouillons" class="section-top section-bottom container">
 	<div class="cadre-blanc">
-		<h1 class="mb-4">Articles non publiés (brouillons)</h1>
+		<h1 class="h2 mb-4">Articles non publiés (brouillons)</h1>
 			<INCLURE{fond=inclure/brouillons_contenu,env,ajax}>
 	</div>
 </section>
\ No newline at end of file
diff --git a/content/editer_article.html b/content/editer_article.html
index fa6f6df..f67d737 100644
--- a/content/editer_article.html
+++ b/content/editer_article.html
@@ -3,9 +3,9 @@
 <div class="container">
 
 	[(#ENV{id_article}|?{
-		<h1>Éditer un article</h1> 
+		<h1 class="h2 p-3">Éditer un article : <strong>#INFO_TITRE{article,#ENV{id_article}}</strong></h1> 
 		,
-		<h1>Rédiger un article</h1>
+		<h1 class="h2 p-3">Rédiger un article</h1>
 	})]
 
 	[(#SESSION{id_auteur}|oui)
diff --git a/content/editer_groupe.html b/content/editer_groupe.html
index 48aac7f..b447c05 100644
--- a/content/editer_groupe.html
+++ b/content/editer_groupe.html
@@ -3,9 +3,9 @@
 <div class="container">
 
 	[(#ENV{id_article}|?{
-		<h1>Mettre à jour un groupe</h1> 
+		<h1 class="strong h2 p-3">Mettre à jour un groupe : <strong>#INFO_TITRE{article,#ENV{id_article}}</strong></h1> 
 		,
-		<h1>Créer un nouveau groupe</h1>
+		<h1 class="p-3">Créer un nouveau groupe</h1>
 	})]
 
 	[(#SESSION{id_auteur}|oui)
diff --git a/content/presse.html b/content/presse.html
index e044056..4bdd6ac 100644
--- a/content/presse.html
+++ b/content/presse.html
@@ -5,7 +5,7 @@
 
 <section id="methode" class="container section-top section-bottom">
 	<div class="cadre-blanc">
-		<h1>La méthode</h1>
+		<h1>Espace Presse</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 2337c27..00c900a 100644
--- a/content/sommaire.html
+++ b/content/sommaire.html
@@ -8,7 +8,6 @@
 		<div class="mb-3">
 			<BOUCLE_presentation(ARTICLES){grigri=presentation_accueil}{0,1}{! par date}>
 				<article class="cadre-blanc contenu">
-					<h2 class="h1  text-center">Espace collaboratif</h2>
 					<h1 class="text-center ">[(#CHEMIN{images/logo-lfi5.jpg}|image_reduire{500,550}|inserer_attribut{alt,FI05 - #NOM_SITE_SPIP})]</h1>
 					<div class="text-dark #EDIT{texte}">
 						#TEXTE
@@ -17,13 +16,13 @@
 			</BOUCLE_presentation>
 		</div>
 		<div class="row">
-			<div class="col col-lg-9">
-				<div class="dernieres-nouvelles mt-3 p-3">
+			<div class="col-12 col-lg-8 col-xl-9">
+				<div class="dernieres-nouvelles mt-3 mb-3 p-3">
 					<h2 class="a-la-une h3">Derniers articles</h2>
 					<INCLURE{fond=inclure/a_la_une_contenu,env,ajax}>
 				</div>
 			</div>
-			<aside class="col col-lg-3">
+			<aside class="col-12 col-lg-4 col-xl-3">
 				<div id="agenda" class="mt-4 mt-lg-3">
 					<h2 class="h3">Agenda</h2>
 					<BOUCLE_agenda(ARTICLES){titre_mot=agenda}{par rang}>
diff --git a/footer/dist.html b/footer/dist.html
index 10a8702..c89c0da 100644
--- a/footer/dist.html
+++ b/footer/dist.html
@@ -59,11 +59,6 @@
 						<i class="fas fa-users"></i> Gérer les membres
 					</a>
 				</li>
-				<li class="separ">
-					<a class="btn bouton-footer" href="https://docs.google.com/document/d/1rkWzO24syOPHp3q0rox26b66b8bIJzGQi_BKTAowsWM/edit#" title="Mode d'emploi du site" target="_blank">
-						<i class="fas fa-info-circle"></i> Mode d'emploi du site
-					</a>
-				</li>
 				<?php
 			}
 			?>
diff --git a/inclure/a_la_une_contenu.html b/inclure/a_la_une_contenu.html
index 7096d7e..05e0d73 100644
--- a/inclure/a_la_une_contenu.html
+++ b/inclure/a_la_une_contenu.html
@@ -2,7 +2,7 @@
 	<div class="row liste-articles">
 	#ANCRE_PAGINATION
 	<BOUCLE_a_la_une(ARTICLES){id_rubrique=#CONFIG{balint/id_rub_articles}}{!par date}{pagination 3}{!titre_mot=agenda}>
-		<div class="col-lg-4 mt-4 mt-lg-0">
+		<div class="col-12 col-sm-4 mt-4 mt-lg-0">
 			<INCLURE{fond=inclure/bloc_article, env, id_article}/>
 		</div>
 	</BOUCLE_a_la_une>
diff --git a/inclure/article_contenu_1col.html b/inclure/article_contenu_1col.html
index 3dcc68c..6d53ed0 100644
--- a/inclure/article_contenu_1col.html
+++ b/inclure/article_contenu_1col.html
@@ -1,5 +1,5 @@
 <BOUCLE_contenu(ARTICLES){id_article=#ENV{id_article}}>
-	<h2 class="h3 #EDIT{titre}">#TITRE</h2>
+	<h2 class="#EDIT{titre}">#TITRE</h2>
 
 	<?php if (isset($GLOBALS['visiteur_session']['statut']) AND $GLOBALS['visiteur_session']['statut'] == '0minirezo') { ?>
 		<div class="boutons a-droite">
diff --git a/inclure/bloc_article.html b/inclure/bloc_article.html
index 71c117e..2e6b4c2 100644
--- a/inclure/bloc_article.html
+++ b/inclure/bloc_article.html
@@ -10,18 +10,22 @@
 						<h4 class="#EDIT{titre}">#TITRE</h4>
 					</a>
 					<div class="infos-article">
+					[(#REM)
 						[(#REM) pour un événement on affiche Date_Agenda, pour un article la date de publication]
 							[(#ENV{evenement}|=={oui}?{
 								[<strong class="h5 #EDIT{date_agenda}">(#DATE_AGENDA)</strong>],
 								[<span class="#EDIT{date}">(#DATE|affdate)</span>]
 							})]
-						[<strong class="h5 #EDIT{date_agenda}">(#DATE_AGENDA)</strong>]
+					]
+						[<span class="#EDIT{date}">(#DATE|affdate)</span>]
 						[(#ID_GROUPE|oui)<div><a href="[(#URL_PAGE{groupes}|parametre_url{id_article,#ID_GROUPE})]" title="Voir le groupe">
 							par #INFO_TITRE{article,#ID_GROUPE}
 						</a></div>
 						]	
 					</div>
+					[(#REM)
 					[<div class="resume-article #EDIT{descriptif}">(#DESCRIPTIF|sinon{#TEXTE|couper{130,'...'}})</div>]
+					]
 				</div>
 		</div>
 	</div>
diff --git a/inclure/choix_ville.html b/inclure/choix_ville.html
index 83b09f1..d50e240 100644
--- a/inclure/choix_ville.html
+++ b/inclure/choix_ville.html
@@ -1,7 +1,7 @@
 <div class="row liste-articles-encadres">
 	[(#REM) On affiche ensuite les groupes]
 	<BOUCLE_villes(ARTICLES){id_rubrique=#CONFIG{balint/id_rub_groupes}}>
-		<div class="col-sm-6 col-lg-3 mt-4 mt-lg-0">
+		<div class="col-12 col-sm-6 col-xl-3 mt-4 mt-lg-0">
 
 		<INCLURE{fond=inclure/bloc_groupe,env,id_article=#ID_ARTICLE}>
 
diff --git a/inclure/groupe-detail.html b/inclure/groupe-detail.html
index 284523b..31246a8 100644
--- a/inclure/groupe-detail.html
+++ b/inclure/groupe-detail.html
@@ -6,7 +6,7 @@
 			[(#CHEMIN{img/ville.png}|image_recadre{1200:300,-,focus}|image_reduire{1200,300})]
 		<//B_banniere>
 		<div class="ville-titre">
-			<h2>#INFO_TITRE{article,#ENV{id_article}}</h2>
+			<h1>#INFO_TITRE{article,#ENV{id_article}}</h1>
 		</div>
 	</div>
 
diff --git a/inclure/menu-groupes.html b/inclure/menu-groupes.html
index 5f6b599..c7785c1 100644
--- a/inclure/menu-groupes.html
+++ b/inclure/menu-groupes.html
@@ -1,7 +1,7 @@
 <nav id="menu-groupes" class="navbar navbar-expand-lg navbar-dark">
 	<button class="navbar-toggler d-flex d-lg-none collapsed" type="button" data-toggle="collapse" data-target="#liste-groupes" 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 d-lg-none">(#INFO_TITRE{rubrique,#ENV{id_rubrique}})</span>]
+		<span class="navbar-brand d-lg-none">Groupes</span>
 	</button>
 	<div class="collapse navbar-collapse" id="liste-groupes">
 		<ul class="navbar-nav">
diff --git a/inclure/menu_principal.html b/inclure/menu_principal.html
index 0ac9b03..98eb206 100644
--- a/inclure/menu_principal.html
+++ b/inclure/menu_principal.html
@@ -6,9 +6,6 @@
 		</button>
 		<div class="collapse navbar-collapse" id="liste-deroulante">
 			<ul class="navbar-nav ml-auto">
-				<li class="nav-item [(#SI_PAGE{sommaire}|oui) active]">
-				<a class="nav-link" href="[(#URL_PAGE{sommaire})]">Actus</a>
-				</li>
 				<li class="nav-item [(#SI_PAGE{groupes}|oui) active]">
 					<a class="nav-link" href="[(#URL_PAGE{groupes})]">Groupes</a>
 				</li>
@@ -20,9 +17,12 @@
 					</BOUCLE_menu_forums>
 					</div>
 				</li>
+		<?php if (isset($GLOBALS['visiteur_session']['statut']) AND in_array($GLOBALS['visiteur_session']['statut'],array("0minirezo","1comite"))) { ?>
 				<li class="nav-item [(#SI_PAGE{forum_discussion}|oui) active]">
 					<a class="nav-link" href="[(#URL_PAGE{espace_membre}|parametre_url{rub_forum,#CONFIG{balint/id_rub_forum_prive}})]">Espace membres</a>
 				</li>
+		<?php } ?>
+		
 				<li class="nav-item [(#SI_PAGE{charte}|oui) active]">
 					<a class="nav-link" href="[(#URL_PAGE{charte})]">Charte</a>
 				</li>
@@ -32,6 +32,42 @@
 				<li class="nav-item [(#SI_PAGE{nous-contacter}|oui) active]">
 					<a class="nav-link" href="[(#URL_PAGE{nous-contacter})]">Contact</a>
 				</li>
+		<?php if (!isset($GLOBALS['visiteur_session']['id_auteur'])) {	?>
+				<li class="nav-item">
+					<a class="nav-link" href="[(#URL_PAGE{espace_membre})]"><span class="btn bouton-login">Connexion</span></a>
+				</li>
+		<?php } ?>
+		<?php if (isset($GLOBALS['visiteur_session']['id_auteur'])) {	?>
+				<li class="nav-item dropdown">
+					<a class="nav-link dropdown-toggle" href="[(#URL_PAGE{agora})]" id="mediasDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+						<i class="fas fa-star"></i>&nbsp;<?php echo $GLOBALS['visiteur_session']['nom'] ?>
+					</a>
+					<div class="dropdown-menu dropdown-menu-right" aria-labelledby="mediasDropdown">
+						<a class="dropdown-item" href="[(#URL_PAGE{modifier_auteur}|parametre_url{retour,#SELF})]">
+							<i class="fas fa-user"></i> Mon profil
+						</a>
+					<?php if (isset($GLOBALS['visiteur_session']['statut']) AND in_array($GLOBALS['visiteur_session']['statut'],array("0minirezo","1comite"))) { ?>
+						<a class="dropdown-item" href="[(#URL_PAGE{editer_article})]">
+							<i class="fas fa-pencil"></i> Rédiger un article
+						</a>
+						<a class="dropdown-item" href="[(#URL_PAGE{brouillons})]">
+							<i class="fas fa-file"></i> Brouillons
+						</a>
+					<?php } ?>
+					<?php if (isset($GLOBALS['visiteur_session']['statut']) AND in_array($GLOBALS['visiteur_session']['statut'],array("0minirezo"))) { ?>
+						<a class="dropdown-item" href="[(#URL_PAGE{editer_groupe})]">
+							<i class="fas fa-globe"></i> Créer un groupe
+						</a>
+						<a class="dropdown-item" href="[(#URL_PAGE{gerer_auteurs})]">
+							<i class="fas fa-users"></i> Gérer les membres
+						</a>
+					<?php } ?>
+						<a class="dropdown-item" href="[(#URL_LOGOUT{#URL_PAGE{sommaire}})]" rel="nofollow">
+							<i class="fas fa-sign-out"></i> Déconnexion
+						</a>
+					</div>
+				</li>
+		<?php } ?>
 			</ul>
 		</div>
 	</div>