diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3 index 545f0af43f06f88dc29b02170f36390a6c36405f..48674c54bab5e5001b9f3e098a469137b4f93142 100644 --- a/ecrire/inc_presentation.php3 +++ b/ecrire/inc_presentation.php3 @@ -2192,10 +2192,10 @@ function lien_change_var($lien, $set, $couleur, $coords, $titre, $mouseOver="") // function afficher_menu_rubriques() { - global $spip_lang_rtl; + global $spip_lang_rtl, $spip_ecran; $date_maj = lire_meta("date_calcul_rubriques"); - echo "<script type='text/javascript' src='js_menu_rubriques.php?date=$date_maj&dir=$spip_lang_rtl'></script>"; + echo "<script type='text/javascript' src='js_menu_rubriques.php?date=$date_maj&spip_ecran=$spip_ecran&dir=$spip_lang_rtl'></script>"; } @@ -2571,7 +2571,7 @@ else { // GADGET Menu rubriques echo "<div style='position: relative; z-index: 1000;'>"; - echo "<div id='bandeautoutsite' class='bandeau_couleur_sous' style='$spip_lang_left: 0px; width: 200px;'>"; + echo "<div id='bandeautoutsite' class='bandeau_couleur_sous' style='$spip_lang_left: 0px;'>"; echo "<a href='articles_tous.php3' class='lien_sous'>"._T('icone_site_entier')."</a>"; afficher_menu_rubriques(); echo "</div>"; diff --git a/ecrire/index.php3 b/ecrire/index.php3 index 81c033c27de529e5c3adf9bd5ba5418ba11add5b..10e9d0fedf5bf29e4fdee1cc3f14f123b1495f26 100644 --- a/ecrire/index.php3 +++ b/ecrire/index.php3 @@ -439,7 +439,6 @@ if (!$relief AND lire_meta('activer_syndic') != 'non' AND $connect_statut == '0m if ($relief) { - echo "<p>"; debut_cadre_couleur_foncee("",false, "", _T('texte_en_cours_validation')); //echo "<div class='verdana2' style='color: black;'><b>"._T('texte_en_cours_validation')."</b></div><p>"; diff --git a/ecrire/js_menu_rubriques.php b/ecrire/js_menu_rubriques.php index ab5aee2c93106f88048e37f4d6d5344fe225aa98..d156f74b9c8a73b5beea10d21092c459e6dbc9c0 100644 --- a/ecrire/js_menu_rubriques.php +++ b/ecrire/js_menu_rubriques.php @@ -19,12 +19,32 @@ if ($headers_only) exit; function bandeau_menu() { + global $spip_ecran; $result_racine = spip_query("SELECT * FROM spip_rubriques WHERE id_parent=0 ORDER BY titre"); $i = spip_num_rows($result_racine); + + $total_lignes = $i; + if ($spip_ecran == "large") $max_lignes = 20; + else $max_lignes = 15; + + $nb_col = ceil($total_lignes / $max_lignes); + if ($nb_col < 1) $nb_col = 1; + $max_lignes = ceil($total_lignes / $nb_col); + + + $count_lignes = 0; + if ($i > 0) { $ret = "<div> </div>"; $ret .= "<div class='bandeau_rubriques' style='z-index: 1;'>"; while ($row = spip_fetch_array($result_racine)) { + + if ($count_lignes == $max_lignes) { + $count_lignes = 0; + $ret .= "</div></td><td valign='top' width='200'><div> </div><div class='bandeau_rubriques' style='z-index: 1;'>"; + } + $count_lignes ++; + $id_rubrique = $row["id_rubrique"]; $titre_rubrique = supprimer_numero(typo($row["titre"])); @@ -84,7 +104,9 @@ function bandeau_rubrique ($id_rubrique, $titre_rubrique, $z = 1) { } echo "document.write(\""; +echo "<table><tr><td valign='top' width='200'>"; echo bandeau_menu(); +echo "</td></tr></table>"; echo "\");\n"; ?> \ No newline at end of file