diff --git a/design_system_admin/auteur.html b/design_system_admin/auteur.html
new file mode 100644
index 0000000000000000000000000000000000000000..8d0e6957b5f0ae6fcc5f3543eabeaafb09805a9f
--- /dev/null
+++ b/design_system_admin/auteur.html
@@ -0,0 +1,28 @@
+<BOUCLE_afficherpage_auteur(CONDITION){si #CONFIG_VALUE{_masquer_auteur}|==={non}|oui}>
+ <BOUCLE_principale(AUTEURS) {id_auteur}>
+ [(#REM) Ne pas supprimer la ligne ci-dessous home=no si page accueil (sommaire.html) home=no pour les autres pages]
+ <INCLURE{fond=inclure/head, env, home=no, titrepage=Fiche auteur «#NOM» sur ce site, titre=#CONFIG_VALUE{title_onglet_navigateur}, descriptif=Fiche auteur : «#NOM» sur ce site} />
+ <INCLURE{fond=inclure/header, home=no, env} />
+
+ <main id="contenu" role="main" class="fr-pb-6w">
+ <div class="fr-container ">
+ <INCLURE{fond=inclure/fil-ariane, env, title=#TITRE, type=auteur, auteur=#NOM} />
+
+ <div class="fr-callout fr-mt-4w">
+ [(#LOGO_AUTEUR|image_reduire{0,150}|inserer_attribut{class,fr-float-end fr-hidden fr-unhidden-md})]
+ <p class="fr-callout__title">#NOM</p>
+ [<p class="fr-callout__text fr-mt-4w">
+ (#BIO)
+ </p>]
+ </div>
+ #FORMULAIRE_ECRIRE_AUTEUR
+
+
+ </div>
+ </main>
+ <INCLURE{fond=inclure/footer,self=#SELF, env, home=no} />
+ </BOUCLE_principale>
+</BOUCLE_afficherpage_auteur>
+ <meta http-equiv="refresh" content="0;URL=/">
+<//B_afficherpage_auteur>
+
diff --git a/design_system_admin/base/design_system_admin.php b/design_system_admin/base/design_system_admin.php
index c4537fdc2450c4c2239d4e656308a683347686d3..664b73b5af9b4f6e8c902f797241887fab82a5e8 100644
--- a/design_system_admin/base/design_system_admin.php
+++ b/design_system_admin/base/design_system_admin.php
@@ -135,6 +135,14 @@ function design_system_admin_declarer_tables_objets_sql($tables) {
'option_name' => '_home_en_h1',
'option_value' => 'non',
),
+ array(
+ 'option_name' => '_masquer_auteur',
+ 'option_value' => 'oui',
+ ),
+ array(
+ 'option_name' => 'contact_auteur',
+ 'option_value' => 'oui',
+ ),
array(
'option_name' => '_masquer_recherche',
'option_value' => 'non',
diff --git a/design_system_admin/css/plugin-dse.css b/design_system_admin/css/plugin-dse.css
index 04dcfc70bc2bee0ecd0a68e6276df2ee4804389d..d5d6a847b71293f33882ad256ce1ce9ad41a1291 100644
--- a/design_system_admin/css/plugin-dse.css
+++ b/design_system_admin/css/plugin-dse.css
@@ -651,6 +651,36 @@ label.form-control {
background-image: url("/plugins-dist/z-dsfr/dse/dsfr/icons/device/rss-fill.svg");
}
+.formulaire_contacter_auteur input.text, .formulaire_contacter_auteur input.password, .formulaire_contacter_auteur textarea, .formulaire_contacter_auteur select {
+ position: relative;
+ z-index: 2;
+ padding: var(--spip-form-input-padding-y) var(--spip-form-input-padding-x);
+ margin: 0;
+ transition: box-shadow 0.1s;
+ display: block;
+
+ border-radius: 0.25rem 0.25rem 0 0;
+ font-size: 1rem;
+ line-height: 1.5rem;
+ padding: 0.5rem 1rem;
+ color: var(--text-label-grey);
+ background-color: var(--background-contrast-grey);
+ --idle: transparent;
+ --hover: var(--background-contrast-grey-hover);
+ --active: var(--background-contrast-grey-active);
+ box-shadow: inset 0 -2px 0 0 var(--border-plain-grey);
+}
+.formulaire_contacter_auteur .boutons {
+ display: inline;
+ float: right;
+}
+
+.formulaire_contacter_auteur{
+ display: table;
+}
+.display-grid{
+ display: grid;
+}
footer{
clear:both;
diff --git a/design_system_admin/design_system_admin_options.php b/design_system_admin/design_system_admin_options.php
index 2ca88a6adafd01cf28e00587a9ef49daebda5394..c46e92fae0547d02d850bbf8e26acfa3f3b580f8 100644
--- a/design_system_admin/design_system_admin_options.php
+++ b/design_system_admin/design_system_admin_options.php
@@ -30,19 +30,20 @@ define('_MASQUER_LE_SLOGAN', '2');
define('_DRAPEAU_EN_BERNE', '3');
define('_MASQUER_HAUT_DE_PAGE', '4');
define('_HOME_EN_H1', '5');
-define('_MASQUER_RECHERCHE', '6');
-define('_MASQUER_MESSAGE_ALERTE', '7');
-define('_MASQUER_STATISTIQUES', '8');
-define('_MASQUER_LISTE_DE_LIEN', '9');
-define('_MASQUER_MENU', '10');
-define('_MASQUER_PARTENAIRES', '11');
-define('_MASQUER_COOKIES', '12');
-define('_MASQUER_PARAMETRES_AFFICHAGE', '13');
-define('_MASQUER_LISTE_ACCES_RAPIDE', '14');
-define('_MASQUER_LA_NEWSLETTER', '15');
-define('_MASQUER_PARTAGE_RESEAUX_SOCIAUX', '16');
-define('_MASQUER_LOGO_SECONDAIRE', '17');
-define('_MASQUER_LIENS_OBLIGATION_LEGALE', '18');
+define('_MASQUER_AUTEUR', '6');
+define('_MASQUER_RECHERCHE', '7');
+define('_MASQUER_MESSAGE_ALERTE', '8');
+define('_MASQUER_STATISTIQUES', '9');
+define('_MASQUER_LISTE_DE_LIEN', '10');
+define('_MASQUER_MENU', '11');
+define('_MASQUER_PARTENAIRES', '12');
+define('_MASQUER_COOKIES', '13');
+define('_MASQUER_PARAMETRES_AFFICHAGE', '14');
+define('_MASQUER_LISTE_ACCES_RAPIDE', '15');
+define('_MASQUER_LA_NEWSLETTER', '13');
+define('_MASQUER_PARTAGE_RESEAUX_SOCIAUX', '17');
+define('_MASQUER_LOGO_SECONDAIRE', '18');
+define('_MASQUER_LIENS_OBLIGATION_LEGALE', '19');
// futurs composants
//define('_COMPOSANT_18', 'order:18');
//define('_COMPOSANT_19', 'order:19');
diff --git a/design_system_admin/formulaires/aide/aide_masquer_auteur.php b/design_system_admin/formulaires/aide/aide_masquer_auteur.php
new file mode 100644
index 0000000000000000000000000000000000000000..3132f6bbb37273c75264b7cc797d1a07de2f8ae6
--- /dev/null
+++ b/design_system_admin/formulaires/aide/aide_masquer_auteur.php
@@ -0,0 +1,14 @@
+<?php
+ echo '<div class="aide_onglet_navigateur aide_masquer_auteur masquer_auteur_secondaire overlay">
+ <ul>
+ <li><h3>Aide sur le champ "Masquer auteur"</h3></li>
+ <li>Par défaut, SPIP fournit la possibilité d\'afficher le profil de l\'auteur.</li>
+ <li>Nous avons complexifié un peu la fonctionnalité; désormais, vous avez les choix suivants:
+ <ul>
+ <li>- Ne pas mettre en place la fonctionnalité, dans ce cas, quand un utilisateur essaiera d\'accéder à cette page, il sera automatiquement redirigé vers la page d\'accueil.</li>
+ <li>- Vous pouvez aussi autoriser ou non l\'affichage d\'un formulaire de contact à destination de l\'auteur.</li>
+ </ul>
+ </li>
+ </ul>
+ </div>';
+?>
\ No newline at end of file
diff --git a/design_system_admin/formulaires/composants/composant_masquer_auteur.php b/design_system_admin/formulaires/composants/composant_masquer_auteur.php
new file mode 100644
index 0000000000000000000000000000000000000000..df934d34f779fc7a428707166fa3a8c3def80299
--- /dev/null
+++ b/design_system_admin/formulaires/composants/composant_masquer_auteur.php
@@ -0,0 +1,9 @@
+<li class="_masquer_auteur">
+ <div class="editer editer_auteur obligatoire saisie_textarea editer_odd">
+ <label class="editer-label" for="contact_auteur">Contacter l'auteur<span class="obligatoire"> (obligatoire)</span></label>
+ <select name="contact_auteur" id="champ_contact_auteur" required="required">
+ <option value="non">Non</option>
+ <option value="oui">oui</option>
+ </select>
+ </div>
+</li>
\ No newline at end of file
diff --git a/design_system_admin/formulaires/configurer_design_system_admin.html b/design_system_admin/formulaires/configurer_design_system_admin.html
index a4a337234833b181097392a2ebd11d96e0e0b920..af2d1db7e00d0b5ef10558ac4eb3d8713becb530 100644
--- a/design_system_admin/formulaires/configurer_design_system_admin.html
+++ b/design_system_admin/formulaires/configurer_design_system_admin.html
@@ -213,6 +213,33 @@
</li>
</ul>
</li>
+ [(#REM) Autoriser la page auteur]
+ <li class="encadre conf_encadre position[(#VAL{masquer_auteur}|filtre_constante)] aide_masquer_auteur">
+ <ul>
+ <li><button class="questionmark" type="button" data-parent="masquer_auteur">?</button></li>
+ </ul>
+ <ul class="gestion_masquer_auteur masquer_auteur_primaire">
+ <li class="center bold">
+ <label for="masquer_auteur">
+ Masquer la page auteur?
+ </label>
+ </li>
+ <li class="center">
+ #VA_ET_VIENT{'masquer_auteur',#CONFIG_VALUE{_masquer_auteur}}
+ </li>
+ [(#CONFIG_VALUE{_masquer_auteur}|==={non}|oui)
+ <li class="_masquer_auteur">
+ <div class="editer editer_auteur obligatoire saisie_textarea editer_odd">
+ <label class="editer-label" for="contact_auteur">Contacter l'auteur<span class="obligatoire"> (obligatoire)</span></label>
+ <select name="contact_auteur" id="champ_contact_auteur" required="required">
+ <option value="non" [(#CONFIG_VALUE{contact_auteur}|=={non}|oui) selected="selected"]>Non</option>
+ <option value="oui" [(#CONFIG_VALUE{contact_auteur}|=={oui}|oui) selected="selected"]>oui</option>
+ </select>
+ </div>
+ </li>
+ ]
+ </ul>
+ </li>
[(#REM) Masquer le formulaire de recherche]
<li class="encadre conf_encadre position[(#VAL{masquer_recherche}|filtre_constante)] aide_masquer_recherche">
<ul>
diff --git a/design_system_admin/formulaires/configurer_design_system_admin.php b/design_system_admin/formulaires/configurer_design_system_admin.php
index d5e48e84c613d2007d74d0d9d80acea14ec3485c..8bdef2f258ae8902659b9884cd37ba74e59e0bfe 100644
--- a/design_system_admin/formulaires/configurer_design_system_admin.php
+++ b/design_system_admin/formulaires/configurer_design_system_admin.php
@@ -187,6 +187,8 @@ function formulaires_configurer_design_system_admin_traiter_dist($id_dsfrconfigu
'slogan_du_site',
'_drapeau_en_berne',
'_masquer_haut_de_page',
+ '_masquer_auteur',
+ 'contact_auteur',
'_home_en_h1',
'_masquer_recherche',
'_masquer_message_alerte',
diff --git a/design_system_admin/formulaires/ecrire_auteur.html b/design_system_admin/formulaires/ecrire_auteur.html
new file mode 100644
index 0000000000000000000000000000000000000000..d04aa67b9713f6b047ab3e68ff1d92b49415ae50
--- /dev/null
+++ b/design_system_admin/formulaires/ecrire_auteur.html
@@ -0,0 +1,56 @@
+<BOUCLE_autoriser_contact__auteur(CONDITION){si #CONFIG_VALUE{contact_auteur}|==={oui}|oui}>
+ <div class="formulaire_spip formulaire_ecrire_auteur ajax" id="formulaire_ecrire_auteur#ENV{id}">
+ [<p class="reponse_formulaire reponse_formulaire_ok" role="status">(#ENV*{message_ok})</p>]
+ [<p class="reponse_formulaire reponse_formulaire_erreur" role="alert">(#ENV*{message_erreur})</p>]
+ [(#ENV{editable})
+ <div class="formulaire_spip formulaire_contact formulaire_contacter_auteur">
+ <form method="post" action="#ENV{action}#formulaire_ecrire_auteur#ENV{id}">
+ [(#REM) declarer les hidden qui declencheront le service du formulaire parametre : url d'action ]
+ #ACTION_FORMULAIRE
+ [(#REM) Previsualisation... ]
+ [(#ENV*{erreurs}|table_valeur{previsu}|oui)
+ <fieldset class="previsu">
+ <legend><:previsualisation:></legend>
+ <div>
+ <div><strong>#ENV{sujet_message_auteur}</strong> - <em>#ENV{email_message_auteur}</em></div>
+ <div>[(#ENV{texte_message_auteur}|nl2br)]</div>
+ </div>
+ <p class="boutons"><input type="submit" class="fr-btn fr-btn--secondary submit submit" name="confirmer" value="<:form_prop_confirmer_envoi:>" /></p>
+ </fieldset>
+ ]
+ [(#REM) Sinon, formulaire normal ]
+ [(#CONFIG_VALUE{_masquer_auteur}|==={non}|oui)
+ <fieldset>
+ <legend> Contacter cet auteur </legend>
+ <div class="editer-groupe edit-auteur">
+ <div class="editer saisie_email_message_auteur obligatoire[ (#ENV*{erreurs}|table_valeur{email_message_auteur}|oui)erreur] display-grid fr-mb-2w">
+ <label for="email_message_auteur#ENV{id}"><:entree_adresse_email:> <:info_obligatoire_02:></label>
+ [<span class="erreur_message">(#ENV*{erreurs}|table_valeur{email_message_auteur})</span>]
+ <input[ (#HTML5|?{required="required" type="email" class="text email fr_input",type="text" class="text fr_input"})] name="email_message_auteur" id="email_message_auteur#ENV{id}" value="#ENV{email_message_auteur}" size="30" />
+ </div>
+ <div class="editer saisie_sujet_message_auteur obligatoire[ (#ENV*{erreurs}|table_valeur{sujet_message_auteur}|oui)erreur] display-grid fr-mb-2w">
+ <label for="sujet_message_auteur#ENV{id}"><:form_prop_sujet:> <:info_obligatoire_02:></label>
+ [<span class="erreur_message">(#ENV*{erreurs}|table_valeur{sujet_message_auteur})</span>]
+ <input type="text" class="text" name="sujet_message_auteur" id="sujet_message_auteur#ENV{id}" value="#ENV{sujet_message_auteur}" size="30"[(#HTML5) required="required"] />
+ </div>
+ <div class="editer saisie_texte_message_auteur obligatoire[ (#ENV*{erreurs}|table_valeur{texte_message_auteur}|oui)erreur] display-grid">
+ <label for="texte_message_auteur#ENV{id}"><:info_texte_message:> <:info_obligatoire_02:></label>
+ [<span class="erreur_message">(#ENV*{erreurs}|table_valeur{texte_message_auteur})</span>]
+ <textarea name="texte_message_auteur" id="texte_message_auteur#ENV{id}" rows="10" cols="80"[(#HTML5) required="required"]>#ENV{texte_message_auteur}</textarea>
+ </div>
+ </div>
+ ]
+ [(#REM) Piege a robots spammeurs ]
+ [(#CONFIG_VALUE{_masquer_auteur}|==={non}|oui)
+ <p style="display: none;">
+ <label for="nobot"><:antispam_champ_vide:></label>
+ <input type="text" class="text" name="nobot" id="nobot" value="#ENV{nobot}" size="10" />
+ </p>
+ <p class="boutons fr-mt-2w"><input type="submit" class="fr-btn fr-btn--secondary submit" name="valide" value="<:form_prop_envoyer:>" /></p>
+ </fieldset>
+ ]
+ </form>
+ </div>
+ ]
+ </div>
+</BOUCLE_autoriser_contact__auteur>
diff --git a/design_system_admin/formulaires/ecrire_auteur.php b/design_system_admin/formulaires/ecrire_auteur.php
new file mode 100644
index 0000000000000000000000000000000000000000..0d539fc618c72494aff9572ed82fadcc963ba6d4
--- /dev/null
+++ b/design_system_admin/formulaires/ecrire_auteur.php
@@ -0,0 +1,107 @@
+<?php
+
+/***************************************************************************\
+ * SPIP, Système de publication pour l'internet *
+ * *
+ * Copyright © avec tendresse depuis 2001 *
+ * Arnaud Martin, Antoine Pitrou, Philippe Rivière, Emmanuel Saint-James *
+ * *
+ * Ce programme est un logiciel libre distribué sous licence GNU/GPL. *
+\***************************************************************************/
+
+
+if (!defined('_ECRIRE_INC_VERSION')) {
+ return;
+}
+
+function formulaires_ecrire_auteur_charger_dist($id_auteur, $id_article, $mail) {
+ include_spip('inc/texte');
+ $puce = definir_puce();
+ $valeurs = array(
+ 'sujet_message_auteur' => '',
+ 'texte_message_auteur' => '',
+ 'email_message_auteur' => isset($GLOBALS['visiteur_session']['email']) ?
+ $GLOBALS['visiteur_session']['email'] : '',
+ 'nobot' => '',
+ );
+
+ // id du formulaire (pour en avoir plusieurs sur une meme page)
+ $valeurs['id'] = ($id_auteur ? '_' . $id_auteur : '_ar' . $id_article);
+ // passer l'id_auteur au squelette
+ $valeurs['id_auteur'] = $id_auteur;
+ $valeurs['id_article'] = $id_article;
+
+ return $valeurs;
+}
+
+function formulaires_ecrire_auteur_verifier_dist($id_auteur, $id_article, $mail) {
+ $erreurs = array();
+ include_spip('inc/filtres');
+
+ if (!$adres = _request('email_message_auteur')) {
+ $erreurs['email_message_auteur'] = _T('info_obligatoire');
+ } elseif (!email_valide($adres)) {
+ $erreurs['email_message_auteur'] = _T('form_prop_indiquer_email');
+ } else {
+ include_spip('inc/session');
+ session_set('email', $adres);
+ }
+
+ if (!$sujet = _request('sujet_message_auteur')) {
+ $erreurs['sujet_message_auteur'] = _T('info_obligatoire');
+ } elseif (!(strlen($sujet) > 3)) {
+ $erreurs['sujet_message_auteur'] = _T('forum:forum_attention_trois_caracteres');
+ }
+
+ if (!$texte = _request('texte_message_auteur')) {
+ $erreurs['texte_message_auteur'] = _T('info_obligatoire');
+ } elseif (!(strlen($texte) > 10)) {
+ $erreurs['texte_message_auteur'] = _T('forum:forum_attention_dix_caracteres');
+ }
+
+ if (_request('nobot')) {
+ $erreurs['message_erreur'] = _T('pass_rien_a_faire_ici');
+ }
+
+ if (!_request('confirmer') and !count($erreurs)) {
+ $erreurs['previsu'] = ' ';
+ $erreurs['message_erreur'] = '';
+ }
+
+ return $erreurs;
+}
+
+function formulaires_ecrire_auteur_traiter_dist($id_auteur, $id_article, $mail) {
+
+ $adres = _request('email_message_auteur');
+ $sujet = _request('sujet_message_auteur');
+
+ $sujet = '[' . supprimer_tags(extraire_multi($GLOBALS['meta']['nom_site'])) . '] '
+ . _T('info_message_2') . ' '
+ . $sujet;
+ $texte = _request('texte_message_auteur');
+ $texte .= "\n-- $adres";
+
+ $texte .= "\n\n-- " . _T('envoi_via_le_site') . ' '
+ . supprimer_tags(extraire_multi($GLOBALS['meta']['nom_site']))
+ . ' (' . $GLOBALS['meta']['adresse_site'] . "/) --\n";
+ $envoyer_mail = charger_fonction('envoyer_mail', 'inc');
+
+ $corps = array(
+ 'texte' => $texte,
+ 'repondre_a' => $adres,
+ 'headers' => array(
+ "X-Originating-IP: " . $GLOBALS['ip'],
+ ),
+ );
+
+ if ($envoyer_mail($mail, $sujet, $corps)) {
+ $message = _T('form_prop_message_envoye');
+
+ return array('message_ok' => $message);
+ } else {
+ $message = _T('pass_erreur_probleme_technique');
+
+ return array('message_erreur' => $message);
+ }
+}
diff --git a/design_system_admin/inclure/dsfr-spip-js.html b/design_system_admin/inclure/dsfr-spip-js.html
new file mode 100644
index 0000000000000000000000000000000000000000..aefbf77726415efd03dee57d862a5c0a7f93ba62
--- /dev/null
+++ b/design_system_admin/inclure/dsfr-spip-js.html
@@ -0,0 +1,18 @@
+[<script type="module" src="(#CHEMIN{dsfr/dsfr.module.min.js})"></script>]
+[<script type="text/javascript" nomodule src="(#CHEMIN{dsfr/dsfr.nomodule.min.js})"></script>]
+
+<script>
+ document.getElementById('fr-radios-dyslexic-oui').onclick = function(){
+ console.log("OpenDislexic");
+ document.getElementsByTagName('body')[0].classList.add("dyslexic");
+ Cookies.set("daneVersaillesDyslexic", "oui", { expires: 15 });
+
+ }
+
+ document.getElementById('fr-radios-dyslexic-non').onclick = function(){
+ console.log("Marianne");
+ document.getElementsByTagName('body')[0].classList.remove('dyslexic');
+ Cookies.set("daneVersaillesDyslexic", "non", { expires: 15 });
+
+ }
+</script>
diff --git a/design_system_admin/inclure/fil-ariane.html b/design_system_admin/inclure/fil-ariane.html
index 33615928500fc5cb9f6e3ef971bb8b5dd8d2c9e9..7f698122096a80d0c991cb21d6e428ebfbc35360 100644
--- a/design_system_admin/inclure/fil-ariane.html
+++ b/design_system_admin/inclure/fil-ariane.html
@@ -67,6 +67,11 @@
<BOUCLE_test_presence_erreur_500(CONDITION){si #ENV{type}|=={500}|oui}>
<li><a class="fr-breadcrumb__link" aria-current="page">Erreur 500 - Erreur inattendue</a></li>
</BOUCLE_test_presence_erreur_500>
+ <BOUCLE_test_auteur(CONDITION){si #ENV{type}|=={auteur}|oui}>
+ <li><a class="fr-breadcrumb__link" href="#">Auteurs</a>
+ </li>
+ <li><a class="fr-breadcrumb__link" aria-current="page">[(#ENV{auteur}|couper{80})]</a></li>
+ </BOUCLE_test_auteur>
</ol>
diff --git a/design_system_admin/inclure/footer.html b/design_system_admin/inclure/footer.html
index 8a3b7c18e1ab58686eb18b851205cdf7f5d66996..552a2ab27dd98077283496c7c48a7d66784bb106 100644
--- a/design_system_admin/inclure/footer.html
+++ b/design_system_admin/inclure/footer.html
@@ -13,7 +13,7 @@
</div>
<div class="width100">
<form action="">
- <label class="fr-label" for="newsletter-email">
+ <label class="fr-label" for="#CONFIG_VALUE{nom_champ_input_form}">
Votre adresse électronique (ex. : nom@domaine.fr)
</label>
<div class="fr-input-wrap fr-input-wrap--addon">
diff --git a/design_system_admin/mes_options.php b/design_system_admin/mes_options.php
index 8d4e5c9c25cf834f6095deda1aec412303260a3a..9606cd1440dbea128508cf668b4ec7a5179e0971 100644
--- a/design_system_admin/mes_options.php
+++ b/design_system_admin/mes_options.php
@@ -18,19 +18,20 @@ define('_MASQUER_LE_SLOGAN', '2');
define('_DRAPEAU_EN_BERNE', '3');
define('_MASQUER_HAUT_DE_PAGE', '4');
define('_HOME_EN_H1', '5');
-define('_MASQUER_RECHERCHE', '6');
-define('_MASQUER_MESSAGE_ALERTE', '7');
-define('_MASQUER_STATISTIQUES', '8');
-define('_MASQUER_LISTE_DE_LIEN', '9');
-define('_MASQUER_MENU', '10');
-define('_MASQUER_PARTENAIRES', '11');
-define('_MASQUER_COOKIES', '12');
-define('_MASQUER_PARAMETRES_AFFICHAGE', '13');
-define('_MASQUER_LISTE_ACCES_RAPIDE', '14');
-define('_MASQUER_LA_NEWSLETTER', '15');
-define('_MASQUER_PARTAGE_RESEAUX_SOCIAUX', '16');
-define('_MASQUER_LOGO_SECONDAIRE', '17');
-define('_MASQUER_LIENS_OBLIGATION_LEGALE', '18');
+define('_MASQUER_AUTEUR', '6');
+define('_MASQUER_RECHERCHE', '7');
+define('_MASQUER_MESSAGE_ALERTE', '8');
+define('_MASQUER_STATISTIQUES', '9');
+define('_MASQUER_LISTE_DE_LIEN', '10');
+define('_MASQUER_MENU', '11');
+define('_MASQUER_PARTENAIRES', '12');
+define('_MASQUER_COOKIES', '13');
+define('_MASQUER_PARAMETRES_AFFICHAGE', '14');
+define('_MASQUER_LISTE_ACCES_RAPIDE', '15');
+define('_MASQUER_LA_NEWSLETTER', '16');
+define('_MASQUER_PARTAGE_RESEAUX_SOCIAUX', '17');
+define('_MASQUER_LOGO_SECONDAIRE', '18');
+define('_MASQUER_LIENS_OBLIGATION_LEGALE', '19');
// futurs composants
//define('_COMPOSANT_18', 'order:18');
//define('_COMPOSANT_19', 'order:19');
diff --git a/design_system_admin/paquet.xml b/design_system_admin/paquet.xml
index fc2136e2e1cfa920ee6c281ef0097bc53f1a8c04..63280c93603a27866b8b9dc1c89ce3575b733c74 100644
--- a/design_system_admin/paquet.xml
+++ b/design_system_admin/paquet.xml
@@ -36,7 +36,7 @@
<pipeline nom="declarer_tables_interfaces" inclure="base/design_system_admin.php" />
<menu nom="dsfrconfiguration_creer" titre="dsfrconfiguration:icone_creer_dsfrconfiguration" parent="outils_rapides" icone="images/dsfrconfiguration-new-16.png" action="configurer_design_system_admin" parametres="new=oui" />
- <menu nom="menu_documentation" titre="dsfrconfiguration:icone_menu_dsfrconfiguration" icone="images/plugin-xx.svg" action="navigation" parametres="menu=menu_documentation"/>
+ <menu nom="menu_documentation" titre="dsfrconfiguration:icone_menu_dsfrconfiguration" icone="images/spip-dsfr.svg" action="navigation" parametres="menu=menu_documentation"/>
<!--menu nom="dsfr_doc" titre="dsfrconfiguration:icone_voir_documentation_dsfr" parent="menu_documentation" icone="images/dsfrconfiguration-new-16.png" action="dsfr_doc" parametres="new=oui" /-->
<menu nom="dsfrconfiguration_creer2" titre="dsfrconfiguration:icone_creer_dsfrconfiguration" parent="menu_documentation" icone="images/config-xx.svg" action="configurer_design_system_admin" parametres="new=oui" />
<menu nom="dsfr_wiki" titre="dsfrconfiguration:icone_consulter_wiki" parent="menu_documentation" icone="images/gitlab_wiki_logo.svg" action="https://gitlab-forge.din.developpement-durable.gouv.fr/pub/cgdd-public/dsfr/spip/design-system-admin/-/wikis/Bienvenue-sur-le-wiki-de-notre-projet-DSFR-avec-le-CMS-SPIP"/>
diff --git a/design_system_admin/prive/css/dsfrconfiguration.css b/design_system_admin/prive/css/dsfrconfiguration.css
index 3487856014943e3582404e3868991b2247c057e5..30f2d52c52875955ae21a133896efd53a932f0b4 100644
--- a/design_system_admin/prive/css/dsfrconfiguration.css
+++ b/design_system_admin/prive/css/dsfrconfiguration.css
@@ -315,7 +315,16 @@ ul.form_special_numeric {
.position18 { order: 18; }
.position19 { order: 19; }
.position20 { order: 20; }
-
+.position21 { order: 18; }
+.position22 { order: 19; }
+.position23 { order: 20; }
+.position24 { order: 18; }
+.position25 { order: 19; }
+.position26 { order: 20; }
+.position27 { order: 18; }
+.position28 { order: 19; }
+.position29 { order: 20; }
+.position99 { order: 99; }
/*.gestion_masquer_liste_acces_rapide{
display: grid;
}*/
diff --git a/design_system_admin/prive/javascript/dsfrconfiguration.js b/design_system_admin/prive/javascript/dsfrconfiguration.js
index 214fa21c04aa05cb8dbe70e61c244068c7f2b276..7dc053136351e94a14c942d1e3c06c16134fe65e 100644
--- a/design_system_admin/prive/javascript/dsfrconfiguration.js
+++ b/design_system_admin/prive/javascript/dsfrconfiguration.js
@@ -66,6 +66,7 @@ jQuery(document).ready(function($) {
assurerAttributData('data-gestion', 'masquer_menu', 'true');
assurerAttributData('data-gestion', 'masquer_liste_de_lien', 'true');
assurerAttributData('data-gestion', 'masquer_liens_obligation_legale', 'true');
+ assurerAttributData('data-gestion', 'masquer_auteur', 'true');
assurerAttributData('data-required', 'lien_dacces_rapide1', 'non');
assurerAttributData('data-required', 'lien_dacces_rapide2', 'non');
@@ -86,6 +87,7 @@ jQuery(document).ready(function($) {
assurerAttributData('data-parent', 'type_formulaire_newsletter', 'masquer_la_newsletter');
assurerAttributData('data-parent', 'message_alerte', 'masquer_message_alerte');
+ assurerAttributData('data-parent', 'contact_auteur', 'masquer_auteur');
assurerAttributData('data-parent', 'script_statistiques', 'masquer_statistiques');
assurerAttributData('data-parent', 'liste_des_cookies', 'masquer_cookies');
assurerAttributData('data-parent', 'texte_cookies', 'masquer_cookies');
diff --git a/design_system_admin/prive/themes/spip/images/spip-dsfr.svg b/design_system_admin/prive/themes/spip/images/spip-dsfr.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a49961d694cf2dcdc4de2540d31dbebd5ddc4372
--- /dev/null
+++ b/design_system_admin/prive/themes/spip/images/spip-dsfr.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
+ <g id="wordpress-logo.svg" transform="matrix(0.419594,0,0,0.419594,256,187.504)">
+ <g transform="matrix(1,0,0,1,-400,-400)">
+ <clipPath id="_clip1">
+ <rect x="0" y="0" width="800" height="800"/>
+ </clipPath>
+ <g clip-path="url(#_clip1)">
+ <g>
+ <path d="M400.017,0C179.443,0 0.008,179.426 0.008,399.983C0.008,620.557 179.451,800 400.008,800C620.557,800 799.983,620.557 799.983,399.983C799.992,179.435 620.565,0 400.017,0ZM40.374,399.983C40.374,347.855 51.554,298.346 71.513,253.633L243.067,723.658C123.109,665.353 40.374,542.336 40.374,399.983ZM400.017,759.643C364.713,759.643 330.64,754.464 298.421,744.988L406.318,431.446L516.883,734.298C517.598,736.085 518.47,737.714 519.443,739.252C482.062,752.402 441.895,759.643 400.017,759.643ZM449.568,231.372C471.214,230.233 490.74,227.947 490.74,227.947C510.108,225.653 507.839,197.182 488.437,198.321C488.437,198.321 430.191,202.884 392.577,202.884C357.249,202.884 297.847,198.321 297.847,198.321C278.462,197.182 276.201,226.808 295.578,227.947C295.578,227.947 313.932,230.233 333.292,231.372L389.318,384.896L310.615,620.931L179.676,231.38C201.355,230.249 220.84,227.955 220.84,227.955C240.208,225.669 237.922,197.182 218.529,198.346C218.529,198.346 160.308,202.909 122.685,202.909C115.927,202.909 107.972,202.735 99.543,202.477C163.832,104.83 274.381,40.366 400.017,40.366C493.658,40.366 578.894,76.16 642.868,134.771C641.313,134.688 639.809,134.48 638.196,134.48C602.884,134.48 577.814,165.254 577.814,198.313C577.814,227.938 594.896,253.026 613.126,282.652C626.816,306.608 642.776,337.39 642.776,381.837C642.776,412.627 630.956,448.337 615.403,498.096L579.534,617.972L449.568,231.372ZM580.806,710.856L690.657,393.25C711.197,341.953 718.005,300.931 718.005,264.431C718.005,251.205 717.14,238.911 715.578,227.448C743.674,278.678 759.659,337.473 759.643,400C759.634,532.668 687.714,648.512 580.806,710.856Z" style="fill:rgb(59,59,59);fill-rule:nonzero;"/>
+ </g>
+ </g>
+ </g>
+ </g>
+ <g transform="matrix(1,0,0,1,-67.9913,347.675)">
+ <g transform="matrix(144,0,0,144,137.871,136.991)">
+ <path d="M0.103,-0L0.378,-0C0.6,-0 0.75,-0.161 0.75,-0.35C0.75,-0.539 0.6,-0.7 0.378,-0.7L0.103,-0.7L0.103,-0ZM0.38,-0.571C0.51,-0.571 0.604,-0.475 0.604,-0.35C0.604,-0.226 0.51,-0.129 0.38,-0.129L0.245,-0.129L0.245,-0.571L0.38,-0.571Z" style="fill:rgb(0,0,145);fill-rule:nonzero;"/>
+ </g>
+ <g transform="matrix(144,0,0,144,250.911,136.991)">
+ <path d="M0.04,-0.097C0.102,-0.023 0.182,0.02 0.3,0.02C0.428,0.02 0.53,-0.06 0.532,-0.19C0.532,-0.427 0.212,-0.398 0.212,-0.523C0.212,-0.564 0.244,-0.596 0.293,-0.596C0.346,-0.596 0.392,-0.562 0.433,-0.509L0.537,-0.602C0.478,-0.673 0.397,-0.72 0.292,-0.72C0.159,-0.72 0.068,-0.628 0.068,-0.517C0.068,-0.284 0.388,-0.312 0.388,-0.187C0.388,-0.136 0.354,-0.106 0.298,-0.106C0.241,-0.106 0.185,-0.138 0.143,-0.192L0.04,-0.097Z" style="fill:rgb(0,0,145);fill-rule:nonzero;"/>
+ </g>
+ <g transform="matrix(144,0,0,144,335.583,136.991)">
+ <path d="M0.103,-0L0.245,-0L0.245,-0.296L0.471,-0.296L0.471,-0.417L0.245,-0.417L0.245,-0.579L0.511,-0.579L0.511,-0.7L0.103,-0.7L0.103,-0Z" style="fill:rgb(0,0,145);fill-rule:nonzero;"/>
+ </g>
+ <g transform="matrix(144,0,0,144,413.775,136.991)">
+ <path d="M0.103,-0L0.245,-0L0.245,-0.283L0.318,-0.283L0.504,-0L0.674,-0L0.454,-0.31C0.525,-0.344 0.566,-0.407 0.566,-0.491C0.566,-0.621 0.471,-0.7 0.317,-0.7L0.103,-0.7L0.103,-0ZM0.325,-0.579C0.385,-0.579 0.42,-0.546 0.42,-0.493C0.42,-0.436 0.385,-0.404 0.325,-0.404L0.245,-0.404L0.245,-0.579L0.325,-0.579Z" style="fill:rgb(0,0,145);fill-rule:nonzero;"/>
+ </g>
+ </g>
+ <g id="favicon-inverse.svg" transform="matrix(0.597213,0,0,0.597213,256,186.671)">
+ <g transform="matrix(1,0,0,1,-297.35,-297.5)">
+ <clipPath id="_clip2">
+ <rect x="0" y="0" width="594.7" height="595"/>
+ </clipPath>
+ <g clip-path="url(#_clip2)">
+ <g transform="matrix(1,0,0,1,0,-123.3)">
+ <g>
+ <path d="M423.5,300.1C397,192.1 287.8,126 179.7,152.5C169.6,154.9 160.1,158.2 150.8,162C108,186.4 71.4,221.2 45.2,263.2C26.4,303.4 20.8,350.1 32.1,396.5C67.8,541.5 204.1,565.9 278.2,602.8C294,610.5 306.5,624.5 310.9,642.7C318.9,674.8 299,707.6 266.8,715.3L266.2,715.3C265,715.6 263.8,715.9 263.2,715.9C262.9,715.9 262.6,715.9 262.6,716.2C273.9,717.7 285.8,718.3 297.4,718.3C317,718.3 336.4,716.5 355.1,712.6L355.7,712.6C387.2,689.7 403.6,649.5 393.8,609.3L393.8,608.7C367.3,502.7 257.2,514.1 239.6,442.6C227.1,392 261,353.3 311.6,340.8C341.7,333.4 371.7,341.4 393.7,359.3C397,362 400.8,365.3 404.7,369.7C404.7,370 405,370 405,370.3L405.3,370.6C405.9,371.5 406.8,372.1 407.4,373C408,373.6 408.3,374.2 408.9,374.8C409.5,375.4 409.8,376 410.4,376.9L410.7,377.2C415.2,383.2 418.1,387.6 422,386.7C425.3,385.8 427.4,378.1 428.3,372.7C431,349.2 429.5,324.5 423.5,300.1Z" style="fill:rgb(231,37,111);fill-rule:nonzero;"/>
+ </g>
+ </g>
+ <g transform="matrix(1,0,0,1,0,-123.3)">
+ <g>
+ <path d="M311,642.7C306.5,624.2 294,610.6 278.3,602.8C204.2,565.9 67.9,541.8 32.2,396.5C20.9,350.1 26.5,303.3 45.3,263.2C36.4,277.5 28.6,292.7 22.1,308.4C21.5,309.9 20.9,311.7 20.3,313.2C19.1,316.2 17.9,319.5 16.7,322.7C16.1,324.2 15.5,326 14.9,327.5C13.7,330.8 12.8,334 11.9,337.3C11.3,339.1 11,340.6 10.4,342.4C9.8,344.2 9.5,345.7 8.9,347.5C8,350.8 7.4,354.3 6.5,357.6C6.2,359.4 5.9,360.9 5.3,362.7C5,364.5 4.7,366 4.4,367.8C4.1,368.7 4.1,369.9 3.8,370.8C3.5,372 3.5,372.9 3.2,374.1C3.2,375 2.9,375.9 2.9,376.8C2.9,378.3 2.9,379.5 2.6,380.7C2.3,382.5 2,384.3 2,386.1C1.7,387.6 1.7,389.1 1.4,390.9C1.1,393 1.1,395.4 0.8,397.4C0.5,400.1 0.5,402.5 0.2,405.1C0.2,406.6 -0.1,408.1 -0.1,409.9L-0.1,432.6C-0.1,433.8 -0.1,435 0.2,436.2L0.2,438.3C0.2,440.1 0.5,441.6 0.5,443.4C0.5,444 0.5,444.9 0.8,445.5C1.1,447.6 1.1,449.7 1.4,451.8C1.7,453.9 2,456 2,458.3C2,459.2 2.3,460.1 2.3,461.3C2.6,462.8 2.6,464 2.9,465.5C3.2,467 3.2,468.5 3.5,470C3.5,470.6 3.5,471.2 3.8,471.5C4.1,473 4.4,474.5 4.7,476C5,477.2 5,478.4 5.3,479.6C5.6,480.8 5.9,482 5.9,483.2C6.2,484.1 6.2,485.3 6.5,486.2C6.8,487.7 7.1,488.9 7.4,490.4C8,492.5 8.3,494.3 8.9,496.4C9.5,498.2 9.8,499.7 10.4,501.5C13.4,512.2 16.9,522.6 20.8,532.8C21.4,534.3 22,535.8 22.6,537.3C23.5,539.1 24.1,541.2 25,543C25.9,544.8 26.5,546.6 27.4,548.1C27.4,548.4 27.7,548.7 27.7,548.7C28.3,550.2 29.2,551.7 29.8,552.9C30.1,553.8 30.7,554.7 31.3,555.6C31.9,556.8 32.5,558 33.4,559.5C34.3,561.3 35.2,563.1 36.1,564.9C36.7,566.4 37.6,567.6 38.5,569.1C38.8,569.7 39.4,570.3 39.7,571.2C40.3,572.1 40.9,573.3 41.5,574.2C42.1,575.4 43,576.9 43.9,578.1C45.1,579.9 46.3,582 47.5,583.8C48.7,585.6 49.9,587.4 51.1,589.5C55,595.2 58.8,600.5 62.7,605.6C64.2,607.4 65.4,609.2 66.9,610.7C68.1,611.9 69,613.4 70.2,614.6C72,616.7 73.8,618.8 75.6,620.9C77.1,622.4 78.6,624.2 80.1,625.7C81.6,627.2 83.1,629 84.6,630.5C103.1,649.5 124.2,665.9 147.1,679.3C181.6,699.5 220.6,712.9 262.3,718C262.6,718 262.9,718 263.2,717.7C263.8,717.4 265,717.4 266.2,717.1L266.8,717.1C299.1,707.3 319.1,674.8 311,642.7Z" style="fill:white;fill-rule:nonzero;"/>
+ </g>
+ </g>
+ <g transform="matrix(1,0,0,1,0,-123.3)">
+ <g>
+ <path d="M297.6,123.3L287.5,123.3C285.7,123.3 283.9,123.3 282.1,123.6C280,123.6 277.9,123.9 275.8,123.9C275.2,123.9 274.6,123.9 274,124.2C271.6,124.5 269.5,124.5 267.2,124.8C265.4,125.1 263.9,125.1 262.1,125.4C260.9,125.4 259.7,125.7 258.2,126C256.7,126.3 254.9,126.3 253.4,126.6C251.9,126.9 250.1,127.2 248.6,127.5C245.3,128.1 242.3,128.7 239.1,129.3C237.6,129.6 235.8,129.9 234.3,130.2C232.5,130.5 230.7,131.1 228.6,131.4C226.8,131.7 225.3,132.3 223.5,132.6C222.9,132.6 222.3,132.9 221.7,133.2C218.7,134.1 215.7,134.7 212.8,135.6C212.5,135.6 211.9,135.9 211.3,135.9C208.6,136.8 206.2,137.4 203.6,138.3C203.3,138.3 203,138.3 203,138.6C201.2,139.2 199.1,139.8 197.3,140.7C197,140.7 196.4,141 196.1,141C195.2,141.3 194.6,141.6 193.7,141.9L193.4,141.9C191.6,142.8 190.1,143.4 188.3,144.3C188,144.3 188,144.3 187.7,144.6C187.1,144.9 186.8,144.9 186.2,145.2C184.1,146.1 182,147 179.9,147.9C177.5,148.8 175.4,150 173.1,150.9C172.8,150.9 172.5,151.2 172.5,151.2C172.2,151.2 171.9,151.5 171.6,151.5C170.4,152.1 168.9,152.7 167.7,153.3C165.9,154.2 164.4,154.8 162.6,155.7C161.1,156.3 159.6,157.2 158.1,158.1C157.8,158.4 157.5,158.4 156.9,158.7C154.5,159.9 152.4,161.1 150.4,162.3C159.6,158.4 169.2,155.2 179.3,152.8C287.3,126.3 396.6,192.1 423.1,300.1C429.1,324.5 430.2,349.2 427.6,372.7C426.7,378.4 424.6,386.1 421.3,386.7C417.4,387.6 414.5,383.4 410,377.2L409.7,376.9C409.1,376.3 408.8,375.7 408.2,374.8C407.6,374.2 407.3,373.6 406.7,373C406.1,372.1 405.5,371.5 404.6,370.6L404.3,370.3C404.3,370 404,370 404,369.7C400.1,365.2 396.6,361.7 393,359.3C371,341.1 340.9,333.4 310.9,340.8C260.3,353.3 226.7,392 238.9,442.6C256.5,514 366.6,502.7 393.1,608.7L393.1,609.3C393.1,609.6 393.1,609.3 393.1,609.3C402.9,649.5 386.6,690 354.7,712.6C359.5,711.7 364.2,710.5 369,709.3C371.4,708.7 373.8,708.1 376.1,707.5C380.9,706.3 385.3,704.8 390.1,703.3C396.9,700.9 403.8,698.5 410.3,695.9C418,692.6 425.8,689.1 433.5,685.2C439.2,682.2 444.8,679.2 450.2,676C452,674.8 453.8,673.9 455.6,672.7L466.4,665.5C468.2,664.3 470,663.1 471.5,661.9C473.3,660.7 474.8,659.5 476.6,658.3L476.9,658C478.4,656.8 480.2,655.6 481.7,654.4C485,651.7 488.2,649 491.5,646.4C493,644.9 494.8,643.7 496.3,642.2C497.8,640.7 499.3,639.5 501.1,638C502.6,636.5 504.1,635.3 505.6,633.8C505.6,633.8 505.9,633.8 505.9,633.5L514.9,624.5C519.1,620 523.2,615.3 527.4,610.5C528.9,609 530.1,607.2 531.3,605.7C532.2,604.5 533.1,603.6 534,602.4C534.9,601.5 535.5,600.3 536.4,599.4C537.6,597.9 538.5,596.7 539.4,595.2C540.3,593.7 541.5,592.5 542.4,591C542.7,590.4 543,589.8 543.6,589.5C544.5,588 545.4,586.8 546.3,585.3C547.5,583.5 548.7,581.7 549.9,579.9C555,571.9 559.7,563.5 564.2,554.9C565.1,553.4 565.7,551.9 566.6,550.4C567.2,548.9 568.1,547.1 568.7,545.6C569.3,544.1 570.2,542.6 570.8,541.1C571.4,539.3 572.3,537.8 572.9,536C573.8,533.6 574.7,531.5 575.6,529.2L575.6,528.9C576.5,526.8 577.4,524.7 578,522.4C578.6,520.3 579.5,518.5 580.1,516.4C580.4,515.5 580.7,514.6 581,513.4C581.6,511.9 582.2,510.1 582.5,508.3C583.1,506.5 583.4,505 584,503.2C584.6,501.7 584.9,500.2 585.2,498.7C585.2,498.1 585.5,497.8 585.5,497.2C585.8,495.7 586.4,494.5 586.7,493C587,492.1 587.3,490.9 587.3,490C587.6,488.5 587.9,487 588.2,485.5C589.1,481.3 590,477.2 590.9,472.7C591.2,471.2 591.5,469.7 591.5,468.2C591.8,466.4 592.1,464.6 592.4,462.8C592.7,461.3 592.7,459.8 593,458.3C593,457.4 593.3,456.8 593.3,455.9C593.6,454.1 593.9,452 593.9,449.9L593.9,449.3C594.2,447.5 594.2,445.7 594.5,444.2C594.5,442.7 594.8,441.2 594.8,439.7L594.8,437.9C594.8,436.4 595.1,434.9 595.1,433.4L595.1,419.1C595.3,256.6 461.9,123.3 297.6,123.3Z" style="fill:white;fill-rule:nonzero;"/>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ <g transform="matrix(0.967356,0,0,0.967356,201.878,133.54)">
+ <circle cx="49.658" cy="56.991" r="183.667" style="fill:none;stroke:rgb(231,37,111);stroke-width:6.93px;"/>
+ </g>
+</svg>
diff --git a/design_system_admin/prive/themes/spip/images/thumb-spip-dsfr.png b/design_system_admin/prive/themes/spip/images/thumb-spip-dsfr.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a99c6018130b575ebc4a7c3b3d4177d67b12213
Binary files /dev/null and b/design_system_admin/prive/themes/spip/images/thumb-spip-dsfr.png differ