diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3
index 9b9a61f2cef135588f8c952b1e988bb311e44add..6c59329c10642eb9b3f8d9b6884c567e20a83c66 100644
--- a/ecrire/inc_presentation.php3
+++ b/ecrire/inc_presentation.php3
@@ -371,9 +371,14 @@ function fin_raccourcis() {
// Afficher un petit "+" pour lien vers autre page
function afficher_plus($lien) {
- global $options, $spip_lang_right;
+ global $options, $spip_lang_right, $browser_name;
- if ($options == "avancees") return "<div style='float:$spip_lang_right; padding-top: 2px;'><a href='$lien'><img src='img_pack/plus.gif' border='0'></a></div>";
+ if ($options == "avancees" AND $spip_display != 4) {
+ if ($browser_name == "MSIE")
+ return "<a href='$lien'><img src='img_pack/plus.gif' alt='+' border='0'></a> ";
+ else
+ return "<div style='float:$spip_lang_right; padding-top: 2px;'><a href='$lien'><img src='img_pack/plus.gif' border='0'></a></div>";
+ }
}
@@ -2598,14 +2603,14 @@ else {
$dans_rub = "&id_rubrique=$id_rubrique";
$dans_parent = "&id_parent=$id_rubrique";
}
-
- $gadget .= "<div style='width: 140px; float: $spip_lang_left;'>";
- if ($id_rubrique > 0)
- $gadget .= icone_horizontale(_T('icone_creer_sous_rubrique'), "rubriques_edit.php3?new=oui$dans_parent", "rubrique-24.gif", "creer.gif", false);
- else
- $gadget .= icone_horizontale(_T('icone_creer_rubrique'), "rubriques_edit.php3?new=oui", "rubrique-24.gif", "creer.gif", false);
- $gadget .= "</div>";
-
+ if ($connect_statut == "0minirezo") {
+ $gadget .= "<div style='width: 140px; float: $spip_lang_left;'>";
+ if ($id_rubrique > 0)
+ $gadget .= icone_horizontale(_T('icone_creer_sous_rubrique'), "rubriques_edit.php3?new=oui$dans_parent", "rubrique-24.gif", "creer.gif", false);
+ else
+ $gadget .= icone_horizontale(_T('icone_creer_rubrique'), "rubriques_edit.php3?new=oui", "rubrique-24.gif", "creer.gif", false);
+ $gadget .= "</div>";
+ }
$gadget .= "<div style='width: 140px; float: $spip_lang_left;'>";
$gadget .= icone_horizontale(_T('icone_ecrire_article'), "articles_edit.php3?new=oui$dans_rub", "article-24.gif","creer.gif", false);
$gadget .= "</div>";
@@ -2618,9 +2623,11 @@ else {
}
if (lire_meta("activer_sites") == 'oui') {
- $gadget .= "<div style='width: 140px; float: $spip_lang_left;'>";
- $gadget .= icone_horizontale(_T('info_sites_referencer'), "sites_edit.php3?new=oui$dans_rub", "site-24.gif","creer.gif", false);
- $gadget .= "</div>";
+ if ($connect_statut == '0minirezo' OR lire_meta("proposer_sites") > 0) {
+ $gadget .= "<div style='width: 140px; float: $spip_lang_left;'>";
+ $gadget .= icone_horizontale(_T('info_sites_referencer'), "sites_edit.php3?new=oui$dans_rub", "site-24.gif","creer.gif", false);
+ $gadget .= "</div>";
+ }
}
}
diff --git a/ecrire/index.php3 b/ecrire/index.php3
index 66049aa0d10d9cc2dda9163dac4f94ae98c9a4a4..485b3bb427beef44fd4480f3dfc0c98728beacb6 100644
--- a/ecrire/index.php3
+++ b/ecrire/index.php3
@@ -141,12 +141,14 @@ if ($spip_display != 4) {
// Afficher les raccourcis : boutons de creation d'article et de breve, etc.
//
-debut_raccourcis();
//
// Afficher les boutons de creation d'article et de breve
//
+/*
+debut_raccourcis();
+
$query = "SELECT id_rubrique FROM spip_rubriques LIMIT 0,1";
$result = spip_query($query);
@@ -168,7 +170,7 @@ if ($connect_statut == '0minirezo' and $connect_toutes_rubriques) {
}
-/* La nouvelle interface rend ces raccourcis inutiles
+// La nouvelle interface rend ces raccourcis inutiles
if ($options == "avancees") {
echo "<p>";
icone_horizontale(_T('titre_forum'), "forum.php3", "forum-interne-24.gif","rien.gif");
@@ -189,11 +191,14 @@ else if ($connect_statut == '0minirezo' and $connect_toutes_rubriques) {
echo "<p>";
icone_horizontale(_T('icone_configurer_site'), "configuration.php3", "administration-24.gif");
}
-*/
-fin_raccourcis();
+fin_raccourcis();
+*/
+ creer_colonne_droite();
echo "<div> </div>";
+
+
//
// Annonces
@@ -292,27 +297,6 @@ if ($meta["debut_restauration"]) {
}
-//
-// Modification du cookie
-//
-
-if ($connect_statut == "0minirezo" AND $spip_display != 4) {
- if (!$cookie_admin) {
- echo "<table width=100%><tr width=100%>";
- echo "<td width=100%>";
- echo _T('info_activer_cookie');
- echo aide ("cookie");
- echo "</td>";
- echo "<td width=10><img src='img_pack/rien.gif' width=10 alt='' />";
- echo "</td>";
- echo "<td width='250'>";
- icone_horizontale(_T('icone_activer_cookie'), "../spip_cookie.php3?cookie_admin=".rawurlencode("@$connect_login")."&url=".rawurlencode("ecrire/index.php3"), "cookie-24.gif", "");
- echo "</td></tr></table>";
- echo "<p><hr><p>";
- }
-}
-
-
//
// Articles post-dates en attente de publication
//
@@ -338,7 +322,8 @@ $vos_articles = afficher_articles(afficher_plus('articles_page.php3')._T('info_e
if ($vos_articles) $vos_articles = ' AND articles.id_article NOT IN ('.join($vos_articles,',').')';
-
+echo "<div> </div>";
+echo debut_cadre_trait_couleur();
//
// Raccourcis pour malvoyants
@@ -365,8 +350,71 @@ if ($spip_display == 4) {
icone_horizontale(_T('icone_creer_rubrique_2'), "rubriques_edit.php3?new=oui", "rubrique-24.gif","creer.gif");
}
fin_raccourcis();
+} else {
+
+ $query = "SELECT id_rubrique FROM spip_rubriques LIMIT 0,1";
+ $result = spip_query($query);
+ $gadget = "";
+
+ if (spip_num_rows($result) > 0) {
+ $id_rubrique = $GLOBALS['id_rubrique'];
+ if ($id_rubrique > 0) {
+ $dans_rub = "&id_rubrique=$id_rubrique";
+ $dans_parent = "&id_parent=$id_rubrique";
+ }
+ $gadget = "<table width='95%'><tr>";
+ if ($connect_statut == "0minirezo") {
+ $gadget .= "<td>";
+ $gadget .= icone_horizontale(_T('icone_creer_rubrique'), "rubriques_edit.php3?new=oui", "rubrique-24.gif", "creer.gif", false);
+ $gadget .= "</td>";
+ }
+
+ $gadget .= "<td>";
+ $gadget .= icone_horizontale(_T('icone_ecrire_article'), "articles_edit.php3?new=oui$dans_rub", "article-24.gif","creer.gif", false);
+ $gadget .= "</td>";
+
+ $activer_breves = lire_meta("activer_breves");
+ if ($activer_breves != "non") {
+ $gadget .= "<td>";
+ $gadget .= icone_horizontale(_T('icone_nouvelle_breve'), "breves_edit.php3?new=oui$dans_rub", "breve-24.gif","creer.gif", false);
+ $gadget .= "</td>";
+ }
+
+ if (lire_meta("activer_sites") == 'oui') {
+ if ($connect_statut == '0minirezo' OR lire_meta("proposer_sites") > 0) {
+ $gadget .= "<td>";
+ $gadget .= icone_horizontale(_T('info_sites_referencer'), "sites_edit.php3?new=oui$dans_rub", "site-24.gif","creer.gif", false);
+ $gadget .= "</td>";
+ }
+ }
+
+ }
+
+ $gadget .= "</tr></table>";
+
+ echo $gadget;
}
+//
+// Modification du cookie
+//
+
+if ($connect_statut == "0minirezo" AND $spip_display != 4) {
+ if (!$cookie_admin) {
+ echo "<div> </div>";
+ echo "<table width=95%><tr>";
+ echo "<td width=100%>";
+ echo _T('info_activer_cookie');
+ echo aide ("cookie");
+ echo "</td>";
+ echo "<td width=10><img src='img_pack/rien.gif' width=10 alt='' />";
+ echo "</td>";
+ echo "<td width='250'>";
+ icone_horizontale(_T('icone_activer_cookie'), "../spip_cookie.php3?cookie_admin=".rawurlencode("@$connect_login")."&url=".rawurlencode("ecrire/index.php3"), "cookie-24.gif", "");
+ echo "</td></tr></table>";
+ }
+}
+ echo fin_cadre_trait_couleur();
diff --git a/ecrire/spip_style.php3 b/ecrire/spip_style.php3
index 3f81dbad3bda84fc4dd7c840931960318ef0fae4..af75e4b923dee04f251d2a8d6ecd1dc5ff0ce222 100644
--- a/ecrire/spip_style.php3
+++ b/ecrire/spip_style.php3
@@ -223,7 +223,7 @@ a.icone26 {
color: black;
text-decoration: none;
padding: 1px;
- margin-right: 2px;
+ margin-<? echo $right; ?>: 2px;
}
a.icone26:hover {
text-decoration: none;