From d54300687bd01a8bf5312e2980206d158f2c0957 Mon Sep 17 00:00:00 2001
From: ARNO* <arno@rezo.net>
Date: Sat, 19 Apr 2008 16:04:44 +0000
Subject: [PATCH] Divers ajustements graphiques, correction bug "naviguer" en
mode redacteur
---
dist/style_prive.html | 2 +-
ecrire/exec/admin_declarer.php | 10 +++++-----
ecrire/exec/admin_effacer.php | 2 +-
ecrire/exec/naviguer.php | 3 +--
ecrire/inc/presentation.php | 10 ++++++----
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/dist/style_prive.html b/dist/style_prive.html
index a00f4cc0a6..ec8f31b29b 100644
--- a/dist/style_prive.html
+++ b/dist/style_prive.html
@@ -822,7 +822,7 @@ ul.instituer li.refuse.selected a,ul.instituer li.refuse a:hover { background: #
#voir.tabs-container { background: #FFF; padding: 5px; border: 1px solid #999; }
.no_onglets .tabs-container {background:#fff; border:none;padding-top:0;}
.no_onglets .tabs-nav {display: none;}
-.no_onglets .fiche_objet { background:#fff;border:1px solid black; padding:5px;margin-bottom:1em;}
+.no_onglets .fiche_objet { background:#fff;border:1px solid #999; padding:5px;margin-bottom:1em;}
.no_onglets #voir.tabs-container { background: #FFF; padding:0; border: 0; }
.no_onglets #contenu #wysiwyg div.label{ display: none; }
diff --git a/ecrire/exec/admin_declarer.php b/ecrire/exec/admin_declarer.php
index 75a2da0124..a88c12e9f8 100644
--- a/ecrire/exec/admin_declarer.php
+++ b/ecrire/exec/admin_declarer.php
@@ -56,11 +56,11 @@ function autres_bases()
$tables = bases_referencees(_FILE_CONNECT_TMP);
if ($tables)
- $tables = '<br /><br />'
- . _T('config_info_base_sup_disponibles')
+ $tables = "<br /><br /><fieldset style='margin-bottom: 10px;'>"
+ . "<legend>"._T('config_info_base_sup_disponibles')."</legend>"
. "<ul>\n<li>"
. join("</li>\n<li>", $tables)
- . "</li>\n</ul>";
+ . "</li>\n</ul></fieldset>";
else $tables ='';
list($adresse, $login, $pass, $sel, $server)
@@ -78,10 +78,10 @@ function autres_bases()
? ''
: ("\n<input type='hidden' name='sel_db' value='" . $sel . "' />\n");
- return "<br ><div style='padding: 10px; border: 1px solid; text-align: left'>"
+ return debut_cadre_trait_couleur('',true,'',_T('onglet_declarer_une_autre_base'))
. _T('config_info_base_sup')
. $tables
. install_connexion_form(array($adresse_db), array($login_db), array($pass_db), array($server_db), $hidden, 'sup1')
- . "</div>";
+ . fin_cadre_trait_couleur(true);
}
?>
diff --git a/ecrire/exec/admin_effacer.php b/ecrire/exec/admin_effacer.php
index 107290e4ec..1044f2745b 100644
--- a/ecrire/exec/admin_effacer.php
+++ b/ecrire/exec/admin_effacer.php
@@ -31,7 +31,7 @@ function exec_admin_effacer_dist()
$commencer_page = charger_fonction('commencer_page', 'inc');
echo $commencer_page(_T('titre_page_admin_effacer'), "configuration", "base");
- echo "\n<br /><br /><br />";
+ echo "\n<br /><br />";
echo gros_titre(_T('titre_admin_effacer'),'',false);
echo barre_onglets("administration", "effacer");
diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php
index cb8c2e21cd..51b78bd686 100644
--- a/ecrire/exec/naviguer.php
+++ b/ecrire/exec/naviguer.php
@@ -131,8 +131,7 @@ function naviguer_droite($row, $id_rubrique, $id_parent, $id_secteur, $haut, $n_
(!$id_rubrique
? icone_inline(_T('icone_creer_rubrique'), generer_url_ecrire("rubriques_edit","new=oui&retour=nav"), "secteur-24.gif", "creer.gif",$spip_lang_right)
: icone_inline(_T('icone_creer_sous_rubrique'), generer_url_ecrire("rubriques_edit","new=oui&retour=nav&id_parent=$id_rubrique"), "rubrique-24.gif", "creer.gif",$spip_lang_right))
- :"")
- . "</div>")
+ ."</div>":""))
. "<br class='nettoyeur' />"
. $boucles;
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index a49dd6dedd..836cf39be9 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -1403,7 +1403,7 @@ function enfant_rub($collection){
$voir_logo = ($spip_display != 1 AND $spip_display != 4 AND isset($GLOBALS['meta']['image_process']) AND $GLOBALS['meta']['image_process'] != "non");
if ($voir_logo) {
- $voir_logo = "float: $spip_lang_right; margin-$spip_lang_right: -6px; margin-top: -6px;";
+ $voir_logo = "float: $spip_lang_right; margin-$spip_lang_right: 0px; margin-top: 0px;";
$chercher_logo = charger_fonction('chercher_logo', 'inc');
} else $logo ='';
@@ -1441,10 +1441,12 @@ function enfant_rub($collection){
"'>".
typo($titre) .
"</a></span>";
+
+ $titre = (is_string($logo) ? $logo : '') .
+ bouton_block_depliable($lib_bouton,$les_sous_enfants ?false:-1,"enfants$id_rubrique");
+
$les_enfants = "\n<div class='enfants'>" .
- debut_cadre_sous_rub(($id_parent ? "rubrique-24.gif" : "secteur-24.gif"), true) .
- (is_string($logo) ? $logo : '') .
- bouton_block_depliable($lib_bouton,$les_sous_enfants ?false:-1,"enfants$id_rubrique") .
+ debut_cadre_sous_rub(($id_parent ? "rubrique-24.gif" : "secteur-24.gif"), true, "", $titre) .
(!$descriptif ? '' : "\n<div class='verdana1'>$descriptif</div>") .
(($spip_display == 4) ? '' : $les_sous_enfants) .
"\n<div style='clear:both;'></div>" .
--
GitLab