diff --git a/ecrire/exec/admin_effacer.php b/ecrire/exec/admin_effacer.php
index 4c87f036e14cabf7cc54bdfc7e02be518d024bab..2b5406a1efdf1f3bda7a431a5daab6d7b00f7e42 100644
--- a/ecrire/exec/admin_effacer.php
+++ b/ecrire/exec/admin_effacer.php
@@ -14,83 +14,65 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
include_spip('inc/presentation');
-// http://doc.spip.org/@exec_admin_effacer_dist
-function exec_admin_effacer_dist()
-{
- global $connect_statut, $connect_toutes_rubriques, $couleur_foncee;
-
-$commencer_page = charger_fonction('commencer_page', 'inc');
-echo $commencer_page(_T('titre_page_admin_effacer'), "configuration", "base");
-
-
-echo "\n<br /><br /><br />";
-gros_titre(_T('titre_admin_effacer'));
-echo barre_onglets("administration", "effacer");
-
-
-debut_gauche();
-
-debut_boite_info();
-
-echo _T('info_gauche_admin_effacer');
-
-fin_boite_info();
-
-debut_droite();
-
-if ($connect_statut != '0minirezo' OR !$connect_toutes_rubriques) {
- echo _T('avis_non_acces_page');
- echo fin_gauche(), fin_page();
- exit;
-}
-
-
-
//
// Effacement total
//
-debut_cadre_relief();
-
-echo "\n<table border='0' cellspacing='1' cellpadding='8' width=\"100%\">";
-echo "<tr><td bgcolor='$couleur_foncee' background=''><b>";
-echo "<span style='font-size: 16px; color: #FFFFFF;' class='verdana1'>". _T('texte_effacer_base')."</span></b></td></tr>";
-
-echo "<tr><td class='serif'>";
-
-echo "\n<p align='justify'>\n";
-echo '<img src="' . _DIR_IMG_PACK . 'warning.gif" alt="'._T('info_avertissement').'" width="48" height="48" align="right" />';
-echo _T('texte_admin_effacer_01');
-
-echo "\n<center>";
+// http://doc.spip.org/@exec_admin_effacer_dist
+function exec_admin_effacer_dist()
+{
-echo debut_boite_alerte();
+ global $connect_statut, $connect_toutes_rubriques, $couleur_foncee;
-echo "\n<div class='serif'>";
-echo "\n<b>"._T('avis_suppression_base')." !</b>";
+ $commencer_page = charger_fonction('commencer_page', 'inc');
+ echo $commencer_page(_T('titre_page_admin_effacer'), "configuration", "base");
- echo generer_url_post_ecrire("delete_all", "reinstall=non"),
- "\n<div align='right'>",
- "<input class='fondo' type='submit' value='",
- _T('bouton_effacer_tout'),
- "' /></div></form>",
- "\n</div>";
-echo fin_boite_alerte();
+ echo "\n<br /><br /><br />";
+ gros_titre(_T('titre_admin_effacer'));
+ echo barre_onglets("administration", "effacer");
-echo "</center></p>";
+ debut_gauche();
+ debut_boite_info();
-echo "</td></tr>";
-echo "</table>";
+ echo _T('info_gauche_admin_effacer');
-fin_cadre_relief();
+ fin_boite_info();
+ debut_droite();
-echo "<br />";
+ if ($connect_statut != '0minirezo' OR !$connect_toutes_rubriques) {
+ echo _T('avis_non_acces_page');
+ echo fin_gauche(), fin_page();
+ exit;
+ }
+ debut_cadre_relief();
+ echo "<table border='0' cellspacing='1' cellpadding='8' width='100%'>",
+ "<tr><td style='background-color: $couleur_foncee; font-weight: bold; font-size: 16px; color: #FFFFFF;' class='verdana1'>",
+ _T('texte_effacer_base'),
+ "</td></tr>",
+ "<tr><td class='serif'>\n",
+ '<img src="' . _DIR_IMG_PACK . 'warning.gif" alt="'._T('info_avertissement').'" width="48" height="48" align="right" />',
+ _T('texte_admin_effacer_01'),
+ "\n<div style='text-align: center'>",
+ debut_boite_alerte(),
+ "\n<div class='serif'>",
+ "\n<b>"._T('avis_suppression_base')." !</b>",
+ generer_url_post_ecrire("delete_all", "reinstall=non"),
+ "\n<div style='text-align: right'>",
+ "<input class='fondo' type='submit' value='",
+ _T('bouton_effacer_tout'),
+ "' /></div></form>",
+ "\n</div>",
+ fin_boite_alerte(),
+ "</div>",
+ "</td></tr>",
+ "</table>";
+ fin_cadre_relief();
-echo fin_gauche(), fin_page();
+ echo fin_gauche(), fin_page();
}
?>
diff --git a/ecrire/exec/aide_index.php b/ecrire/exec/aide_index.php
index bb3f67e6b9dacafba51e99bb284932ae66d00aee..015af209deb618b29e113a7f5dffa73342836856 100644
--- a/ecrire/exec/aide_index.php
+++ b/ecrire/exec/aide_index.php
@@ -148,13 +148,13 @@ function help_body($aide, $html, $lang_aide='') {
}
} else {
// panneau d'accueil
- $html = '<center>
+ $html = '<div align="center">
<img src="'._DIR_IMG_PACK.
'logo-spip.gif" alt="SPIP" width="267" height="170" border="0" />
- <p />
+ <br />
<div align="center" style="font-variant: small-caps;">
Système de publication pour l\'Internet
- </div></center>
+ </div></div>
<div style="position:absolute; bottom: 10px; right:20px;
font-size: 12px; ">'.
preg_replace(",<a ,i", "<a class='target_blank' ",_T('info_copyright_doc')).
@@ -197,10 +197,8 @@ jQuery(function(){
echo '<table border="0" width="100%" height="60%">
<tr style="width: 100%" height="60%">
<td style="width: 100%" height="60%" align="center" valign="middle">
-<center>
<img src="', generer_url_ecrire("aide_index", "img=AIDE--logo-spip.gif", false, true),
'" alt="SPIP" width="300" height="170" border="0" />
-</center>
</td></tr></table>';
}
diff --git a/ecrire/exec/articles_ortho.php b/ecrire/exec/articles_ortho.php
index 84a0b1fb93187cc1bc5552b76b610dbb778d9695..1d1e1cccaada15337923b3919cf0d2096db5deb1 100644
--- a/ecrire/exec/articles_ortho.php
+++ b/ecrire/exec/articles_ortho.php
@@ -207,7 +207,8 @@ echo "\n\n<div align='justify'>";
if ($virtuel) {
debut_boite_info();
- echo _T('info_renvoi_article')." ".propre("<center>[->$virtuel]</center>");
+ echo _T('info_renvoi_article'),
+ propre("<span style='text-align: center'> [->$virtuel]</span>");
fin_boite_info();
}
else {
diff --git a/ecrire/exec/articles_versions.php b/ecrire/exec/articles_versions.php
index a8d54e85f5dc807a52edcf4616244c1e21595380..751e9b2744c02d62917bea44e7fd1d30fff5bdcb 100644
--- a/ecrire/exec/articles_versions.php
+++ b/ecrire/exec/articles_versions.php
@@ -22,20 +22,22 @@ function exec_articles_versions_dist()
{
include_spip('inc/suivi_versions');
- global $champs_extra, $chapo, $descriptif, $dir_lang, $id_article, $id_diff, $id_version, $les_notes, $nom_site, $options, $ps, $soustitre, $surtitre, $texte, $titre, $url_site;
+ global $champs_extra, $chapo, $descriptif, $dir_lang, $id_article, $id_diff, $id_version, $les_notes, $nom_site, $options, $ps, $soustitre, $surtitre, $texte, $titre, $url_site;
//
// Lire l'article
//
- if(!autoriser('voirrevisions', 'article', $id_article))
- return;
+ $id_article = intval($id_article);
+ $row = spip_fetch_array(spip_query("SELECT * FROM spip_articles WHERE id_article='$id_article'"));
- $id_article = intval($id_article);
- $result = spip_query("SELECT * FROM spip_articles WHERE id_article='$id_article'");
+ if(!(autoriser('voirrevisions', 'article', $id_article) AND $row)) {
+ include_spip('minipres');
+ echo minipres();
+ exit;
+ }
-if ($row = spip_fetch_array($result)) {
$id_article = $row["id_article"];
$id_rubrique = $row["id_rubrique"];
$titre = $row["titre"];
@@ -47,27 +49,25 @@ if ($row = spip_fetch_array($result)) {
$referers = $row["referers"];
$extra = $row["extra"];
$id_trad = $row["id_trad"];
-}
-if (!($id_version = intval($id_version))) {
- $id_version = $row['id_version'];
-}
-$id_diff = intval($id_diff);
-
-$textes = revision_comparee($id_article, $id_version, 'complet', $id_diff);
-foreach ($textes as $var => $t) $$var = $t;
+ if (!($id_version = intval($id_version))) {
+ $id_version = $row['id_version'];
+ }
+ $id_diff = intval($id_diff);
+ $textes = revision_comparee($id_article, $id_version, 'complet', $id_diff);
+ if (is_array($textes)) foreach ($textes as $var => $t) $$var = $t;
-$commencer_page = charger_fonction('commencer_page', 'inc');
-echo $commencer_page(_T('info_historique')." « $titre »", "naviguer", "articles", $id_rubrique);
-debut_grand_cadre();
+ $commencer_page = charger_fonction('commencer_page', 'inc');
+ echo $commencer_page(_T('info_historique')." « $titre »", "naviguer", "articles", $id_rubrique);
-echo afficher_hierarchie($id_rubrique);
+ debut_grand_cadre();
-fin_grand_cadre();
+ echo afficher_hierarchie($id_rubrique);
+ fin_grand_cadre();
//////////////////////////////////////////////////////
@@ -219,7 +219,8 @@ if ($id_version) {
if ($virtuel) {
debut_boite_info();
- echo _T('info_renvoi_article')." ".propre("<center>[->$virtuel]</center>");
+ echo _T('info_renvoi_article'),
+ propre("<span style='text-align: center'> [->$virtuel]</span>");
fin_boite_info();
}
else {
diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php
index a0cf16b6130d13979b6da0f332a81fc9571ead86..e48ff6f6d452800a0b4ab171f15c1b11c98b6532 100644
--- a/ecrire/exec/breves_voir.php
+++ b/ecrire/exec/breves_voir.php
@@ -177,10 +177,10 @@ function afficher_breves_voir($id_breve, $cherche_mot, $select_groupe)
echo "</td></tr></table>";
echo debut_block_invisible('languesbreve');
- echo "<center>";
+ echo "<div style='text-align: center'>";
$menu = menu_langues('changer_lang', $langue_breve, '', $langue_parent,'ajax');
echo redirige_action_auteur('editer_breve', "$id_breve/$id_rubrique", "breves_voir","id_breve=$id_breve", $menu);
- echo "</center>\n";
+ echo "</div>\n";
echo fin_block();
fin_cadre_enfonce();
diff --git a/ecrire/exec/configuration.php b/ecrire/exec/configuration.php
index 268361efbc1f41fa57da9732721274f007e3a5a4..d7eb39e7907be0aaae86a894c31580e7718a17a7 100644
--- a/ecrire/exec/configuration.php
+++ b/ecrire/exec/configuration.php
@@ -407,11 +407,11 @@ else $style = "display: none;";
echo "\n<table border='0' cellspacing='1' cellpadding='3' width=\"100%\">";
echo "\n<tr><td style='font-size: 11px; color: #000000' class='verdana1'>";
echo _T('info_question_proposer_site');
- echo "\n<center><select name='proposer_sites' class='fondo' size='1'>\n";
- echo "<option".mySel('0',$proposer_sites).">"._T('item_choix_administrateurs')."</option>\n";
- echo "<option".mySel('1',$proposer_sites).">"._T('item_choix_redacteurs')."</option>\n";
- echo "<option".mySel('2',$proposer_sites).">"._T('item_choix_visiteurs')."</option>\n";
- echo "</select></center>\n";
+ echo "\n<div style='text-align: center'><select name='proposer_sites' class='fondo' size='1'>\n";
+ echo "<option".mySel('0',$proposer_sites).">"._T('item_choix_administrateurs')."</option>\n";
+ echo "<option".mySel('1',$proposer_sites).">"._T('item_choix_redacteurs')."</option>\n";
+ echo "<option".mySel('2',$proposer_sites).">"._T('item_choix_visiteurs')."</option>\n";
+ echo "</select></div>\n";
echo "</td></tr></table>\n";
fin_cadre_relief();
diff --git a/ecrire/exec/sites.php b/ecrire/exec/sites.php
index b5b6f3608e33e2fe3b0a1dacd38f4bfa47e8c22b..fe32ca5e376767fd89ff9775df5ff89ca889d698 100644
--- a/ecrire/exec/sites.php
+++ b/ecrire/exec/sites.php
@@ -142,9 +142,9 @@ debut_gauche();
fin_boite_info();
-echo "<br /><center>";
+echo "<br /><div align='center'>";
icone (_T('icone_voir_sites_references'), generer_url_ecrire("sites_tous",""), "site-24.gif","rien.gif");
-echo "</center>";
+echo "</div>";
if ($id_syndic AND $flag_administrable AND ($spip_display != 4)) {
$iconifier = charger_fonction('iconifier', 'inc');
@@ -159,7 +159,6 @@ debut_droite();
debut_cadre_relief("site-24.gif");
-echo "<center>";
if ($syndication == 'off' OR $syndication == 'sus') {
$logo_statut = "puce-orange-anim.gif";
@@ -174,13 +173,14 @@ else if ($statut == 'refuse') {
$logo_statut = "puce-rouge.gif";
}
-echo "\n<table cellpadding='0' cellspacing='0' border='0' width='100%'>";
-echo "<tr><td style='width: 100%' valign='top'>";
- gros_titre($nom_site, $logo_statut);
-
$url_affichee = $url_site;
if (strlen($url_affichee) > 40) $url_affichee = substr($url_affichee, 0, 30)."...";
+
+echo "<div style='text-align: center;'>";
+echo "\n<table cellpadding='0' cellspacing='0' border='0' width='100%'>";
+echo "<tr><td style='width: 100%' valign='top'>";
+gros_titre($nom_site, $logo_statut);
echo "<a href='$url_site'><b>$url_affichee</b></a>";
if (strlen($descriptif) > 1) {
@@ -221,7 +221,7 @@ if ($flag_editable AND ($options == 'avancees' OR $statut == 'publie')) {
if ($flag_administrable) {
debut_cadre_relief("racine-site-24.gif");
- $corps = "\n<center><b>"
+ $corps = "\n<div style='text-align: center'><b>"
. _T('info_statut_site_1')
. "</b> \n"
. "<select name='nouveau_statut' size='1' class='fondl'>\n"
@@ -233,7 +233,7 @@ if ($flag_administrable) {
. "<input type='submit' value='"
. _T('bouton_valider')
. "' class='fondo' />\n"
- . "</center>\n";
+ . "</div>\n";
echo redirige_action_auteur('editer_site',
$id_syndic,
@@ -253,8 +253,6 @@ if ($flag_editable AND ($resume == 'oui' OR $resume == 'non')) {
if (!$resume AND !$resume = $row['resume']) $resume = 'oui';
-
-
if ($syndication == "oui" OR $syndication == "off" OR $syndication == "sus") {
echo "<p style='font-size: 16px; ' class='verdana1'><a href='".htmlspecialchars($url_syndic)."'>", http_img_pack('feed.png', 'RSS', ''), '</a> <b>'._T('info_site_syndique').'</b></p>';
@@ -265,7 +263,6 @@ if ($syndication == "oui" OR $syndication == "off" OR $syndication == "sus") {
debut_boite_info();
echo _T('avis_site_syndique_probleme', array('url_syndic' => quote_amp($url_syndic)));
- echo "<center>";
echo redirige_action_auteur('editer_site',
$id_syndic,
'sites',
@@ -275,7 +272,6 @@ if ($syndication == "oui" OR $syndication == "off" OR $syndication == "sus") {
. attribut_html(_T('lien_nouvelle_recuperation'))
. "\" class='fondo' style='font-size:9px;' />"
);
- echo "</center>\n";
fin_boite_info();
}
echo afficher_syndic_articles(_T('titre_articles_syndiques'), array('FROM' => 'spip_syndic_articles', 'WHERE' => "id_syndic=$id_syndic", 'ORDER BY' => "date DESC"), $id_syndic);
@@ -411,7 +407,7 @@ if ($GLOBALS['champs_extra'] AND $extra) {
echo extra_affichage($extra, "sites");
}
- echo '</center>';
+ echo '</div>';
fin_cadre_relief();
diff --git a/ecrire/exec/statistiques_lang.php b/ecrire/exec/statistiques_lang.php
index 636595be7411486dbe88aa342d7fd11eec9affbe..65c50607798cf41172ea6785cc059e6e28aab476 100644
--- a/ecrire/exec/statistiques_lang.php
+++ b/ecrire/exec/statistiques_lang.php
@@ -28,11 +28,11 @@ function exec_statistiques_lang_dist()
$largeur_table = 750;
}
$taille = $largeur_table - 200;
- echo "<center><table width='$largeur_table'><tr><td style='width: $largeur_table" . "px;' class='verdana2'>";
+ echo "<table align='center' width='$largeur_table'><tr><td style='width: $largeur_table" . "px; text-align:center;' class='verdana2'>";
echo "<br /><br />";
- echo "<center>";
+
gros_titre(_T('onglet_repartition_lang'));
- echo "</center>";
+
//barre_onglets("repartition", "langues");
if ($critere == "debut") {
@@ -111,7 +111,7 @@ function exec_statistiques_lang_dist()
fin_cadre_enfonce();
- echo "</td></tr></table></center>";
+ echo "</td></tr></table>";
echo fin_page();
}
?>
diff --git a/ecrire/exec/statistiques_repartition.php b/ecrire/exec/statistiques_repartition.php
index c0012d1cf839ea07a65961ec6995196937ac4ecc..0759828a6b71f6dfd867f7fd0989cfd8f684e1ab 100644
--- a/ecrire/exec/statistiques_repartition.php
+++ b/ecrire/exec/statistiques_repartition.php
@@ -145,7 +145,7 @@ function exec_statistiques_repartition_dist()
$taille = 400;
}
- echo "\n<br /><br /><center><table width='$largeur_table'><tr><td class='verdana2' style='text-align: center; width: $largeur_table" . "px;'>";
+ echo "\n<br /><br /><table width='$largeur_table'><tr><td class='verdana2' style='text-align: center; width: $largeur_table" . "px;'>";
gros_titre(_T('titre_page_statistiques'));
if ($critere == "debut") {
@@ -170,7 +170,7 @@ function exec_statistiques_repartition_dist()
"</div>";
fin_cadre_relief();
- echo "</td></tr></table></center>";
+ echo "</td></tr></table>";
echo fin_page();
}
diff --git a/ecrire/inc/import.php b/ecrire/inc/import.php
index edcb1dee04b1de1aefb24f12427df071ee38bff0..fba7bb4fe94a3f99efd31d56ad5805d3d8f74a9f 100644
--- a/ecrire/inc/import.php
+++ b/ecrire/inc/import.php
@@ -295,9 +295,11 @@ function import_affiche_javascript($taille)
$max_time = ini_get('max_execution_time')*1000;
echo debut_boite_alerte(),
"<span style='font-size: 18px; color: black;' class='verdana1'><b>", _T('info_base_restauration'), "</b></span>",
- "<form name='progression'><center><input type='text' size='10' style='text-align:center;' name='taille' value='",
+ "<form name='progression'><div style='text-align: center'><input type='text' size='10' name='taille' value='",
$taille,
- "'><br /><input type='text' class='forml' name='recharge' value='"._T('info_recharger_page')."'></center></form>",
+ "'></div><div style='text-align: center'><input type='text' class='forml' name='recharge' value='",
+ _T('info_recharger_page'),
+ "'></div></form>",
fin_boite_alerte(),
"<script language=\"JavaScript\" type=\"text/javascript\">window.setTimeout('location.href=\"",
self(),
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index 1645708ed71cdd36b773f5aaa3b2121a8b8dbad0..085accd18dc35d5935192d6b8749994ae58ea41a 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -223,7 +223,7 @@ function fin_cadre_trait_couleur($return = false){
//
// http://doc.spip.org/@debut_boite_alerte
function debut_boite_alerte() {
- return "<table cellpadding='6' border='0'><tr><td style='width: 100%' bgcolor='red'><table width='100%' cellpadding='12' border='0'><tr><td style='width: 100%' bgcolor='white'>";
+ return "<table width='100%' cellpadding='6' border='0'><tr><td style='width: 100%; background-color: red'><table width='100%' cellpadding='12' border='0'><tr><td style='width: 100%; background-color: white'>";
}
// http://doc.spip.org/@fin_boite_alerte