diff --git a/ecrire/exec/accueil.php b/ecrire/exec/accueil.php
index 8b070209bb5e5f0d6e57d7a34e6b93a40f2072e8..ebf41f886c5077f04b9967498481de3ca1eed71d 100644
--- a/ecrire/exec/accueil.php
+++ b/ecrire/exec/accueil.php
@@ -17,11 +17,8 @@ include_spip('inc/presentation');
// http://doc.spip.org/@encours_accueil
function encours_accueil()
{
- global $connect_statut, $connect_toutes_rubriques, $connect_id_auteur;
+ global $connect_toutes_rubriques;
- $res = '';
-
- //
// Les articles a valider
//
@@ -43,13 +40,13 @@ function encours_accueil()
//
// Les sites a probleme
//
- if ($GLOBALS['meta']['activer_sites'] != 'non' AND $connect_statut == '0minirezo' AND $connect_toutes_rubriques) {
+ if ($GLOBALS['meta']['activer_sites'] != 'non' AND $connect_toutes_rubriques) {
include_spip('inc/sites_voir');
$res .= afficher_sites(afficher_plus(generer_url_ecrire('sites_tous')). '<b>' . _T('avis_sites_syndiques_probleme') . '</b>', array('FROM' => 'spip_syndic', 'WHERE' => "(syndication='off' OR syndication='sus') AND statut='publie'", 'ORDER BY' => 'nom_site'));
}
// Les articles syndiques en attente de validation
- if ($connect_statut == '0minirezo' AND $connect_toutes_rubriques) {
+ if ($connect_toutes_rubriques) {
$cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_syndic_articles WHERE statut='dispo'"));
if ($cpt = $cpt['n'])
$res .= "<br /><small><a href='"
@@ -115,15 +112,13 @@ if ($spip_display == 4) {
$res = "<div class='verdana11'>"._T('info_ecrire_article')."</div>";
}
}
- if ($connect_statut == '0minirezo' and $connect_toutes_rubriques) {
+ if ($connect_toutes_rubriques) {
$res .= icone_horizontale(_T('icone_creer_rubrique_2'), generer_url_ecrire("rubriques_edit","new=oui"), "rubrique-24.gif","creer.gif", false);
}
echo bloc_des_raccourcis($res);
} else {
- $gadget = "";
-
- $gadget = "<center><table><tr>";
+ $gadget = '';
if ($id_rubrique > 0) {
$dans_rub = "&id_rubrique=$id_rubrique";
@@ -154,13 +149,12 @@ if ($spip_display == 4) {
}
}
- }
- $gadget .= "</tr></table></center>\n";
-
+ }
+ $gadget = "<table><tr>$gadget</tr></table>\n";
if ($connect_statut != "0minirezo") {
- $gadget .= "<center><table><tr>";
+ $gadget .= "<table><tr>";
$cpt = spip_fetch_array(spip_query("SELECT COUNT(*) AS n FROM spip_articles AS art, spip_auteurs_articles AS lien WHERE lien.id_auteur = '$connect_id_auteur' AND art.id_article = lien.id_article LIMIT 1"));
if ($cpt['n'] > 0) {
@@ -186,7 +180,7 @@ if ($spip_display == 4) {
$gadget .= icone_horizontale (_T('icone_sites_references'), generer_url_ecrire("sites_tous",""), "site-24.gif", "", false);
$gadget .= "</td>";
}
- $gadget .= "</tr></table></center>\n";
+ $gadget .= "</tr></table>\n";
}
}
diff --git a/ecrire/inc/boutons.php b/ecrire/inc/boutons.php
index b6abe9a8c82938607dd3319ee6dd25fca09199c8..e0f7e00ae2b4f1e3e53337c1bf1490f2bae7131a 100644
--- a/ecrire/inc/boutons.php
+++ b/ecrire/inc/boutons.php
@@ -359,7 +359,7 @@ function bandeau_principal($rubrique, $sous_rubrique, $largeur)
}
}
- return "<div class='bandeau-icones'>\n<table width='$largeur' cellpadding='0' cellspacing='0' border='0' align='center'><tr>\n$res</tr></table></div>\n";
+ return "<div class='bandeau-icones'>\n<table width='$largeur' cellpadding='0' cellspacing='0' border='0'><tr>\n$res</tr></table></div>\n";
}
// http://doc.spip.org/@icone_bandeau_principal
@@ -467,7 +467,7 @@ function bandeau_double_rangee($rubrique, $sous_rubrique, $largeur)
. "<div id='haut-page'>"
. "<div id='bandeau-principal' align='center'>\n"
. bandeau_principal($rubrique, $sous_rubrique, $largeur)
- . "<table width='$largeur' cellpadding='0' cellspacing='0' align='center'><tr><td>"
+ . "<table width='$largeur' cellpadding='0' cellspacing='0'><tr><td>"
. "<div style='text-align: $spip_lang_left; width: ".$largeur."px; position: relative; z-index: 2000;'>"
. bandeau_principal2($rubrique, $sous_rubrique, $largeur)
. "</div>"
diff --git a/ecrire/inc/commencer_page.php b/ecrire/inc/commencer_page.php
index 0e446dd84b19d4afd1d8a59adbfb31a5ee9889d8..82de0ebf337e7118560acf7a616440a62e9081c3 100644
--- a/ecrire/inc/commencer_page.php
+++ b/ecrire/inc/commencer_page.php
@@ -110,7 +110,7 @@ function init_body($rubrique='accueil', $sous_rubrique='accueil', $id_rubrique='
} else $style = "background-color: $couleur_claire";
$res .= "\n<div align='center' style=\"max-height: 40px; width: 100%; border-bottom: solid 1px white;$style\">"
- . "<table align='center' cellpadding='0' style='background: none;' width='$largeur'><tr>"
+ . "<table cellpadding='0' style='background: none;' width='$largeur'><tr>"
. "<td valign='middle' class='bandeau_couleur' style='text-align: $spip_lang_left;'>"
. "<a href='" . generer_url_ecrire("articles_tous") . "' class='icone26' onmouseover=\"changestyle('bandeautoutsite');\" onfocus=\"changestyle('bandeautoutsite');\" onblur=\"changestyle('bandeautoutsite');\">"
. http_img_pack("tout-site.png", _T('icone_site_entier'), "width='26' height='20'") . "</a>";
diff --git a/ecrire/inc/formater_article.php b/ecrire/inc/formater_article.php
index c740433486acd9061bb33676ad17531a9ebf2466..3bf515c18e5c9ed9814caa5b4d810c9bef5d2a0e 100644
--- a/ecrire/inc/formater_article.php
+++ b/ecrire/inc/formater_article.php
@@ -70,8 +70,8 @@ function inc_formater_article_dist($row)
. (acces_restreint_rubrique($id_rubrique) ? $img_admin : '')
. typo($titre)
. (!($afficher_langue AND $lang != $GLOBALS['meta']['langue_site']) ? '' :
- (" <font size='1' color='#666666'$dir_lang>(".traduire_nom_langue($lang).")</font>"))
- . (!$row['petition'] ? '' : (" <font size='1' color='red'>"._T('lien_petitions')."</font>"))
+ (" <span style='font-size: 10px; color: #666666'$dir_lang>(".traduire_nom_langue($lang).")</span>"))
+ . (!$row['petition'] ? '' : (" <span style='font-size: 10px; color: red'>"._T('lien_petitions')."</span>"))
. "</a>"
. "</div>";
diff --git a/ecrire/inc/gadgets.php b/ecrire/inc/gadgets.php
index d09384bc309f4cb4d83a264b6ed34b8beedfa4ca..ce1185a6c48c2a5c99b4ae61554432017dcf1916 100644
--- a/ecrire/inc/gadgets.php
+++ b/ecrire/inc/gadgets.php
@@ -290,7 +290,7 @@ function bandeau_gadgets($largeur, $options, $id_rubrique) {
global $connect_id_auteur, $connect_login, $connect_statut, $couleur_claire,$couleur_foncee, $spip_lang_left, $spip_lang_right, $spip_ecran;
$bandeau = "<div id='bandeau-gadgets'>".
- "\n<table width='$largeur' cellpadding='0' cellspacing='0' align='center'><tr><td>\n<div style='position: relative; z-index: 1000;'>"
+ "\n<table width='$largeur' cellpadding='0' cellspacing='0'><tr><td>\n<div style='position: relative; z-index: 1000;'>"
// GADGET Menu rubriques
. "\n<div id='bandeautoutsite' class='bandeau bandeau_couleur_sous' style='$spip_lang_left: 0px;'>"
diff --git a/ecrire/inc/iconifier.php b/ecrire/inc/iconifier.php
index dd6168f06352230551d44692ea50a68fa645f60c..cc6ebefdc72f1d3f13bc3c49c98aee9b49d9a713 100644
--- a/ecrire/inc/iconifier.php
+++ b/ecrire/inc/iconifier.php
@@ -37,7 +37,7 @@ function inc_iconifier_dist($id_objet, $id, $script, $iframe_script='') {
$masque = block_parfois_visible('on', "<b>$texteon</b><br />$img", $clic, 'margin-bottom: -2px');
- $res = "<center>$masque</center><br /><br />";;
+ $res = "<div style='text-align: center'>$masque</div><br /><br />";;
$texteoff = _T('logo_survol');
if ($logo = $chercher_logo($id, $id_objet, 'off')) {
@@ -46,7 +46,7 @@ function inc_iconifier_dist($id_objet, $id, $script, $iframe_script='') {
$masque = block_parfois_visible('off', "<b>$texteoff</b><br />$img", $clic, 'margin-bottom: -2px');
- $res .= "<center>$masque</center>";
+ $res .= "<div style='text-align: center'>$masque</div>";
} else {
$masque = indiquer_logo($texteoff, $id_objet, 'off', $id, $script, $iframe);
$res .= block_parfois_visible('off', "<b>$texteoff</b>", $masque);
@@ -147,10 +147,10 @@ function decrire_logo($id_objet, $mode, $id, $width, $height, $img, $titre="", $
$taille = _T('info_largeur_vignette', array('largeur_vignette' => $taille[0], 'hauteur_vignette' => $taille[1]));
return array($res,
- "<font size='1'>" .
+ "<div style='font-size: 1Opx;'>" .
$taille .
"\n<br />[" .
ajax_action_auteur("iconifier", "$id-$nom.$format", $script, "$id_objet=$id&type=$id_objet", array(_T('lien_supprimer')),'',"function(r,noeud) {noeud.innerHTML = r; \$('.form_upload_icon',noeud).async_upload(async_upload_icon);}") .
- "]</font>");
+ "]</div>");
}
?>
diff --git a/ecrire/inc/instituer_article.php b/ecrire/inc/instituer_article.php
index d72a3473362129ba615c307e3084c1722cc9a5e0..5ac8e0d13d3a5ec959540a6ba1b7414ca95d80d2 100644
--- a/ecrire/inc/instituer_article.php
+++ b/ecrire/inc/instituer_article.php
@@ -18,8 +18,7 @@ function inc_instituer_article_dist($id_article, $statut=-1)
if ($statut == -1) return demande_publication($id_article);
$res =
- "\n<div id='instituer_article-$id_article'>" .
- "\n<center>" .
+ "\n<div style='text-align: center;' id='instituer_article-$id_article'>" .
"<b>" .
_T('texte_article_statut') .
"</b>" .
@@ -41,8 +40,7 @@ function inc_instituer_article_dist($id_article, $statut=-1)
"<span class='visible_au_chargement' id='valider_statut'>" .
"<input type='submit' value='"._T('bouton_valider')."' class='fondo' />" .
"</span>" .
- aide("artstatut") .
- "</center>"
+ aide("artstatut")
. '</div>';
return redirige_action_auteur('instituer_article',$id_article,'articles', "id_article=$id_article", $res, " method='post'");
@@ -53,7 +51,7 @@ function inc_instituer_article_dist($id_article, $statut=-1)
function demande_publication($id_article)
{
return debut_cadre_relief('',true) .
- "<center>" .
+ "<div style='text-align: center'>" .
"<b>" ._T('texte_proposer_publication') . "</b>" .
aide ("artprop") .
redirige_action_auteur('instituer_article', "$id_article-prop",
@@ -63,7 +61,7 @@ function demande_publication($id_article)
_T('bouton_demande_publication') .
"\" />\n"),
"method='post'") .
- "</center>" .
+ "</div>" .
fin_cadre_relief(true);
}
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index b7705314132a875095012aa6b31b8d8e21dd862c..8d90e1ec8173d1c4e4e141706d4f75ab51f48e95 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -833,7 +833,7 @@ function afficher_articles_trad_boucle($row)
$s .= typo($titre);
if ($afficher_langue AND $lang != $langue_defaut)
- $s .= " <font size='1' color='#666666'$dir_lang>(".traduire_nom_langue($lang).")</font>";
+ $s .= " <span style='font-size: 10px; color: #666666'$dir_lang>(".traduire_nom_langue($lang).")</span>";
$s .= "</a>";
$s .= "</div>";
@@ -919,7 +919,7 @@ function afficher_breves_boucle($row, &$tous_id, $voir_logo, $own)
$s .= typo($titre);
if ($afficher_langue AND $lang != $langue_defaut)
- $s .= " <font size='1' color='#666666'$dir_lang>(".traduire_nom_langue($lang).")</font>";
+ $s .= " <span style='font-size: 10px; color: #666666'$dir_lang>(".traduire_nom_langue($lang).")</span>";
$s .= "</a>";
$s .= "</div>";
@@ -980,7 +980,7 @@ function afficher_rubriques_boucle($row, &$tous_id)
$s .= "</a>";
$vals[] = $s;
- $s = "\n<div align=\"right\">";
+ $s = "\n<div style='text-align: right'>";
if ($GLOBALS['meta']['multi_rubriques'] == 'oui') {
if ($langue_choisie == "oui") $s .= "<b>$lang</b>";
else $s .= "($lang)";
@@ -1753,7 +1753,7 @@ function fin_page()
. '</div>'))
. fin_grand_cadre(true)
- . "</div>" // cf. <div center> ouverte dans conmmencer_page()
+ . "</div>" // cf. div align = center ouverte dans conmmencer_page()
. $GLOBALS['rejoue_session']
. '<div style="background-image: url(\''
. generer_url_action('cron')
@@ -1927,9 +1927,9 @@ function enfant_rub($collection){
http_img_pack("admin-12.gif", '', " width='12' height='12'", _T('image_administrer_rubrique'))) .
" <span dir='$lang_dir'><b><a href='" .
generer_url_ecrire("naviguer","id_rubrique=$id_rubrique") .
- "'><font color='$couleur_foncee'>".
+ "'>".
typo($titre) .
- "</font></a></b></span>" .
+ "</a></b></span>" .
(!$descriptif ? '' : "\n<div class='verdana1'>$descriptif</div>") .
(($spip_display == 4) ? '' : $les_sous_enfants) .
"\n<div style='clear:both;'></div>" .
diff --git a/ecrire/inc/sites_voir.php b/ecrire/inc/sites_voir.php
index 310ada6281219632782ecbff0c2a9896939b28ee..6e951238ffd8516f12457b1feff0979d9708b5e1 100644
--- a/ecrire/inc/sites_voir.php
+++ b/ecrire/inc/sites_voir.php
@@ -83,16 +83,16 @@ function afficher_sites_boucle($row, &$tous_id, $voir_logo, $bof)
$s .= typo($nom_site);
- $s .= "</a> <font size='1'>[<a href='$url_site'>"._T('lien_visite_site')."</a>]</font>";
+ $s .= "</a> <span style='font-size: 11px;'>[<a href='$url_site'>"._T('lien_visite_site')."</a>]</span>";
$vals[] = $s;
$s = "";
if ($syndication == 'off' OR $syndication == 'sus') {
- $s .= "<font color='red'>"._T('info_probleme_grave')." </font>";
+ $s .= "<span style='color: red;'>"._T('info_probleme_grave')." </span>";
}
if ($syndication == "oui" or $syndication == "off" OR $syndication == 'sus'){
- $s .= "<font color='red'>"._T('info_syndication')."</font>";
+ $s .= "<span style='color: red;'>"._T('info_syndication')."</span>";
}
$vals[] = $s;