diff --git a/.gitattributes b/.gitattributes index e4d1b514f628d8bc9ada9f0e85a4f224e9334c8d..6ef2b795d569844a3e971c8cafefb58cd765c9ae 100644 --- a/.gitattributes +++ b/.gitattributes @@ -134,7 +134,6 @@ ecrire/exec/charger_plugin.php -text ecrire/exec/charger_plugin_descr.php -text ecrire/exec/config_contenu.php -text ecrire/exec/config_fonctions.php -text -ecrire/exec/config_identite.php -text ecrire/exec/config_lang.php -text ecrire/exec/config_langage.php -text ecrire/exec/config_multilang.php -text @@ -437,7 +436,6 @@ prive/aide_menu.html -text prive/box.css -text prive/box_skins.css.html -text prive/cfg.html -text -prive/configurer/identite.html -text prive/configurer/langage.html -text prive/configurer/preferences.html -text prive/contenu/article.html -text @@ -783,15 +781,18 @@ prive/spip_pass.html -text prive/spip_style.css -text prive/squelettes/body.html -text prive/squelettes/contenu/page-403.html -text +prive/squelettes/contenu/page-configurer_identite.html -text prive/squelettes/contenu/page-typo.html -text prive/squelettes/extra/dist.html -text prive/squelettes/head/dist.html -text prive/squelettes/hierarchie/dist.html -text +prive/squelettes/hierarchie/page-configurer_identite.html -text prive/squelettes/hierarchie/page-typo.html -text prive/squelettes/inclure/barre-nav.html -text prive/squelettes/inclure/head.html -text prive/squelettes/inclure/pied.html -text prive/squelettes/navigation/dist.html -text +prive/squelettes/navigation/page-configurer_identite.html -text prive/squelettes/objet.html -text prive/squelettes/page.html -text prive/squelettes/structure.html -text diff --git a/ecrire/exec/config_identite.php b/ecrire/exec/config_identite.php deleted file mode 100644 index 58791ad8c906b54c40f87e8102080041eb2bf087..0000000000000000000000000000000000000000 --- a/ecrire/exec/config_identite.php +++ /dev/null @@ -1,41 +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; - -function exec_config_identite(){ - if (!autoriser('configurer','identite',0)) { - include_spip('inc/minipres'); - echo minipres(); - } else { - $commencer_page = charger_fonction('commencer_page','inc'); - echo $commencer_page(_T('titre_identite_site')); - - - echo gros_titre(_T("titre_identite_site"), "", false); - - echo debut_gauche("configurer_identite",true); - - // - // Le logo de notre site, c'est site{on,off}0.{gif,png,jpg} - // - $iconifier = charger_fonction('iconifier', 'inc'); - echo $iconifier('id_syndic', 0, 'configuration'); - - echo debut_droite("configurer_identite",true); - - echo recuperer_fond('prive/configurer/identite',$_GET); - echo fin_gauche(),fin_page(); - } -} - -?> \ No newline at end of file diff --git a/prive/navigation.xml b/prive/navigation.xml index c90714ad00c1d1acfe4da17a9022859511e591eb..050f18a2daecd9fc9319cab5deb9991befb62964 100644 --- a/prive/navigation.xml +++ b/prive/navigation.xml @@ -112,7 +112,7 @@ <bouton id='config_identite' parent="bando_configuration"> <icone>images/identite-16.png</icone> <titre>titre_identite_site</titre> - <url>config_identite</url> + <url>configurer_identite</url> </bouton> <bouton id='config_lang' parent="bando_configuration"> <icone>images/langue-16.png</icone> diff --git a/prive/configurer/identite.html b/prive/squelettes/contenu/page-configurer_identite.html similarity index 52% rename from prive/configurer/identite.html rename to prive/squelettes/contenu/page-configurer_identite.html index a385f637140c205635a826d794c9d066bc4bebc1..5d0e689eefe139511b9b64d400b389eabb3ab3f1 100644 --- a/prive/configurer/identite.html +++ b/prive/squelettes/contenu/page-configurer_identite.html @@ -1,3 +1,4 @@ +[(#AUTORISER{configurer,identite}|interdire_acces)] <div class='ajax'> #FORMULAIRE_CONFIGURER_IDENTITE </div> \ No newline at end of file diff --git a/prive/squelettes/hierarchie/page-configurer_identite.html b/prive/squelettes/hierarchie/page-configurer_identite.html new file mode 100644 index 0000000000000000000000000000000000000000..4a776d0ad76647a4ce2300067faf7757179608cb --- /dev/null +++ b/prive/squelettes/hierarchie/page-configurer_identite.html @@ -0,0 +1 @@ +<h1><:titre_identite_site:></h1> \ No newline at end of file diff --git a/prive/squelettes/navigation/page-configurer_identite.html b/prive/squelettes/navigation/page-configurer_identite.html new file mode 100644 index 0000000000000000000000000000000000000000..f0d4a5d7c87b176c14bfd4146be485d1fd606d6e --- /dev/null +++ b/prive/squelettes/navigation/page-configurer_identite.html @@ -0,0 +1,3 @@ +<div class="ajax"> +#FORMULAIRE_EDITER_LOGO{site,0} +</div>