diff --git a/ecrire/inc/gadgets.php b/ecrire/inc/gadgets.php index ce1185a6c48c2a5c99b4ae61554432017dcf1916..5cc65abe0a1f9460bc88f76e9a96cf44fbb31ade 100644 --- a/ecrire/inc/gadgets.php +++ b/ecrire/inc/gadgets.php @@ -353,21 +353,21 @@ onmouseover=\"findObj_forcer('bandeautoutsite').style.visibility='visible'; char // FIN GADGET Messagerie - // Suivi activite - $bandeau .= "<div id='bandeausynchro' class='bandeau bandeau_couleur_sous' style='$spip_lang_left: 160px;'>"; - $bandeau .= "<a href='" . generer_url_ecrire("synchro") . "' class='lien_sous'>"; - $bandeau .= _T('icone_suivi_activite'); - $bandeau .= "</a>"; - $bandeau .= "\n<div id='gadget-suivi'></div>\n"; - $bandeau .= "</div>"; + $bandeau .= "<div id='bandeausynchro' class='bandeau bandeau_couleur_sous' style='$spip_lang_left: 160px;'>" + . "<a href='" . generer_url_ecrire("synchro") . "' class='lien_sous'>" + . _T('icone_suivi_activite') + . "</a>" + . "\n<div id='gadget-suivi'><div> </div>" + . icone_horizontale(_T('analyse_xml'), parametre_url(self(),'transformer_xml', 'valider_xml'), 'xml.gif', '', false) + . "</div></div>\n"; // Infos perso - $bandeau .= "\n<div id='bandeauinfoperso' class='bandeau bandeau_couleur_sous' style='$spip_lang_left: 200px;'>"; - $bandeau .= "<a href='" . generer_url_ecrire("auteurs_edit","id_auteur=$connect_id_auteur") . "' class='lien_sous'>"; - $bandeau .= _T('icone_informations_personnelles'); - $bandeau .= "</a>"; - $bandeau .= "</div>"; + $bandeau .= "\n<div id='bandeauinfoperso' class='bandeau bandeau_couleur_sous' style='$spip_lang_left: 200px;'>" + . "<a href='" . generer_url_ecrire("auteurs_edit","id_auteur=$connect_id_auteur") . "' class='lien_sous'>" + . _T('icone_informations_personnelles') + . "</a>" + . "</div>"; // @@ -398,9 +398,9 @@ onmouseover=\"findObj_forcer('bandeautoutsite').style.visibility='visible'; char // En interface simplifiee, afficher en permanence l'indication de l'interface if ($options != "avancees") { - $bandeau .= "\n<div id='displayfond' class='bandeau bandeau_couleur_sous' style='$spip_lang_right: ".$decal."px; text-align: $spip_lang_right; visibility: visible; background-color: white; color: $couleur_foncee; z-index: -1000; border: 1px solid $couleur_claire; border-top: 0px;'>"; - $bandeau .= "<b>"._T('icone_interface_simple')."</b>"; - $bandeau .= "</div>\n"; + $bandeau .= "\n<div id='displayfond' class='bandeau bandeau_couleur_sous' style='$spip_lang_right: ".$decal."px; text-align: $spip_lang_right; visibility: visible; background-color: white; color: $couleur_foncee; z-index: -1000; border: 1px solid $couleur_claire; border-top: 0px;'>" + . "<b>" . _T('icone_interface_simple')."</b>" + . "</div>\n"; } $bandeau .= "\n<div id='bandeaudisplay' class='bandeau bandeau_couleur_sous' style='$spip_lang_right: ".$decal."px; text-align: $spip_lang_right;'>"; diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php index 1b04ab15aa4dee7148c8bf51610017730b880dc1..2260f7c800099dc73876328fd175400be326ef43 100644 --- a/ecrire/inc/presentation.php +++ b/ecrire/inc/presentation.php @@ -1744,8 +1744,8 @@ function fin_page() return debut_grand_cadre(true) . "\n" . (($spip_display == 4) - ? ("<div><a href='./?set_disp=2&exec=" - . _request('exec') + ? ("<div><a href='" + . parametre_url(self(),'set_disp', '2') . "'>" . _T("access_interface_graphique") . "</a></div>") diff --git a/ecrire/public/debug.php b/ecrire/public/debug.php index 305a5f4edccc706b1b7057be35bc73ee6871e8fa..1df5345f67c43def94cb27d40583c733a9bd5013 100644 --- a/ecrire/public/debug.php +++ b/ecrire/public/debug.php @@ -476,15 +476,23 @@ function debug_dumpfile ($texte, $fonc, $type) { // http://doc.spip.org/@debug_script function debug_script ($t) { + debug_debut($GLOBALS['exec']); if (!isset($GLOBALS['xhtml_error'])) - echo $t; + $res = '<h2>' . _L('SPIP considère ce document comme valide'). '</h2>'; else { - debug_debut($GLOBALS['exec']); list($t, $err) = emboite_texte($t); - echo $err, $t; + $res = $err . $t; + } + + echo "<div style='text-align: center'><h1>", _T('analyse_xml') . '</h1>', + $res, + " <a href='" + . parametre_url(self(),'transformer_xml', '') + . "'>" + . _T("access_interface_graphique") + . "</a></div>"; echo "\n</div>"; echo '</body></html>'; - } } // http://doc.spip.org/@debug_debut