Update of /home/spip-cvs/spip/ecrire
In directory miel:/tmp/cvs-serv28680/ecrire
Modified Files:
inc_lang.php3 inc_presentation.php3 spip_style.php3
Log Message:
cosmetique
Index: inc_lang.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_lang.php3,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- inc_lang.php3 8 Oct 2003 08:22:56 -0000 1.78
+++ inc_lang.php3 24 Oct 2003 21:38:59 -0000 1.79
@@ -395,6 +395,7 @@
if ($nom_select == 'var_lang') $ret .= "\n<select name='$nom_select' class='verdana1' style='background-color: $couleur_foncee; color: white;' onChange=\"document.location.href='". $lien . $amp."$nom_select='+this.options[this.selectedIndex].value\">\n";
else $ret .= "\n<select name='$nom_select' class='fondl'>\n";
+ ksort($langues);
while (list(, $l) = each ($langues)) {
if ($l == $default) {
$selected = ' selected';
Index: inc_presentation.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_presentation.php3,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- inc_presentation.php3 21 Oct 2003 08:01:08 -0000 1.312
+++ inc_presentation.php3 24 Oct 2003 21:38:59 -0000 1.313
@@ -17,7 +17,7 @@
if (!$aide) return;
- return " <a class='aide' href=\"${dir_ecrire}aide_index.php3?aide=$aide\" target=\"spip_aide\" ".
+ return " <a class='aide' href=\"".$dir_ecrire."aide_index.php3?aide=$aide\" target=\"spip_aide\" ".
"onclick=\"javascript:window.open(this.href, 'spip_aide', 'scrollbars=yes, ".
"resizable=yes, width=740, height=580'); return false;\"><img ".
"src=\"img_pack/aide.gif\" alt=\""._T('info_image_aide')."\" ".
@@ -935,7 +935,12 @@
echo '<meta http-equiv="Content-Type" content="text/html; charset='.$charset.'">';
echo '<link rel="stylesheet" type="text/css" href="';
if (!$flag_ecrire) echo 'ecrire/';
- echo "spip_style.php3?couleur_claire=".urlencode($couleur_claire)."&couleur_foncee=" . urlencode($couleur_foncee) ."\">\n";
+ $link = new Link('spip_style.php3');
+ $link->addVar('couleur_claire', $couleur_claire);
+ $link->addVar('couleur_foncee', $couleur_foncee);
+ $link->addVar('left', $GLOBALS['spip_lang_left']);
+ $link->addVar('right', $GLOBALS['spip_lang_right']);
+ echo $link->getUrl()."\">\n";
afficher_script_layer();
?>
Index: spip_style.php3
RCS file: /home/spip-cvs/spip/ecrire/spip_style.php3,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- spip_style.php3 21 Oct 2003 00:22:40 -0000 1.23
+++ spip_style.php3 24 Oct 2003 21:38:59 -0000 1.24
@@ -50,10 +50,10 @@
padding: 2px;
}
.bandeau-icones .gauche {
- float: left;
+ float: <?php echo $left; ?>;
}
.bandeau-icones .droite {
- float: right;
+ float: <?php echo $right; ?>;
}
.bandeau-icones .milieu {
text-align: center;
@@ -123,15 +123,14 @@
}
.cellule36 a.aide, .cellule36 a.aide:hover {
- background: url(img_pack/rien.gif);
+ display: inline;
+ background: none;
margin: 0px;
padding: 0px;
- display: inline;
}
.cellule36 a.aide img {
margin: 0px;
padding: 0px;
- display: inline;
}
/* Navigation texte */
@@ -172,28 +171,29 @@
}
.cellule-texte a.aide img {
margin: 0px;
- display: inline;
}
-/* Icones horizontales */
+/*
+ * Icones horizontales
+ */
a.cellule-h {
- text-align: left;
+ text-align: <?php echo $left; ?>;
display: block;
margin-top: 3px;
margin-bottom: 3px;
}
a.cellule-h {
- text-decoration: none; background: url(img_pack/pave-gris-24.png) no-repeat center left;
+ text-decoration: none; background: url(img_pack/pave-gris-24.png) no-repeat center <?php echo $left; ?>;
}
a.cellule-h:hover {
- text-decoration: none; background: url(img_pack/pave-blanc-24.png) no-repeat center left;
+ text-decoration: none; background: url(img_pack/pave-blanc-24.png) no-repeat center <?php echo $left; ?>;
}
.danger a.cellule-h {
- text-decoration: none; background: url(img_pack/pave-gris-24.png) no-repeat center left;
+ text-decoration: none; background: url(img_pack/pave-gris-24.png) no-repeat center <?php echo $left; ?>;
}
.danger a.cellule-h:hover {
- text-decoration: none; background: url(img_pack/pave-rouge-24.png) no-repeat center left;
+ text-decoration: none; background: url(img_pack/pave-rouge-24.png) no-repeat center <?php echo $left; ?>;
}
a.cellule-h table {
border: none;
@@ -201,7 +201,7 @@
margin: 0px;
}
a.cellule-h td {
- text-align: left;
+ text-align: <?php echo $left; ?>;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-weight: bold;
font-size: 11px;
@@ -212,7 +212,7 @@
height: 24px;
border: none;
margin: 1px;
- margin-right: 6px;
+ margin-<?php echo $right; ?>: 6px;
background-repeat: no-repeat;
background-position: center center;
}
@@ -224,7 +224,7 @@
a.cellule-h-texte {
display: block;
clear: both;
- text-align: left;
+ text-align: <?php echo $left; ?>;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-weight: bold;
font-size: 11px;
@@ -472,5 +472,3 @@
text-align: left;
vertical-align: center;
}
-
-