From 5046d7afb4881bc320efe8d8089da59f1cb72a3e Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Mon, 18 Dec 2006 11:36:45 +0000
Subject: [PATCH] =?UTF-8?q?Retrait=20de=20s=C3=A9quence=20'<p><div>'=20ou?=
=?UTF-8?q?=20'<p><table>'=20d=C3=A9nonc=C3=A9es=20par=20le=20validateur?=
=?UTF-8?q?=20int=C3=A9gr=C3=A9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/exec/articles_ortho.php | 2 +-
ecrire/exec/articles_versions.php | 2 +-
ecrire/exec/calendrier.php | 4 ++--
ecrire/exec/forum.php | 4 ++--
ecrire/exec/messagerie.php | 6 +++---
ecrire/exec/upgrade.php | 4 ++--
ecrire/inc/commencer_page.php | 2 +-
ecrire/inc/gadgets.php | 32 +++++++++++++++----------------
ecrire/inc/iconifier.php | 4 ++--
ecrire/inc/presentation.php | 4 ++--
10 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/ecrire/exec/articles_ortho.php b/ecrire/exec/articles_ortho.php
index b8acdbccef..68a97e11da 100644
--- a/ecrire/exec/articles_ortho.php
+++ b/ecrire/exec/articles_ortho.php
@@ -197,7 +197,7 @@ if ($soustitre) {
}
if ($descriptif OR $url_site OR $nom_site) {
- echo "<p><div align='$spip_lang_left' style='padding: 5px; border: 1px dashed #aaaaaa; background-color: #e4e4e4;' $dir_lang>";
+ echo "<div align='$spip_lang_left' style='padding: 5px; border: 1px dashed #aaaaaa; background-color: #e4e4e4;' $dir_lang>";
echo "<font size='2' face='Verdana,Arial,Sans,sans-serif'>";
$texte_case = ($descriptif) ? "{{"._T('info_descriptif')."}} $descriptif\n\n" : '';
$texte_case .= ($nom_site.$url_site) ? "{{"._T('info_urlref')."}} [".$nom_site."->".$url_site."]" : '';
diff --git a/ecrire/exec/articles_versions.php b/ecrire/exec/articles_versions.php
index bf27a89d35..607a0e8a24 100644
--- a/ecrire/exec/articles_versions.php
+++ b/ecrire/exec/articles_versions.php
@@ -181,7 +181,7 @@ if ($soustitre) {
if ($descriptif OR $url_site OR $nom_site) {
- echo "<p><div align='left' style='padding: 5px; border: 1px dashed #aaaaaa; background-color: #e4e4e4;' $dir_lang>";
+ echo "<div align='left' style='padding: 5px; border: 1px dashed #aaaaaa; background-color: #e4e4e4;' $dir_lang>";
echo "<font size='2' face='Verdana,Arial,Sans,sans-serif'>";
$texte_case = ($descriptif) ? "{{"._T('info_descriptif')."}} $descriptif\n\n" : '';
$texte_case .= ($nom_site.$url_site) ? "{{"._T('info_urlref')."}} [".$nom_site."->".$url_site."]" : '';
diff --git a/ecrire/exec/calendrier.php b/ecrire/exec/calendrier.php
index 340dae777d..a488f40a72 100644
--- a/ecrire/exec/calendrier.php
+++ b/ecrire/exec/calendrier.php
@@ -86,11 +86,11 @@ function http_calendrier_aide_mess()
{
global $bleu, $vert, $jaune, $spip_lang_left;
return
- "\n<br /><br /><br />\n<font face='arial,helvetica,sans-serif' size='2'><table width='700'>\n<tr><th style='text-align: $spip_lang_left; font-weight: bold;'> " . _T('info_aide').
+ "\n<br /><br /><br />\n<table style='font-face: arial,helvetica,sans-serif; font-size: 11px' width='700'>\n<tr><th style='text-align: $spip_lang_left; font-weight: bold;'> " . _T('info_aide').
"</th></tr><tr><td>$bleu\n"._T('info_symbole_bleu')."\n" .
"</td></tr><tr><td>$vert\n"._T('info_symbole_vert')."\n" .
"</td></tr><tr><td>$jaune\n"._T('info_symbole_jaune')."\n" .
- "</td></tr>\n</table></font>";
+ "</td></tr>\n</table>\n";
}
?>
diff --git a/ecrire/exec/forum.php b/ecrire/exec/forum.php
index b40b28f5f4..8e243a8249 100644
--- a/ecrire/exec/forum.php
+++ b/ecrire/exec/forum.php
@@ -74,9 +74,9 @@ function exec_forum_dist()
if ($total > 10) liste_numeros_forum($script, $debut, $total);
- echo "\n<p><div align='center'>\n";
+ echo "\n<div align='center'>\n";
icone (_T('icone_poster_message'), generer_url_ecrire("forum_envoi", "statut=$statutforum&script=$script"), $logo, "creer.gif");
- echo "\n</div></p>";
+ echo "\n</div>";
echo "\n<p align='left'>";
$limit = $debut ? "LIMIT $debut,10" : "LIMIT 10" ;
diff --git a/ecrire/exec/messagerie.php b/ecrire/exec/messagerie.php
index 51175e7ba3..37003c0562 100644
--- a/ecrire/exec/messagerie.php
+++ b/ecrire/exec/messagerie.php
@@ -74,10 +74,10 @@ fin_cadre_relief();
echo
debut_cadre_enfonce('',true) .
"<div class='verdana1'>"._T("calendrier_synchro") .
- "<table class='cellule-h-table' cellpadding='0' valign='middle'><tr>\n" .
- "<td><a href='" . generer_url_ecrire("synchro","") . "'><div class='cell-i'>"
+ "<table class='cellule-h-table' cellpadding='0'><tr>\n" .
+ "<td><a href='" . generer_url_ecrire("synchro","") . "'><span class='cell-i'>"
. http_img_pack("rien.gif", ' ', http_style_background('synchro-24.gif', "; background-repeat: no-repeat; background-position: center center;"))
- . "</div></a></td>\n"
+ . "</span></a></td>\n"
. "<td class='cellule-h-lien'><a href='" . generer_url_ecrire("synchro","") . "' class='cellule-h'>"
. _T("icone_suivi_activite")
. "</a></td>\n</tr></table>\n" ."</div>" .
diff --git a/ecrire/exec/upgrade.php b/ecrire/exec/upgrade.php
index 3b23b5a10c..9ee787775f 100644
--- a/ecrire/exec/upgrade.php
+++ b/ecrire/exec/upgrade.php
@@ -32,12 +32,12 @@ function exec_upgrade_dist() {
echo "<p><b>",_T('texte_nouvelle_version_spip_1'),"</b><p> ",
_T('texte_nouvelle_version_spip_2',
array('connect' => '<tt>' . _FILE_CONNECT . '</tt>')),
- "<p><div align='right'>",
+ "<div align='right'>",
'<form action="', generer_url_ecrire("upgrade", 'reinstall=non'),
'">', "<input type='submit' value=\"",
_T('bouton_relancer_installation'),
"\" class='fondl'>",
- "</form>\n";
+ "</form></div>\n";
echo install_fin_html();
exit;
diff --git a/ecrire/inc/commencer_page.php b/ecrire/inc/commencer_page.php
index c646e99511..96ebcf76b1 100644
--- a/ecrire/inc/commencer_page.php
+++ b/ecrire/inc/commencer_page.php
@@ -219,7 +219,7 @@ function init_body($rubrique='accueil', $sous_rubrique='accueil', $id_rubrique='
$res .= bandeau_gadgets($largeur, $options, $id_rubrique)
. "</div>"
- . "</div>";
+ . "</div>\n";
if ($options != "avancees") $res .= "<div style='height: 18px;'> </div>";
return $res;
diff --git a/ecrire/inc/gadgets.php b/ecrire/inc/gadgets.php
index c0f0f2986c..0f64aff146 100644
--- a/ecrire/inc/gadgets.php
+++ b/ecrire/inc/gadgets.php
@@ -303,8 +303,8 @@ onmouseover=\"findObj_forcer('bandeautoutsite').style.visibility='visible'; char
. ">"
._T('icone_site_entier')
. "</a>"
- . "<div id='nav-recherche'></div>"
- . "<div id='gadget-rubriques'></div>"
+ . "\n<div id='nav-recherche'></div>"
+ . "\n<div id='gadget-rubriques'></div>"
. "</div>";
// FIN GADGET Menu rubriques
@@ -312,14 +312,14 @@ onmouseover=\"findObj_forcer('bandeautoutsite').style.visibility='visible'; char
// GADGET Navigation rapide
$bandeau .= "<div id='bandeaunavrapide' class='bandeau bandeau_couleur_sous' style='$spip_lang_left: 30px;'>"
. "<a href='" . generer_url_ecrire("brouteur", ($id_rubrique ? "id_rubrique=$id_rubrique" : '')) . "' class='lien_sous'>" . _T('icone_brouteur') . "</a>"
- . "<div id='gadget-navigation'></div>\n"
+ . "\n<div id='gadget-navigation'></div>\n"
. "</div>\n";
// FIN GADGET Navigation rapide
// GADGET Recherche
// attribut non conforme ==> le generer dynamiquement
$js = 'this.setAttribute(\'autocomplete\', \'off\')';
- $bandeau .= "<div id='bandeaurecherche' class='bandeau bandeau_couleur_sous' style='$spip_lang_left: 60px;'>"
+ $bandeau .= "\n<div id='bandeaurecherche' class='bandeau bandeau_couleur_sous' style='$spip_lang_left: 60px;'>"
. "<form method='get' style='margin: 0px; position: relative;' action='"
. generer_url_ecrire("recherche")
. "'>"
@@ -337,7 +337,7 @@ onmouseover=\"findObj_forcer('bandeautoutsite').style.visibility='visible'; char
. _T('icone_agenda')
. "</a>"
- . "<div id='gadget-agenda'></div>\n"
+ . "\n<div id='gadget-agenda'></div>\n"
. "</div>\n";
// FIN GADGET Agenda
@@ -347,7 +347,7 @@ onmouseover=\"findObj_forcer('bandeautoutsite').style.visibility='visible'; char
$gadget .= "<a href='" . generer_url_ecrire("messagerie") . "' class='lien_sous'>";
$gadget .= _T('icone_messagerie_personnelle');
$gadget .= "</a>";
- $gadget .= "<div id='gadget-messagerie'></div>\n";
+ $gadget .= "\n<div id='gadget-messagerie'></div>\n";
$gadget .= "</div>";
$bandeau .= $gadget;
@@ -360,11 +360,11 @@ onmouseover=\"findObj_forcer('bandeautoutsite').style.visibility='visible'; char
$bandeau .= "<a href='" . generer_url_ecrire("synchro") . "' class='lien_sous'>";
$bandeau .= _T('icone_suivi_activite');
$bandeau .= "</a>";
- $bandeau .= "<div id='gadget-suivi'></div>\n";
+ $bandeau .= "\n<div id='gadget-suivi'></div>\n";
$bandeau .= "</div>";
// Infos perso
- $bandeau .= "<div id='bandeauinfoperso' class='bandeau bandeau_couleur_sous' style='$spip_lang_left: 200px;'>";
+ $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>";
@@ -375,20 +375,20 @@ onmouseover=\"findObj_forcer('bandeautoutsite').style.visibility='visible'; char
// -------- Affichage de droite ----------
// Deconnection
- $bandeau .= "<div class='bandeau bandeau_couleur_sous' id='bandeaudeconnecter' style='$spip_lang_right: 0px;'>";
+ $bandeau .= "\n<div class='bandeau bandeau_couleur_sous' id='bandeaudeconnecter' style='$spip_lang_right: 0px;'>";
$bandeau .= "<a href='" . generer_url_action("logout","logout=prive") . "' class='lien_sous'>"._T('icone_deconnecter')."</a>".aide("deconnect");
$bandeau .= "</div>";
$decal = 0;
$decal = $decal + 150;
- $bandeau .= "<div id='bandeauinterface' class='bandeau bandeau_couleur_sous' style='$spip_lang_right: ".$decal."px; text-align: $spip_lang_right;'>";
+ $bandeau .= "\n<div id='bandeauinterface' class='bandeau bandeau_couleur_sous' style='$spip_lang_right: ".$decal."px; text-align: $spip_lang_right;'>";
$bandeau .= _T('titre_changer_couleur_interface');
$bandeau .= "</div>";
$decal = $decal + 70;
- $bandeau .= "<div id='bandeauecran' class='bandeau bandeau_couleur_sous' style='$spip_lang_right: ".$decal."px; text-align: $spip_lang_right;'>";
+ $bandeau .= "\n<div id='bandeauecran' class='bandeau bandeau_couleur_sous' style='$spip_lang_right: ".$decal."px; text-align: $spip_lang_right;'>";
if ($spip_ecran == "large")
$bandeau .= "<div><a href='".parametre_url(self(),'set_ecran', 'etroit')."' class='lien_sous'>"._T('info_petit_ecran')."</a>/<b>"._T('info_grand_ecran')."</b></div>";
else
@@ -399,11 +399,11 @@ onmouseover=\"findObj_forcer('bandeautoutsite').style.visibility='visible'; char
// En interface simplifiee, afficher en permanence l'indication de l'interface
if ($options != "avancees") {
- $bandeau .= "<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 .= "\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>";
+ $bandeau .= "</div>\n";
}
- $bandeau .= "<div id='bandeaudisplay' class='bandeau bandeau_couleur_sous' style='$spip_lang_right: ".$decal."px; text-align: $spip_lang_right;'>";
+ $bandeau .= "\n<div id='bandeaudisplay' class='bandeau bandeau_couleur_sous' style='$spip_lang_right: ".$decal."px; text-align: $spip_lang_right;'>";
if ($options != 'avancees') {
$bandeau .= "<b>"._T('icone_interface_simple')."</b>/<a href='".parametre_url(self(),'set_options', 'avancees')."' class='lien_sous'>"._T('icone_interface_complet')."</a>";
@@ -412,12 +412,12 @@ onmouseover=\"findObj_forcer('bandeautoutsite').style.visibility='visible'; char
}
if ($options != "avancees") {
- $bandeau .= "<div> </div><div style='width: 250px; text-align: $spip_lang_left;'>"._T('texte_actualite_site_1')."<a href='./?set_options=avancees'>"._T('texte_actualite_site_2')."</a>"._T('texte_actualite_site_3')."</div>";
+ $bandeau .= "<div> </div><div style='width: 250px; text-align: $spip_lang_left;'>"._T('texte_actualite_site_1')."<a href='./?set_options=avancees'>"._T('texte_actualite_site_2')."</a>"._T('texte_actualite_site_3')."</div>\n";
}
$bandeau .= "</div>";
$bandeau .= "</div>";
- $bandeau .= "</td></tr></table>";
+ $bandeau .= "</td></tr></table>\n";
$bandeau .= '</div>';
diff --git a/ecrire/inc/iconifier.php b/ecrire/inc/iconifier.php
index 90b26f8808..dd6168f063 100644
--- a/ecrire/inc/iconifier.php
+++ b/ecrire/inc/iconifier.php
@@ -35,7 +35,7 @@ function inc_iconifier_dist($id_objet, $id, $script, $iframe_script='') {
} else {
list($img, $clic) = decrire_logo($id_objet,'on',$id, 170, 170, $logo, $texteon, $script);
- $masque = block_parfois_visible('on', "<b>$texteon</b><p>$img</p>", $clic, 'margin-bottom: -2px');
+ $masque = block_parfois_visible('on', "<b>$texteon</b><br />$img", $clic, 'margin-bottom: -2px');
$res = "<center>$masque</center><br /><br />";;
$texteoff = _T('logo_survol');
@@ -44,7 +44,7 @@ function inc_iconifier_dist($id_objet, $id, $script, $iframe_script='') {
list($img, $clic) = decrire_logo($id_objet, 'off', $id, 170, 170, $logo, $texteoff, $script);
- $masque = block_parfois_visible('off', "<b>$texteoff</b><p>$img</p>", $clic, 'margin-bottom: -2px');
+ $masque = block_parfois_visible('off', "<b>$texteoff</b><br />$img", $clic, 'margin-bottom: -2px');
$res .= "<center>$masque</center>";
} else {
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index 11b61b36f6..d2840204c5 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -230,12 +230,12 @@ function fin_cadre_trait_couleur($return = false){
//
// http://doc.spip.org/@debut_boite_alerte
function debut_boite_alerte() {
- return "<p><table cellpadding='6' border='0'><tr><td width='100%' bgcolor='red'><table width='100%' cellpadding='12' border='0'><tr><td width='100%' bgcolor='white'>";
+ return "<table cellpadding='6' border='0'><tr><td width='100%' bgcolor='red'><table width='100%' cellpadding='12' border='0'><tr><td width='100%' bgcolor='white'>";
}
// http://doc.spip.org/@fin_boite_alerte
function fin_boite_alerte() {
- return "</td></tr></table></td></tr></table></p>";
+ return "</td></tr></table></td></tr></table>";
}
--
GitLab