From ef293e2a45073b3d9ff2940ed9c80a00c8b6b414 Mon Sep 17 00:00:00 2001 From: Cerdic <cedric@yterium.com> Date: Fri, 24 Sep 2010 19:08:28 +0000 Subject: [PATCH] #FORMULAIRE_CONFIGURER_ARTICLES regroupe configuration/articles configuration/futurs et configuration/redirection --- .gitattributes | 5 +- ecrire/configuration/articles.php | 122 -------------- ecrire/configuration/futurs.php | 44 ------ ecrire/configuration/redirection.php | 44 ------ prive/formulaires/configurer_articles.html | 149 ++++++++++++++++++ prive/formulaires/configurer_articles.php | 54 +++++++ .../contenu/page-configurer_contenu.html | 12 +- 7 files changed, 209 insertions(+), 221 deletions(-) delete mode 100644 ecrire/configuration/articles.php delete mode 100644 ecrire/configuration/futurs.php delete mode 100644 ecrire/configuration/redirection.php create mode 100644 prive/formulaires/configurer_articles.html create mode 100644 prive/formulaires/configurer_articles.php diff --git a/.gitattributes b/.gitattributes index ecf13c7a82..9087e31e42 100644 --- a/.gitattributes +++ b/.gitattributes @@ -78,18 +78,15 @@ ecrire/charsets/mathml.php -text ecrire/charsets/translit.php -text ecrire/charsets/translitcomplexe.php -text ecrire/configuration/annonces.php -text -ecrire/configuration/articles.php -text ecrire/configuration/avertisseur.php -text ecrire/configuration/breves.php -text ecrire/configuration/documents.php -text -ecrire/configuration/futurs.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 ecrire/configuration/redacteurs.php -text -ecrire/configuration/redirection.php -text ecrire/configuration/reducteur.php -text ecrire/configuration/relayeur.php -text ecrire/configuration/rubriques.php -text @@ -383,6 +380,8 @@ prive/editer/breve.html -text prive/editer/logo.html -text prive/editer/rubrique.html -text prive/editer/site.html -text +prive/formulaires/configurer_articles.html -text +prive/formulaires/configurer_articles.php -text prive/formulaires/configurer_identite.html -text prive/formulaires/configurer_identite.php -text prive/formulaires/configurer_langage.html -text diff --git a/ecrire/configuration/articles.php b/ecrire/configuration/articles.php deleted file mode 100644 index c49f0a962a..0000000000 --- a/ecrire/configuration/articles.php +++ /dev/null @@ -1,122 +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'); - -// -// Options des articles -// - -function configuration_articles_dist(){ - global $spip_lang_left; - - $articles_surtitre = $GLOBALS['meta']["articles_surtitre"]; - $articles_soustitre = $GLOBALS['meta']["articles_soustitre"]; - $articles_descriptif = $GLOBALS['meta']["articles_descriptif"]; - $articles_chapeau = $GLOBALS['meta']["articles_chapeau"]; - $articles_texte = $GLOBALS['meta']["articles_texte"]; - $articles_ps = $GLOBALS['meta']["articles_ps"]; - $articles_redac = $GLOBALS['meta']["articles_redac"]; - $articles_urlref = $GLOBALS['meta']["articles_urlref"]; - - $res = "<table border='0' cellspacing='1' cellpadding='3' width=\"100%\">" - - . "<tr><td colspan='2' class='verdana2'>" - . _T('texte_contenu_articles') - . "</td></tr>" - - . "<tr>" - . "<td align='$spip_lang_left' class='verdana2'>" - . _T('info_surtitre') - . "</td>" - . "<td align='$spip_lang_left' class='verdana2'>" - . afficher_choix('articles_surtitre', $articles_surtitre, - array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ") - . "</td></tr>\n" - - . "<tr>" - . "<td align='$spip_lang_left' class='verdana2'>" - . _T('info_sous_titre') - . "</td>" - . "<td align='$spip_lang_left' class='verdana2'>" - . afficher_choix('articles_soustitre', $articles_soustitre, - array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ") - . "</td></tr>\n" - - . "<tr>" - . "<td align='$spip_lang_left' class='verdana2'>" - . _T('info_descriptif') - . "</td>" - . "<td align='$spip_lang_left' class='verdana2'>" - . afficher_choix('articles_descriptif', $articles_descriptif, - array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ") - . "</td></tr>\n" - - . "<tr>" - . "<td align='$spip_lang_left' class='verdana2'>" - . _T('info_chapeau_2') - . "</td>" - . "<td align='$spip_lang_left' class='verdana2'>" - . afficher_choix('articles_chapeau', $articles_chapeau, - array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ") - . "</td></tr>\n" - - . "<tr>" - . "<td align='$spip_lang_left' class='verdana2'>" - . typo(_T('info_texte').':') - . "</td>" - . "<td align='$spip_lang_left' class='verdana2'>" - . afficher_choix('articles_texte', $articles_texte, - array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ") - . "</td></tr>\n" - - . "<tr>" - . "<td align='$spip_lang_left' class='verdana2'>" - . _T('info_post_scriptum_2') - . "</td>" - . "<td align='$spip_lang_left' class='verdana2'>" - . afficher_choix('articles_ps', $articles_ps, - array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ") - . "</td></tr>\n" - - . "<tr>" - . "<td align='$spip_lang_left' class='verdana2'>" - . _T('info_date_publication_anterieure') - . "</td>" - . "<td align='$spip_lang_left' class='verdana2'>" - . afficher_choix('articles_redac', $articles_redac, - array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ") - . "</td></tr>\n" - - . "<tr>" - . "<td align='$spip_lang_left' class='verdana2'>" - . _T('info_urlref') - . "</td>" - . "<td align='$spip_lang_left' class='verdana2'>" - . afficher_choix('articles_urlref', $articles_urlref, - array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ") - . "</td></tr>\n" - - - . "</table>"; - - $res = debut_cadre_relief("", true, "", _T('info_contenu_articles').aide ("confart")) - . ajax_action_post('configuration', 'articles', 'configuration','#configurer-articles',$res) - . fin_cadre_relief(true); - - return ajax_action_greffe('configurer-articles', '', $res); - -} -?> diff --git a/ecrire/configuration/futurs.php b/ecrire/configuration/futurs.php deleted file mode 100644 index bddbc937e1..0000000000 --- a/ecrire/configuration/futurs.php +++ /dev/null @@ -1,44 +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'); - -// -// Articles post-dates -// - -function configuration_futurs_dist() -{ - global $spip_lang_left; - - $res = "<table border='0' cellspacing='1' cellpadding='3' width=\"100%\">" - . "<tr><td class='verdana2'>" - . _T('texte_publication_articles_post_dates') - . "</td></tr>" - - . "<tr><td align='$spip_lang_left' class='verdana2'>" - . afficher_choix('post_dates', $GLOBALS['meta']["post_dates"], - array('oui' => _T('item_publier_articles'), - 'non' => _T('item_non_publier_articles'))) - . "</td></tr>\n" - . "</table>\n"; - - $res = debut_cadre_relief("", true, "", _T('titre_publication_articles_post_dates').aide ("confdates")) - . ajax_action_post('configuration', 'futurs', 'configuration','#configurer-futurs',$res) - . fin_cadre_relief(true); - - return ajax_action_greffe('configurer-futurs', '', $res); -} -?> diff --git a/ecrire/configuration/redirection.php b/ecrire/configuration/redirection.php deleted file mode 100644 index 784ba8629b..0000000000 --- a/ecrire/configuration/redirection.php +++ /dev/null @@ -1,44 +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'); - -// -// Articles post-dates -// - -function configuration_redirection_dist() -{ - global $spip_lang_left; - - $res = "<table border='0' cellspacing='1' cellpadding='3' width=\"100%\">" - . "<tr><td class='verdana2'>" - . _T('config_info_redirection') - . "</td></tr>" - - . "<tr><td align='$spip_lang_left' class='verdana2'>" - . afficher_choix('articles_redirection', $GLOBALS['meta']["articles_redirection"], - array('oui' => _T('item_oui'), - 'non' => _T('item_non'))) - . "</td></tr>\n" - . "</table>\n"; - - $res = debut_cadre_relief("", true, "", _T('config_redirection').aide ("artvirt")) - . ajax_action_post('configuration', 'redirection', 'configuration','#configurer-redirection',$res) - . fin_cadre_relief(true); - - return ajax_action_greffe('configurer-redirection', '', $res); -} -?> diff --git a/prive/formulaires/configurer_articles.html b/prive/formulaires/configurer_articles.html new file mode 100644 index 0000000000..b477cfa03a --- /dev/null +++ b/prive/formulaires/configurer_articles.html @@ -0,0 +1,149 @@ +<div class="formulaire_spip formulaire_configurer formulaire_#FORM formulaire_#FORM-#ENV{id,nouveau}"> +<h3 class='titrem'><img src="#CHEMIN_IMAGE{article-24.png}" class="cadre-icone" /><:titre_les_articles:></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}} + <fieldset><legend><:info_contenu_articles:>#AIDER{confart}</legend> + <p><:texte_contenu_articles:></p> + <ul> + #SET{name,articles_surtitre}#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}"><:info_surtitre:></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"><:item_oui:></label> + + <input type="radio" name="#GET{name}" id="#GET{name}_non" value="non" + [(#ENV{#GET{name}}|=={oui}|non)checked="checked"] /><label for="#GET{name}_non"><:item_non:></label> + </div> + </li> + #SET{name,articles_soustitre}#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}"><:info_sous_titre:></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"><:item_oui:></label> + + <input type="radio" name="#GET{name}" id="#GET{name}_non" value="non" + [(#ENV{#GET{name}}|=={oui}|non)checked="checked"] /><label for="#GET{name}_non"><:item_non:></label> + </div> + </li> + #SET{name,articles_descriptif}#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}"><:info_descriptif:></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"><:item_oui:></label> + + <input type="radio" name="#GET{name}" id="#GET{name}_non" value="non" + [(#ENV{#GET{name}}|=={oui}|non)checked="checked"] /><label for="#GET{name}_non"><:item_non:></label> + </div> + </li> + #SET{name,articles_chapeau}#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}"><:info_chapeau_2:></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"><:item_oui:></label> + + <input type="radio" name="#GET{name}" id="#GET{name}_non" value="non" + [(#ENV{#GET{name}}|=={oui}|non)checked="checked"] /><label for="#GET{name}_non"><:item_non:></label> + </div> + </li> + #SET{name,articles_texte}#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}"><:info_texte:></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"><:item_oui:></label> + + <input type="radio" name="#GET{name}" id="#GET{name}_non" value="non" + [(#ENV{#GET{name}}|=={oui}|non)checked="checked"] /><label for="#GET{name}_non"><:item_non:></label> + </div> + </li> + #SET{name,articles_ps}#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}"><:info_post_scriptum_2:></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"><:item_oui:></label> + + <input type="radio" name="#GET{name}" id="#GET{name}_non" value="non" + [(#ENV{#GET{name}}|=={oui}|non)checked="checked"] /><label for="#GET{name}_non"><:item_non:></label> + </div> + </li> + #SET{name,articles_redac}#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}"><:info_date_publication_anterieure:></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"><:item_oui:></label> + + <input type="radio" name="#GET{name}" id="#GET{name}_non" value="non" + [(#ENV{#GET{name}}|=={oui}|non)checked="checked"] /><label for="#GET{name}_non"><:item_non:></label> + </div> + </li> + #SET{name,articles_urlref}#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}"><:info_urlref:></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"><:item_oui:></label> + + <input type="radio" name="#GET{name}" id="#GET{name}_non" value="non" + [(#ENV{#GET{name}}|=={oui}|non)checked="checked"] /><label for="#GET{name}_non"><:item_non:></label> + </div> + </li> + </ul> + </fieldset> + <fieldset><legend><:titre_publication_articles_post_dates:>#AIDER{confdates}</legend> + <ul> + #SET{name,post_dates}#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}"><:texte_publication_articles_post_dates:></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"><:item_publier_articles:></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"><:item_non_publier_articles:></label> + </div> + </li> + </ul> + </fieldset> + <fieldset><legend><:config_redirection:>#AIDER{artvirt}</legend> + <ul> + #SET{name,articles_redirection}#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_redirection:></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"><:item_oui:></label> + + <input type="radio" name="#GET{name}" id="#GET{name}_non" value="non" + [(#ENV{#GET{name}}|=={oui}|non)checked="checked"] /><label for="#GET{name}_non"><:item_non:></label> + </div> + </li> + </ul> + </fieldset> + [(#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> \ No newline at end of file diff --git a/prive/formulaires/configurer_articles.php b/prive/formulaires/configurer_articles.php new file mode 100644 index 0000000000..9651e8fa66 --- /dev/null +++ b/prive/formulaires/configurer_articles.php @@ -0,0 +1,54 @@ +<?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_articles_charger_dist(){ + foreach(array( + "articles_surtitre", + "articles_soustitre", + "articles_descriptif", + "articles_chapeau", + "articles_texte", + "articles_ps", + "articles_redac", + "articles_urlref", + "post_dates", + "articles_redirection", + ) as $m) + $valeurs[$m] = $GLOBALS['meta'][$m]; + + return $valeurs; +} + + +function formulaires_configurer_articles_traiter_dist(){ + $res = array('editable'=>true); + foreach(array( + "articles_surtitre", + "articles_soustitre", + "articles_descriptif", + "articles_chapeau", + "articles_texte", + "articles_ps", + "articles_redac", + "articles_urlref", + "post_dates", + "articles_redirection", + ) 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 9a0e22dc84..5d0c865f68 100644 --- a/prive/squelettes/contenu/page-configurer_contenu.html +++ b/prive/squelettes/contenu/page-configurer_contenu.html @@ -1,15 +1,11 @@ [(#AUTORISER{configurer,contenu}|interdire_acces)] <h1><:onglet_contenu_site:></h1> +<div class="ajax"> + #FORMULAIRE_CONFIGURER_ARTICLES +</div> + <?php include_spip('inc/presentation'); - echo debut_cadre_trait_couleur("article-24.png", true, "", _T('titre_les_articles')); - $articles = charger_fonction('articles', 'configuration'); - echo $articles(); - $futurs = charger_fonction('futurs', 'configuration'); - echo $futurs(); - $redirection = charger_fonction('redirection', 'configuration'); - echo $redirection(); - echo fin_cadre_trait_couleur(true); $rubriques = charger_fonction('rubriques', 'configuration'); echo $rubriques(); -- GitLab