diff --git a/ecrire/exec/admin_declarer.php b/ecrire/exec/admin_declarer.php index aa851aef5b86fc6fd56924e16979863fde798eab..ea9344653d95ef2aa998de3d3d6f96526063002e 100644 --- a/ecrire/exec/admin_declarer.php +++ b/ecrire/exec/admin_declarer.php @@ -26,7 +26,6 @@ function exec_admin_declarer_dist() $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T('titre_admin_tech'), "configuration", "base"); - echo "\n<br /><br />"; echo gros_titre(_T('titre_admin_effacer'),'',false); echo barre_onglets("administration", "declarer"); diff --git a/ecrire/exec/admin_effacer.php b/ecrire/exec/admin_effacer.php index b575d72967175f4f9605ca35f756c852b9b353dc..7a0cb61924b82daa9cbf72fa405a15571851078e 100644 --- a/ecrire/exec/admin_effacer.php +++ b/ecrire/exec/admin_effacer.php @@ -31,7 +31,6 @@ function exec_admin_effacer_dist() $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T('titre_page_admin_effacer'), "configuration", "base"); - echo "\n<br /><br />"; echo gros_titre(_T('titre_admin_effacer'),'',false); echo barre_onglets("administration", "effacer"); diff --git a/ecrire/exec/admin_plugin.php b/ecrire/exec/admin_plugin.php index 89b81215d4f8f2db2e3c7c76504646c527efa181..a0978251562d4bddda58cc617a87518ff4f1d5cd 100644 --- a/ecrire/exec/admin_plugin.php +++ b/ecrire/exec/admin_plugin.php @@ -37,10 +37,6 @@ function exec_admin_plugin_dist($retour='') { echo $commencer_page(_T('icone_admin_plugin'), "configuration", "plugin"); - echo "<br />\n"; - echo "<br />\n"; - - echo gros_titre(_T('icone_admin_plugin'),'',false); diff --git a/ecrire/exec/admin_tech.php b/ecrire/exec/admin_tech.php index d14c9a50bf6a0cdc684bc390ddb5463883a53c9b..d85edc467b5dcaa568f318a89562c0cdc8f58007 100644 --- a/ecrire/exec/admin_tech.php +++ b/ecrire/exec/admin_tech.php @@ -24,10 +24,7 @@ function exec_admin_tech_dist() $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T('titre_admin_tech'), "configuration", "base"); - echo "<br /><br />"; - echo "<div style='text-align: center'>", - gros_titre(_T('titre_admin_tech'),'',false), - '</div>'; + echo gros_titre(_T('titre_admin_tech'),'',false); if ($GLOBALS['connect_toutes_rubriques']) { diff --git a/ecrire/exec/admin_vider.php b/ecrire/exec/admin_vider.php index 1b388732920532b5df56553cb5177f10140539e4..9cc4f351ac74da4a452cd63f749230189d90e28c 100644 --- a/ecrire/exec/admin_vider.php +++ b/ecrire/exec/admin_vider.php @@ -60,7 +60,6 @@ function exec_admin_vider_dist() $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T('onglet_vider_cache'), "configuration", "cache"); - echo "<br /><br /><br />"; echo gros_titre(_T('titre_admin_vider'),'', false); // barre_onglets("administration", "vider"); diff --git a/ecrire/exec/auteurs.php b/ecrire/exec/auteurs.php index 25b926bfe2907aaadf4d9999f23ab196efaced7c..c75cdbc060673dbdc1795710677006f385fe6503 100644 --- a/ecrire/exec/auteurs.php +++ b/ecrire/exec/auteurs.php @@ -118,9 +118,7 @@ function bandeau_auteurs($tri, $visiteurs) $ret .= pipeline('affiche_droite',array('args'=>array('exec'=>'auteurs'),'data'=>'')); $ret .= debut_droite('',true); - $ret .= "\n<br />"; $ret .= gros_titre($visiteurs ? _T('info_visiteurs') : _T('info_auteurs'),'',false); - $ret .= "\n<br />"; return $ret; } diff --git a/ecrire/exec/config_contenu.php b/ecrire/exec/config_contenu.php index cf7933cf11cab7f696e863c308d1bf85c51ed47f..a284f163f23c84e0771f693a54db7063eddecde8 100644 --- a/ecrire/exec/config_contenu.php +++ b/ecrire/exec/config_contenu.php @@ -29,7 +29,6 @@ function exec_config_contenu_dist() $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T('titre_page_config_contenu'), "configuration", "configuration"); - echo "<br /><br /><br />\n"; echo gros_titre(_T('titre_page_config_contenu'),'', false); echo barre_onglets("configuration", "interactivite"); diff --git a/ecrire/exec/config_fonctions.php b/ecrire/exec/config_fonctions.php index 1474c0f6ec85244514599abeb062321268644da9..4f72386c69912e4bae108a42fea15acdebc8e194 100644 --- a/ecrire/exec/config_fonctions.php +++ b/ecrire/exec/config_fonctions.php @@ -29,7 +29,6 @@ function exec_config_fonctions_dist() $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T('titre_page_config_fonctions'), "configuration", "configuration"); - echo "<br /><br /><br />"; echo gros_titre(_T('titre_config_fonctions'),'', false); echo barre_onglets("configuration", "fonctions"); diff --git a/ecrire/exec/config_lang.php b/ecrire/exec/config_lang.php index 1e30041fc95085ce4fd0dcac6d7c7e7535a36cd8..89029dbffdf3b05f96d7bd0dad24112806ea66ef 100644 --- a/ecrire/exec/config_lang.php +++ b/ecrire/exec/config_lang.php @@ -34,11 +34,8 @@ function exec_config_lang_dist() echo debut_droite('', true); - echo "<br /><div style='text-align: center'>", - gros_titre(_T('info_langues'), '', false), - '</div><br />', - barre_onglets("config_lang", "langues"), - '<br />'; + echo gros_titre(_T('info_langues'), '', false), + barre_onglets("config_lang", "langues"); $langue = charger_fonction('langue', 'configuration'); echo $langue(); diff --git a/ecrire/exec/config_multilang.php b/ecrire/exec/config_multilang.php index 47ea7c3288ab829813f2cd92f632365b714ea362..1a2eaf1d8be10c04146d4180c68898ad89e263a8 100644 --- a/ecrire/exec/config_multilang.php +++ b/ecrire/exec/config_multilang.php @@ -38,11 +38,8 @@ function exec_config_multilang_dist() echo pipeline('affiche_droite',array('args'=>array('exec'=>'config_multilang'),'data'=>'')); echo debut_droite('', true); - echo "<br /><div style='text-align: center'>", - gros_titre(_T('info_langues'),'', false), - '</div><br />', - barre_onglets("config_lang", "multi"), - '<br />'; + echo gros_titre(_T('info_langues'),'', false), + barre_onglets("config_lang", "multi"); $referenceur = charger_fonction('referenceur', 'configuration'); echo $referenceur(); diff --git a/ecrire/exec/configuration.php b/ecrire/exec/configuration.php index 3445354919ca87a39339e500f96d0f9926b37cc7..bfda601512045f851ac8d9f252cd71dc39518cf1 100644 --- a/ecrire/exec/configuration.php +++ b/ecrire/exec/configuration.php @@ -30,7 +30,6 @@ function exec_configuration_dist(){ $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T('titre_page_configuration'), "configuration", "configuration"); - echo "<br /><br /><br />\n"; echo gros_titre(_T('titre_configuration'),'', false); echo barre_onglets("configuration", "contenu"); diff --git a/ecrire/exec/lang_raccourcis.php b/ecrire/exec/lang_raccourcis.php index 56e0e79d05d668fdb6d36b06ba132e9877f5e192..358753c923cd11064d492c67c5bc08849c1deff7 100644 --- a/ecrire/exec/lang_raccourcis.php +++ b/ecrire/exec/lang_raccourcis.php @@ -53,11 +53,8 @@ function exec_lang_raccourcis_dist() { echo debut_droite('', true); - echo "<br /><div style='text-align: center'>", - gros_titre(_T('module_fichier_langue').": $module",'', false), - '</div><br />', - barre_onglets("config_lang", "fichiers"), - '<br />'; + echo gros_titre(_T('module_fichier_langue').": $module",'', false), + barre_onglets("config_lang", "fichiers"); afficher_raccourcis($module); diff --git a/ecrire/exec/synchro.php b/ecrire/exec/synchro.php index a9fdd67bb1bc1993420abcaf734952a3ca43b57a..85625abdc0f946e50ab1ccad281d7520b287b50a 100644 --- a/ecrire/exec/synchro.php +++ b/ecrire/exec/synchro.php @@ -45,7 +45,6 @@ function exec_synchro_dist() $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T("icone_suivi_activite"), "accueil", "synchro"); - echo "<br /><br />"; echo gros_titre(_T("icone_suivi_activite"),'', false); echo debut_gauche('', true); diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php index 187393e15d60bbb043649db2bbab91e99eecee51..1d77ad95034a8a5d22f4f918f88e0229b58fb045 100644 --- a/ecrire/inc/presentation.php +++ b/ecrire/inc/presentation.php @@ -106,6 +106,8 @@ function debut_cadre($style, $icone = "", $fonction = "", $titre = "", $id="", $ ."'$style_cadre>"; if ($spip_display != 1 AND $spip_display != 4 AND strlen($icone) > 1) { + if ($icone_renommer = charger_fonction('icone_renommer','inc',true)) + list($icone,$fonction) = $icone_renommer($icone,$fonction); if ($fonction) { $ret .= http_img_pack("$fonction", "", " class='cadre-icone' ".http_style_background($icone, "no-repeat; padding: 0px; margin: 0px")); @@ -569,6 +571,8 @@ function icone($texte, $lien, $fond, $fonction="", $align="", $echo=false){ // http://doc.spip.org/@icone_inline function icone_inline($texte, $lien, $fond, $fonction="", $align="", $ajax=false, $javascript=''){ global $spip_display; + if ($icone_renommer = charger_fonction('icone_renommer','inc',true)) + list($fond,$fonction) = $icone_renommer($fond,$fonction); if ($fonction == "supprimer.gif") { $style = 'icone36 danger'; @@ -636,6 +640,8 @@ function icone_inline($texte, $lien, $fond, $fonction="", $align="", $ajax=false // http://doc.spip.org/@icone_horizontale function icone_horizontale($texte, $lien, $fond = "", $fonction = "", $af = true, $javascript='') { global $spip_display; + if ($icone_renommer = charger_fonction('icone_renommer','inc',true)) + list($fond,$fonction) = $icone_renommer($fond,$fonction); $retour = ''; // cas d'ajax_action_auteur: faut defaire le boulot @@ -697,7 +703,7 @@ function f_boite_infos($flux) { // http://doc.spip.org/@gros_titre function gros_titre($titre, $ze_logo='', $aff=true){ global $spip_display; - $res = "\n<h1>"; + $res = "\n<h1 class='grostitre'>"; if ($spip_display != 4) { $res .= $ze_logo.' '; } @@ -766,7 +772,7 @@ function debut_gauche($rubrique = "accueil", $return=false) { // div contenu lui-meme ferme par fin_gauche() ainsi que // div conteneur - $res = "<br /><div id='conteneur' class='".(_INTERFACE_ONGLETS ? "onglets" : "no_onglets") ."'> + $res = "<div id='conteneur' class='".(_INTERFACE_ONGLETS ? "onglets" : "no_onglets") ."'> \n<div id='navigation'>\n"; if ($spip_display == 4) $res .= "<!-- "; diff --git a/prive/style_prive.html b/prive/style_prive.html index e18d6c0c014aeb7fac441c5648a96d7ea889902a..a078444ee7363c952282880e388910d421b61de2 100644 --- a/prive/style_prive.html +++ b/prive/style_prive.html @@ -101,6 +101,7 @@ div.table_page { margin-top: 1em; } #chemin .aide {margin-top: 3px; margin-bottom: 15px;} h1 { color: #GET{foncee}; font-size:large; font-family: Arial, Sans, sans-serif; margin: 0.5em 0 0.25em 0; } +h1.grostitre {text-align:center;margin:2em 0 1em;} h2 { color: #000; font-size: medium; font-family: Arial, Sans, sans-serif; margin: 0.5em 0 0.25em 0; } h3 { color: #666; font-size: medium; font-family: Arial, Sans, sans-serif; margin: 0.5em 0 0.25em 0; }