diff --git a/.gitattributes b/.gitattributes
index 592cb091c9215ec25bf3c51ded59482200f5be9c..9c6262e3c3eee86046cf7a580a8c076d4130f12b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -81,7 +81,6 @@ ecrire/configuration/annonces.php -text
ecrire/configuration/avertisseur.php -text
ecrire/configuration/documents.php -text
ecrire/configuration/index.php -text
-ecrire/configuration/logos.php -text
ecrire/configuration/messagerie_agenda.php -text
ecrire/configuration/moderniseur_html.php -text
ecrire/configuration/previsualiseur.php -text
@@ -388,6 +387,8 @@ prive/formulaires/configurer_langage.html -text
prive/formulaires/configurer_langage.php -text
prive/formulaires/configurer_langue.html -text
prive/formulaires/configurer_langue.php -text
+prive/formulaires/configurer_logos.html -text
+prive/formulaires/configurer_logos.php -text
prive/formulaires/configurer_metas.php -text
prive/formulaires/configurer_multilinguisme.html -text
prive/formulaires/configurer_multilinguisme.php -text
diff --git a/ecrire/configuration/logos.php b/ecrire/configuration/logos.php
deleted file mode 100644
index e3a35e068e1d1afbefd1375b5f698e4160b77c18..0000000000000000000000000000000000000000
--- a/ecrire/configuration/logos.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/***************************************************************************\
- * SPIP, Systeme de publication pour l'internet *
- * *
- * Copyright (c) 2001-2010 *
- * Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
- * *
- * Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
- * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
-\***************************************************************************/
-
-if (!defined("_ECRIRE_INC_VERSION")) return;
-
-include_spip('inc/presentation');
-include_spip('inc/config');
-
-//
-// Gestion des documents joints
-//
-
-function configuration_logos_dist(){
- global $spip_lang_left, $spip_lang_right;
-
- $activer_logos = $GLOBALS['meta']["activer_logos"];
- $activer_logos_survol = $GLOBALS['meta']["activer_logos_survol"];
-
- $res = "<table border='0' cellspacing='1' cellpadding='3' width=\"100%\">";
- $res .= "<tr><td class='verdana2'>";
- $res .= _T('config_info_logos').aide('logoart');
- $res .= "</td></tr>";
-
- $res .= "<tr>";
- $res .= "<td align='$spip_lang_left' class='verdana2'>";
-
-
- $res .= bouton_radio("activer_logos", "oui", _T('config_info_logos_utiliser'), $activer_logos == "oui", "changeVisible(this.checked, 'logos_survol_config', 'block', 'none');")
- . " <br /> "
- . bouton_radio("activer_logos", "non", _T('config_info_logos_utiliser_non'), $activer_logos == "non", "changeVisible(this.checked, 'logos_survol_config', 'none', 'block');");
-
- if ($activer_logos != "non") $style = "display: block;";
- else $style = "display: none;";
-
- $res .= "<br /><br /><div id='logos_survol_config' style='$style'>";
-
-
- $res .= afficher_choix('activer_logos_survol', $activer_logos_survol,
- array('oui' => _T('config_info_logos_utiliser_survol'),
- 'non' => _T('config_info_logos_utiliser_survol_non')), " <br /> ");
-
-
- $res .= "</div>";
-
- $res .= "</td></tr>";
- $res .= "</table>\n";
-
- $res = debut_cadre_trait_couleur("image-24.gif", true, "", _T('info_logos'))
- . ajax_action_post('configuration', 'logos', 'configuration','#configurer-logos',$res)
- . fin_cadre_trait_couleur(true);
-
- return ajax_action_greffe('configurer-logos', '', $res);
-}
-?>
diff --git a/prive/formulaires/configurer_logos.html b/prive/formulaires/configurer_logos.html
new file mode 100644
index 0000000000000000000000000000000000000000..47d8be861483e425f40bd8c1615329910695f6e7
--- /dev/null
+++ b/prive/formulaires/configurer_logos.html
@@ -0,0 +1,43 @@
+<div class="formulaire_spip formulaire_configurer formulaire_#FORM formulaire_#FORM-#ENV{id,nouveau}">
+<h3 class='titrem'><img src="#CHEMIN_IMAGE{image-24.png}" class="cadre-icone" /><:info_logos:></h3>
+ [<p class="reponse_formulaire reponse_formulaire_ok">(#ENV*{message_ok})</p>]
+ [<p class="reponse_formulaire reponse_formulaire_erreur">(#ENV*{message_erreur})</p>]
+ [(#ENV{editable})
+ <form method='post' action='#ENV{action}' enctype='multipart/form-data'><div>
+ [(#REM) declarer les hidden qui declencheront le service du formulaire
+ parametre : url d'action ]
+ #ACTION_FORMULAIRE{#ENV{action}}
+ <ul>
+ #SET{name,activer_logos}#SET{erreurs,#ENV**{erreurs}|table_valeur{#GET{name}}}
+ <li class="long_label editer_[(#GET{name})][ (#GET{obli})][ (#GET{erreurs}|oui)erreur]">
+ <label for="#GET{name}"><:config_info_logos:>#AIDER{logoart}</label>[
+ <span class='erreur_message'>(#GET{erreurs})</span>
+ ]<div class="choix">
+ <input type="radio" name="#GET{name}" id="#GET{name}_oui" value="oui"
+ [(#ENV{#GET{name}}|=={oui}|oui)checked="checked"] /><label for="#GET{name}_oui"><:config_info_logos_utiliser:></label>
+ </div>
+ <div class="choix">
+ <input type="radio" name="#GET{name}" id="#GET{name}_non" value="non"
+ [(#ENV{#GET{name}}|=={oui}|non)checked="checked"] /><label for="#GET{name}_non"><:config_info_logos_utiliser_non:></label>
+ </div>
+ </li>
+ #SET{name,activer_logos_survol}#SET{erreurs,#ENV**{erreurs}|table_valeur{#GET{name}}}
+ <li class="long_label editer_[(#GET{name})][ (#GET{obli})][ (#GET{erreurs}|oui)erreur]">
+ [
+ <span class='erreur_message'>(#GET{erreurs})</span>
+ ]<div class="choix">
+ <input type="radio" name="#GET{name}" id="#GET{name}_oui" value="oui"
+ [(#ENV{#GET{name}}|=={oui}|oui)checked="checked"] /><label for="#GET{name}_oui"><:config_info_logos_utiliser_survol:></label>
+ </div>
+ <div class="choix">
+ <input type="radio" name="#GET{name}" id="#GET{name}_non" value="non"
+ [(#ENV{#GET{name}}|=={oui}|non)checked="checked"] /><label for="#GET{name}_non"><:config_info_logos_utiliser_survol_non:></label>
+ </div>
+ </li>
+ </ul>
+ [(#REM) ajouter les saisies supplementaires : extra et autre, a cet endroit ]
+ <!--extra-->
+ <p class='boutons'><span class='image_loading'> </span><input type='submit' class='submit' value='<:bouton_enregistrer:>' /></p>
+ </div></form>
+ ]
+</div>
diff --git a/prive/formulaires/configurer_logos.php b/prive/formulaires/configurer_logos.php
new file mode 100644
index 0000000000000000000000000000000000000000..f3831386c7b2bb809595f4e64d206dd0b79f6e5e
--- /dev/null
+++ b/prive/formulaires/configurer_logos.php
@@ -0,0 +1,38 @@
+<?php
+
+/***************************************************************************\
+ * SPIP, Systeme de publication pour l'internet *
+ * *
+ * Copyright (c) 2001-2010 *
+ * Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
+ * *
+ * Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
+ * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
+\***************************************************************************/
+
+if (!defined("_ECRIRE_INC_VERSION")) return;
+
+function formulaires_configurer_logos_charger_dist(){
+ foreach(array(
+ "activer_logos",
+ "activer_logos_survol",
+ ) as $m)
+ $valeurs[$m] = $GLOBALS['meta'][$m];
+
+ return $valeurs;
+}
+
+
+function formulaires_configurer_logos_traiter_dist(){
+ $res = array('editable'=>true);
+ foreach(array(
+ "activer_logos",
+ "activer_logos_survol",
+ ) as $m)
+ if (!is_null($v=_request($m)))
+ ecrire_meta($m, $v=='oui'?'oui':'non');
+
+ $res['message_ok'] = _T('config_info_enregistree');
+ return $res;
+}
+
diff --git a/prive/squelettes/contenu/page-configurer_contenu.html b/prive/squelettes/contenu/page-configurer_contenu.html
index 1c08a6df428b4b9886048c559b1743c5a73303e5..e11b38a0da25a43d4012a4c8bcbe7f9704e5dbe9 100644
--- a/prive/squelettes/contenu/page-configurer_contenu.html
+++ b/prive/squelettes/contenu/page-configurer_contenu.html
@@ -12,12 +12,13 @@
#FORMULAIRE_CONFIGURER_BREVES
</div>
+<div class="ajax">
+ #FORMULAIRE_CONFIGURER_LOGOS
+</div>
+
<?php
include_spip('inc/presentation');
- $logos = charger_fonction('logos', 'configuration');
- echo $logos();
-
$documents = charger_fonction('documents', 'configuration');
echo $documents();