From 8ba5373f83be1dd1cc56e366c929cbcd2547306b Mon Sep 17 00:00:00 2001
From: chankalan <chankalan@choc0.net>
Date: Thu, 23 Sep 2021 21:29:37 +0200
Subject: [PATCH] =?UTF-8?q?=C3=A9mission=20:=20forum=20d=C3=A9placer=20dan?=
 =?UTF-8?q?s=20le=20bloc=20connex=20+=20correction=20nom/pseudo=20et=20not?=
 =?UTF-8?q?ification=20par=20d=C3=A9faut=20pas=20coch=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 formulaires/forum.html                   | 140 +++++++++++++++++++++++
 lang/comments_fr.php                     |  12 ++
 paquet.xml                               |   1 +
 squelettes/connex/article-emission.html  |  54 +++++----
 squelettes/content/article-emission.html |   7 --
 squelettes/scss/styles/_perso.scss       |  12 +-
 6 files changed, 196 insertions(+), 30 deletions(-)
 create mode 100644 formulaires/forum.html
 create mode 100644 lang/comments_fr.php

diff --git a/formulaires/forum.html b/formulaires/forum.html
new file mode 100644
index 0000000..b488ff4
--- /dev/null
+++ b/formulaires/forum.html
@@ -0,0 +1,140 @@
+<div class="formulaire_spip formulaire_forum ajax" id="formulaire_forum">
+
+	[<p class="reponse_formulaire reponse_formulaire_ok">(#ENV*{message_ok})</p>]
+	[<p class="reponse_formulaire reponse_formulaire_erreur">(#ENV*{message_erreur})</p>]
+
+	[(#ENV{login_forum_abo})
+	<INCLURE{fond=formulaires/inc-login_forum_abo, env} />
+	]
+
+	[(#ENV{editable})
+
+
+	[(#REM)
+	Bloc de previsualisation du forum envoye
+
+	Si on valide la previsu, on n'envoie pas en ajax car, si le post reussit
+	il faudra certainement redessiner toute la page pour afficher le nouveau
+	forum
+
+	][
+	<form action="#ENV{action}#formulaire_forum" method="post" class="preview">
+		<div>
+			[(#ACTION_FORMULAIRE{#ENV{action}})]
+			<input type='hidden' name='titre' value="#ENV{titre}"/>
+			<input type='hidden' name='texte' value="#ENV{texte}"/>
+			<input type='hidden' name='url_site' value="#ENV{url_site}"/>
+			<input type='hidden' name='nom_site' value="#ENV{nom_site}"/>
+			[<input type="hidden" name="id_forum" value="(#ENV*{id_forum})"/>]
+			[<input type="hidden" name="notification" value="(#ENV*{notification})"/>]
+			[(#INCLURE{fond=formulaires/inc-forum_ajouter_mot, ajouter_mot})]
+			(#ENV*{erreurs}|table_valeur{previsu})
+		</div>
+	</form>
+	]
+
+
+	<form action="#ENV{action}#formulaire_forum" method="post" enctype='multipart/form-data'>
+		<div>
+			[(#ACTION_FORMULAIRE{#ENV{action}})]
+			[<input type="hidden" name="id_forum" value="(#ENV*{id_forum})"/>]
+			[
+			<fieldset class="fieldset moderation_info">
+				<legend><:forum:bouton_radio_modere_priori:></legend>
+				<p class="explication">(#ENV{modere})
+					<:comments:moderation_info:>
+				</p>
+			</fieldset>
+			]
+
+			[(#ENV**{afficher_texte}|choixsiegal{'non', ' ',''})
+			[<input type="hidden" name="titre" value="(#ENV{titre})"/>]
+			<p class="spip_bouton"><input type="submit" class="submit" value="<:forum:forum_valider:>"/></p>]
+
+			[(#ENV**{afficher_texte}|choixsiegal{'non', '',' '})
+
+			<INCLURE{fond=formulaires/inc-login_forum}{env} />
+
+			<fieldset class="fieldset fieldset-texte">
+				<legend><:comments:saisie_texte_legend:></legend>
+				<input type="hidden" name="titre" id="titre"[ value="(#ENV{titre})"] />
+				<[(#DIV|sinon{ul})] class="editer-groupe">
+					[(#CONFIG{forums_texte}|!={non}|?{
+					<[(#DIV|sinon{li})] class='editer saisie_texte[ (#ENV**{erreurs}|table_valeur{texte}|oui)erreur] obligatoire'>
+						<label for='texte'><:forum:forum_texte|typo:></label>
+						[<span class='erreur_message'>(#ENV**{erreurs}|table_valeur{texte})</span>]
+						<p class="explication saisie_texte_info">
+							<:comments:saisie_texte_info:>
+						</p>
+						<textarea name="texte" id="texte" rows="12" cols="60"[(#HTML5|oui)
+						required="required"][(#CONFIG{forums_afficher_barre}|=={non}|oui)
+						class="no_barre"]>[(#ENV{texte})]</textarea>
+					</[(#DIV|sinon{li})]>
+					})]
+					[
+					<[(#DIV|sinon{li})] class='saisie_mots_forum'>
+						(#INCLURE{fond=formulaires/inc-forum_bloc_choix_mots}{table=#ENV*{table}}{ajouter_mot})
+					</[(#DIV|sinon{li})]>
+					]
+					[(#PLUGIN{notifications}|oui)
+					#SET{name,notification}#SET{obli,''}#SET{defaut,1}#SET{erreurs,#ENV**{erreurs}|table_valeur{#GET{name}}}
+					<[(#DIV|sinon{li})] class="editer pleine_largeur editer_[(#GET{name})][ (#GET{obli})][ (#GET{erreurs}|oui)erreur]">[
+						<span class='erreur_message'>(#GET{erreurs})</span>
+						]<input type="hidden" name="#GET{name}" value="0" />
+						#SET{val,1}
+						<div class="choix">
+							<input type="checkbox" name="#GET{name}" class="checkbox" id="#GET{name}_#GET{val}" value="#GET{val}" />
+							<label for="#GET{name}_#GET{val}"><:comments:label_notification:></label>
+						</div>
+					</[(#DIV|sinon{li})]>
+					]
+				</[(#DIV|sinon{ul})]>
+			</fieldset>
+
+			[
+			<fieldset class="fieldset fieldset-documents">
+				<legend><:medias:bouton_ajouter_document:></legend>
+				<[(#DIV|sinon{ul})] class="editer-groupe">
+					<[(#DIV|sinon{li})] class='editer saisie_document_forum[ (#ENV**{erreurs}|table_valeur{document_forum}|oui)erreur]'>
+						[<span class='erreur_message'>(#ENV**{erreurs}|table_valeur{document_forum})</span>]
+						<input type="hidden" name="cle_ajouter_document" value="(#ENV{cle_ajouter_document})"/>
+						[
+						<div id="ajouter_document_up">(#ENV{ajouter_document})
+							<label for="supprimer_document_ajoute"><input type='checkbox' name='supprimer_document_ajoute'
+							                                              id='supprimer_document_ajoute'/>
+								<:lien_supprimer:>
+							</label>
+						</div>
+						]
+						<div>
+							[<label for="ajouter_document">(#ENV{formats_documents_forum}|is_array|?{#ENV{formats_documents_forum}|implode{', '},#ENV{formats_documents_forum}})</label>]
+							<input class='file' type="file" name="ajouter_document" id="ajouter_document"[
+							accept="(#ENV{formats_documents_forum}|is_array|?{#ENV{formats_documents_forum}|implode{', '},''})"] />
+						</div>
+
+						<script type='text/javascript'>/*<!\[CDATA\[*/
+						if (window.jQuery) jQuery(function (){
+							jQuery('#ajouter_document_up')
+								.next().hide()
+								.prev().find(':checkbox').bind('change', function (){
+									jQuery('#ajouter_document_up').hide().next().show();
+								});
+						});
+						/*\]\]>*/</script>
+					</[(#DIV|sinon{li})]>
+				</[(#DIV|sinon{ul})]>
+			</fieldset>
+			]
+
+			[(#REM) Piege a robots spammeurs ]
+			<p style="display: none;">
+				<label for="nobot_forum"><:antispam_champ_vide:></label>
+				<input type="text" class="text" name="nobot" id="nobot_forum" value="#ENV{nobot}" size="10"/>
+			</p>
+			<p class="boutons"><input type="submit" class="submit" name="previsualiser_message" value="<:comments:submit1:>"/>[ 
+			(#ENV{forcer_previsu}|=={non}|et{#ENV*{erreurs}|table_valeur{previsu}|non}|oui)<input type="submit" class="submit" name="envoyer_message" value="<:forum:forum_envoyer:>" />]</p>
+			]
+		</div>
+	</form>
+	]
+</div>
diff --git a/lang/comments_fr.php b/lang/comments_fr.php
new file mode 100644
index 0000000..a36f8f3
--- /dev/null
+++ b/lang/comments_fr.php
@@ -0,0 +1,12 @@
+<?php
+// This is a SPIP language file  --  Ceci est un fichier langue de SPIP
+// Fichier source, a modifier dans https://git.spip.net/spip-contrib-extensions/abomailmans.git
+if (!defined('_ECRIRE_INC_VERSION')) {
+	return;
+}
+
+$GLOBALS[$GLOBALS['idx_lang']] = array(
+
+	'label_nom' => 'Nom ou pseudo',
+
+);
diff --git a/paquet.xml b/paquet.xml
index 0128c8b..a812a07 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -15,6 +15,7 @@
 	
 	<necessite nom="cextras" />
 	<necessite nom="notation" />
+	<necessite nom="comments" />
 	
 	<chemin path="squelettes" />
 	<chemin path="squelettes/scss" />
diff --git a/squelettes/connex/article-emission.html b/squelettes/connex/article-emission.html
index aa1de5f..4c3f309 100644
--- a/squelettes/connex/article-emission.html
+++ b/squelettes/connex/article-emission.html
@@ -1,30 +1,40 @@
 <!-- connex -->[(#REM) charger un fichier different pour chaque page ]
 <div class="page_container page_connex__container">
 
-	<div class="page_connex_content flex flex2">
-		<BOUCLE_remissions(RUBRIQUES){composition=emissions}>
-		<B_emissions>
-		<div class="liste articles">
-			<h2><:libreavous:dernieres_emissions:></h2>
-			<ul>
-			<BOUCLE_emissions(ARTICLES){id_rubrique}{!par date}{0,6}>
-				[<li><a href="#URL_ARTICLE">(#TITRE|libreavous_supp_numero)</a></li>]
-			</BOUCLE_emissions>
-			</ul>
-		</div>
-		</B_emissions>
-		</BOUCLE_remissions>
+	<div class="page_connex_content">
+	
+		[<div class="article_forum">
+			[(#REM) Forum de l'article ]
+			<INCLURE{fond=inclure/forum,id_article} />
+			<h2 class="forum-titre"><:libreavous:form_pet_message_commentaire:></h2>
+			(#FORMULAIRE_FORUM)
+		</div>]
 		
-		<B_chroniques>
-		<div class="liste articles chroniques">
-			<h2><:libreavous:dernieres_chroniques:></h2>
-			<ul>
-			<BOUCLE_chroniques(CHAPITRES){type_sujet=CH}{!par maj}{0,6}>
-				[<li><a href="#URL_ARTICLE">(#TITRE)</a></li>]
-			</BOUCLE_chroniques>
-			</ul>
+		<div class="flex flex2">
+			<BOUCLE_remissions(RUBRIQUES){composition=emissions}>
+			<B_emissions>
+			<div class="liste articles">
+				<h2><:libreavous:dernieres_emissions:></h2>
+				<ul>
+				<BOUCLE_emissions(ARTICLES){id_rubrique}{!par date}{0,6}>
+					[<li><a href="#URL_ARTICLE">(#TITRE|libreavous_supp_numero)</a></li>]
+				</BOUCLE_emissions>
+				</ul>
+			</div>
+			</B_emissions>
+			</BOUCLE_remissions>
+			
+			<B_chroniques>
+			<div class="liste articles chroniques">
+				<h2><:libreavous:dernieres_chroniques:></h2>
+				<ul>
+				<BOUCLE_chroniques(CHAPITRES){type_sujet=CH}{!par maj}{0,6}>
+					[<li><a href="#URL_ARTICLE">(#TITRE)</a></li>]
+				</BOUCLE_chroniques>
+				</ul>
+			</div>
+			</B_chroniques>
 		</div>
-		</B_chroniques>
 		
 	</div>
 
diff --git a/squelettes/content/article-emission.html b/squelettes/content/article-emission.html
index 5a6d9a8..711103d 100644
--- a/squelettes/content/article-emission.html
+++ b/squelettes/content/article-emission.html
@@ -158,13 +158,6 @@
 			
 			[<div class="licence" id="licence">(#CONFIG{libreavous/licence}|propre)</div>]
 			
-			
-			[(#REM) Forum de l'article ]
-			<INCLURE{fond=inclure/forum,id_article} />
-			[<h2 class="forum-titre"><:libreavous:form_pet_message_commentaire:></h2>
-			(#FORMULAIRE_FORUM)]
-	
-		
 		</div>
 	</div>
 	
diff --git a/squelettes/scss/styles/_perso.scss b/squelettes/scss/styles/_perso.scss
index 6c2850c..756be65 100644
--- a/squelettes/scss/styles/_perso.scss
+++ b/squelettes/scss/styles/_perso.scss
@@ -664,7 +664,7 @@ a:hover .fab, a:hover .fas {
 }
 .page_connex_content {
 	color:white;
-	h2 {
+	.liste h2 {
 		color:white;
 		font-size:1rem;
 	}
@@ -679,6 +679,16 @@ a:hover .fab, a:hover .fas {
 		border:0;
 	}
 }
+.article_forum {
+	background:white;
+	color:$couleurPrincipale;
+	margin:0 0 ($spacer*4);
+	padding:$spacer ($spacer*4);
+	@include media($bp-medium) {
+		padding:$spacer ($spacer*2);
+	}
+}
+
 /**/
 .page_footer {
 	.article {