diff --git a/ecrire/inc_logos.php3 b/ecrire/inc_logos.php3 index a40b09c22765db9989308d0ae933ca42e4f379bb..b44309ab4ff9b0da5018bd8e51d3d2bd80dc36b9 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 408a3f66ab243dffd4ea8456e77f5ddca8e980cc..afe4f1ae73b6571569e52759711f9ad3d94d3c51 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 d69c9ba96435c6426b44098af7bfe8baec5aa52c..e27feb6d9e5399617c53c76633ba654f7999cff8 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 f11d07670f045b2a94c8270bd3efcbfb734f6baa..b6e28c2c064556207d1114b7b6783f0f31270ec5 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 396ea886b180634e110335851a556bd564d85137..65a347dfa315e5a26c6c9520e2b3fd6486cffb33 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 18ab7b6de0ada85b57a92832fe202c8a0eece3ec..6312e74c224f55f9d6758cb6bbabc1cb72db70a9 100644 --- a/spip_style.css +++ b/spip_style.css @@ -36,10 +36,6 @@ h3.spip { font-size : 70%; } -.spip_logos { - border: none; -} - table.spip { }