diff --git a/.gitattributes b/.gitattributes index 1a6c8857b008840d888676467a4eb1b4c3091da1..9199ca687efcae2c45876a54d8581e44d377b53c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -430,6 +430,7 @@ ecrire/configuration/mots.php -text ecrire/configuration/participants.php -text ecrire/configuration/previsualiseur.php -text ecrire/configuration/redacteurs.php -text +ecrire/configuration/redirection.php -text ecrire/configuration/reducteur.php -text ecrire/configuration/referenceur.php -text ecrire/configuration/relayeur.php -text diff --git a/ecrire/configuration/articles.php b/ecrire/configuration/articles.php index 9796af1fcb860c007bc85acdb57fa07b799bb2f7..9e4503de9ef20160c76a25e32c79118b2c69485f 100644 --- a/ecrire/configuration/articles.php +++ b/ecrire/configuration/articles.php @@ -30,7 +30,6 @@ function configuration_articles_dist(){ $articles_ps = $GLOBALS['meta']["articles_ps"]; $articles_redac = $GLOBALS['meta']["articles_redac"]; $articles_urlref = $GLOBALS['meta']["articles_urlref"]; - $articles_redirection = $GLOBALS['meta']["articles_redirection"]; $res = "<table border='0' cellspacing='1' cellpadding='3' width=\"100%\">" @@ -110,15 +109,6 @@ function configuration_articles_dist(){ array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ") . "</td></tr>\n" - . "<tr>" - . "<td align='$spip_lang_left' class='verdana2'>" - . _T('info_redirection') - . "</td>" - . "<td align='$spip_lang_left' class='verdana2'>" - . afficher_choix('articles_redirection', $articles_redirection, - array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ") - . "</td></tr>\n" - . "</table>"; diff --git a/ecrire/configuration/redirection.php b/ecrire/configuration/redirection.php new file mode 100644 index 0000000000000000000000000000000000000000..c4ab96bdacc9a1f8a652dda8de7a69ea868e2140 --- /dev/null +++ b/ecrire/configuration/redirection.php @@ -0,0 +1,44 @@ +<?php + +/***************************************************************************\ + * SPIP, Systeme de publication pour l'internet * + * * + * Copyright (c) 2001-2007 * + * 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('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, "", _L('Redirection d\'article').aide ("artvirt")) + . ajax_action_post('configurer', 'redirection', 'configuration','',$res) + . fin_cadre_relief(true); + + return ajax_action_greffe('configurer-redirection', '', $res); +} +?> diff --git a/ecrire/exec/configuration.php b/ecrire/exec/configuration.php index 5ec257cc3f77708f54915fa1e36a471a1468fa93..462aa5e26de80360222737bf2241ba03f60d9a57 100644 --- a/ecrire/exec/configuration.php +++ b/ecrire/exec/configuration.php @@ -63,6 +63,8 @@ function exec_configuration_dist(){ 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');