From 64a47835cc8cca44d05fe391f27fa91859bdf6b6 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Mon, 4 Apr 2005 22:06:59 +0000
Subject: [PATCH] =?UTF-8?q?-=20suppression=20du=20border=20sur=20les=20log?=
=?UTF-8?q?os,=20unification=20sur=20border-width:=200px;=20-=20tri=20des?=
=?UTF-8?q?=20rubriques=20dans=20l'espace=20priv=C3=A9=20(aurelien=20levy)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc_logos.php3 | 4 ++--
ecrire/js_menu_rubriques.php | 2 +-
ecrire/naviguer.php3 | 4 ++--
ecrire/rubriques_edit.php3 | 2 +-
inc-calcul-outils.php3 | 2 +-
spip_style.css | 4 ----
6 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/ecrire/inc_logos.php3 b/ecrire/inc_logos.php3
index a40b09c227..b44309ab4f 100644
--- a/ecrire/inc_logos.php3
+++ b/ecrire/inc_logos.php3
@@ -489,9 +489,9 @@ function reduire_image_logo($img, $taille = 120, $taille_y=0) {
// attributs deprecies. Transformer en CSS
if (eregi("hspace='([^']+)'", $img, $regs)) $espace = $regs[1];
if ($espace)
- $attributs .= " style='margin: $espace" . "px; border-width: 0px'";
+ $attributs .= " style='margin: $espace" . "px; border-width: 0px;'";
else
- $attributs .= " class='spip_logos'";
+ $attributs .= " style='border-width: 0px;' class='spip_logos'";
// attribut deprecie mais equivalent CSS pas clair
if (eregi("align='([^']+)'", $img, $regs)) $align = $regs[1];
if ($align) $attributs .= " align='$align'";
diff --git a/ecrire/js_menu_rubriques.php b/ecrire/js_menu_rubriques.php
index 408a3f66ab..afe4f1ae73 100644
--- a/ecrire/js_menu_rubriques.php
+++ b/ecrire/js_menu_rubriques.php
@@ -29,7 +29,7 @@ function extraire_article($id_p) {
function gen_liste_rubriques() {
$q = "SELECT id_rubrique, id_parent, titre
FROM spip_rubriques
- ORDER BY id_parent, titre";
+ ORDER BY id_parent,0+titre,titre";
$res = spip_query($q);
diff --git a/ecrire/naviguer.php3 b/ecrire/naviguer.php3
index d69c9ba964..e27feb6d9e 100644
--- a/ecrire/naviguer.php3
+++ b/ecrire/naviguer.php3
@@ -26,7 +26,7 @@ function enfant($collection){
global $spip_display, $spip_lang_left, $spip_lang_right;
global $connect_id_auteur;
- $query2 = "SELECT * FROM spip_rubriques WHERE id_parent='$collection' ORDER BY titre";
+ $query2 = "SELECT * FROM spip_rubriques WHERE id_parent='$collection' ORDER BY 0+titre,titre";
$result2 = spip_query($query2);
@@ -96,7 +96,7 @@ function enfant($collection){
function sous_enfant($collection2){
global $lang_dir, $spip_lang_dir, $spip_lang_left;
- $query3 = "SELECT * FROM spip_rubriques WHERE id_parent='$collection2' ORDER BY titre";
+ $query3 = "SELECT * FROM spip_rubriques WHERE id_parent='$collection2' ORDER BY 0+titre,titre";
$result3 = spip_query($query3);
if (spip_num_rows($result3) > 0){
diff --git a/ecrire/rubriques_edit.php3 b/ecrire/rubriques_edit.php3
index f11d07670f..b6e28c2c06 100644
--- a/ecrire/rubriques_edit.php3
+++ b/ecrire/rubriques_edit.php3
@@ -23,7 +23,7 @@ function enfant($leparent){
global $browser_name, $browser_version;
$i++;
- $query="SELECT * FROM spip_rubriques WHERE id_parent='$leparent' ORDER BY titre";
+ $query="SELECT * FROM spip_rubriques WHERE id_parent='$leparent' ORDER BY 0+titre,titre";
$result=spip_query($query);
while($row=spip_fetch_array($result)){
diff --git a/inc-calcul-outils.php3 b/inc-calcul-outils.php3
index 396ea886b1..65a347dfa3 100644
--- a/inc-calcul-outils.php3
+++ b/inc-calcul-outils.php3
@@ -47,7 +47,7 @@ function affiche_logos($logos, $lien, $align) {
$num_survol++;
$milieu = "<img src='$arton'\nalt='image$num_survol'"
. ($align ? " align='$align'" : '')
- . " style='border: 0px;' class='spip_logos' />";
+ . " style='border-width: 0px;' class='spip_logos' />";
if (!$artoff) return ($lien ? http_href($lien, $milieu) : $milieu);
diff --git a/spip_style.css b/spip_style.css
index 18ab7b6de0..6312e74c22 100644
--- a/spip_style.css
+++ b/spip_style.css
@@ -36,10 +36,6 @@ h3.spip {
font-size : 70%;
}
-.spip_logos {
- border: none;
-}
-
table.spip {
}
--
GitLab