From fcfc57ab5356ca51ffe4de7416ea32d249bacaaa Mon Sep 17 00:00:00 2001
From: ARNO* <arno@rezo.net>
Date: Thu, 18 Sep 2003 14:32:40 +0000
Subject: [PATCH] Modification de l'interface: plus de "gros" paves
rectangulaires, mais animation d'icones plus petites
---
.gitattributes | 7 ++
ecrire/img_pack/pave-blanc-16.png | Bin 0 -> 336 bytes
ecrire/img_pack/pave-blanc-24.png | Bin 0 -> 365 bytes
ecrire/img_pack/pave-blanc-48.png | Bin 0 -> 491 bytes
ecrire/img_pack/pave-gris-16.png | Bin 0 -> 353 bytes
ecrire/img_pack/pave-gris-24.png | Bin 0 -> 383 bytes
ecrire/img_pack/pave-gris-48.png | Bin 0 -> 509 bytes
ecrire/img_pack/pave-rouge-24.png | Bin 0 -> 366 bytes
ecrire/img_pack/tirets-separation.gif | Bin 51 -> 51 bytes
ecrire/inc_barre.php3 | 4 +-
ecrire/inc_presentation.php3 | 164 ++++++++++++++++----------
ecrire/spip_style.php3 | 119 +++++++++----------
12 files changed, 166 insertions(+), 128 deletions(-)
create mode 100644 ecrire/img_pack/pave-blanc-16.png
create mode 100644 ecrire/img_pack/pave-blanc-24.png
create mode 100644 ecrire/img_pack/pave-blanc-48.png
create mode 100644 ecrire/img_pack/pave-gris-16.png
create mode 100644 ecrire/img_pack/pave-gris-24.png
create mode 100644 ecrire/img_pack/pave-gris-48.png
create mode 100644 ecrire/img_pack/pave-rouge-24.png
diff --git a/.gitattributes b/.gitattributes
index ac595e7df9..7518da2ca4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -138,6 +138,13 @@ ecrire/img_pack/m_envoi_rtl.gif -text
ecrire/img_pack/messagerie-24.gif -text
ecrire/img_pack/messagerie-48.gif -text
ecrire/img_pack/mot-cle-24.gif -text
+ecrire/img_pack/pave-blanc-16.png -text
+ecrire/img_pack/pave-blanc-24.png -text
+ecrire/img_pack/pave-blanc-48.png -text
+ecrire/img_pack/pave-gris-16.png -text
+ecrire/img_pack/pave-gris-24.png -text
+ecrire/img_pack/pave-gris-48.png -text
+ecrire/img_pack/pave-rouge-24.png -text
ecrire/img_pack/petite-cle.gif -text
ecrire/img_pack/petition-24.gif -text
ecrire/img_pack/poubelle.gif -text
diff --git a/ecrire/img_pack/pave-blanc-16.png b/ecrire/img_pack/pave-blanc-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..363993cc9f6d251088aa0cf42d4c5ecf94ecdaf8
GIT binary patch
literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAv7|ftIx;X^yK%)o!U)KhEOCt}
z3C>R|DNig)WpGT%PfAtr%uP&B4N6T+sVqF1Y6CJMz$e6Y_3G9C|Np;r>(=Shr$2rA
z^!oMdef#zSMV6<1iU6wNC<*cl2691w;a>CJNTAp%PZ!6Kid#tu>4{0n4$NoP^t@qU
zJaXU=&youa!qURZ4h)6{hK5N@VrF3t3`q&eN0knqIKm^~z{ArM!N}~u@NfzPhr%2o
z2F8|PCWVFqF9sF?Kh6e*Lz;{N4i>5mOdQKu2rKGnoXJ`3!pI`PtS!xbZ3Qcb0$ahE
nWKSNDOU|7*)ua29fdv>$TbX(;ta@qzbTxygtDnm{r-UW|#~E?g
literal 0
HcmV?d00001
diff --git a/ecrire/img_pack/pave-blanc-24.png b/ecrire/img_pack/pave-blanc-24.png
new file mode 100644
index 0000000000000000000000000000000000000000..742b554de819cc7d3e5e3cad7990d4533be8159f
GIT binary patch
literal 365
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGEa{HEjtmUfZd~z?Faq)=OI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<v1o(uwu2`|+|Ns9tZ{Ga$>C>rG
zr(VB)y=TuJph%@6t29szM@f)hFpvuZ4ELJ%Mgql-d%8G=RNP8RNKZ>jKEM?bA$gOL
zsiScwt4AWMPmWIy1LKhcM~-xG8*JXl#3H~ft?ifTrY6?Fkd%;cgjs@tsiVQffkAKr
z8;1hZB?d+p2PuUH4i9D)0mjS*1|<bv0SA^PK=UY3#LO+cuZ2gzfoDz5nTkz}4h)73
rpSjNYumDBg^sLd@v01^Pfsx^i3G;5d*9T4ly~N<@>gTe~DWM4fGUs#d
literal 0
HcmV?d00001
diff --git a/ecrire/img_pack/pave-blanc-48.png b/ecrire/img_pack/pave-blanc-48.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bf1014b7e765f00e7d43c731d3b7293eafa2abc
GIT binary patch
literal 491
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`v7|ftIx;X^yK%)o!U)KhEOCt}
z3C>R|DNig)WpGT%PfAtr%uP&B4N6T+sVqF1Y6Dax5#STzx?;tOn>TNM`t<44sZ+0C
zzuvQF&wnt83{>g{s^KUJ@(YHD{Aak=yf>18fzj2|#WAGfR#HNGQc9`<r@`h88<|-I
zn1zieC~+EWGTOul<R~jkuWaa?%Bs*H5fSNe?bxvsJOU0pJUJ;0Yz+)b!O{*46Ib#o
zG@Q7?Cg6~g#mu2#v=yjr<}C)M4xd~GMwew~LsS{F@yoZK35Nwh9*>xLBBPB77#cfx
py^9u$1BGtfjF{n>pTx`}!LU5UzBkx5Iusbl44$rjF6*2UngGMwp49*V
literal 0
HcmV?d00001
diff --git a/ecrire/img_pack/pave-gris-16.png b/ecrire/img_pack/pave-gris-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..07361cb5d2c0a06e5a41a6f630a5e7c45307e768
GIT binary patch
literal 353
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAv7|ftIx;X^yK%)o!U)KhEOCt}
z3C>R|DNig)WpGT%PfAtr%uP&B4N6T+sVqF1Y6CJMz$e7@<jIqN{`|Rn_wJ4zJFZ;0
zvU>IETeoig|NsA-cIj-O8jg}6zhEF21Q_l$?~MeC?e=tW45_%4l#rg1nC8l?<J0qo
zf$_+J69*0)YT>#eF=M6#BU49X>&#wG<_!kMj4T4o#@xbU2M#a^IPk2wab)I=2u3E3
zb{1i62Zo1J7&sK>2r)3W1T!f#6nHVP2>5X}FdWik6mYOmWnki1&Vo}>QbOusIk3$K
z8cY{SFaYi3j22;9ET+&PA#rnt<c$p~Yz+(`S0*|7+wmND!Yq)$ki*4Va>A{q5$FvD
MPgg&ebxsLQ0LZ6#umAu6
literal 0
HcmV?d00001
diff --git a/ecrire/img_pack/pave-gris-24.png b/ecrire/img_pack/pave-gris-24.png
new file mode 100644
index 0000000000000000000000000000000000000000..0540c61052c5df990cff3dd3f519cccda4e975e6
GIT binary patch
literal 383
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGEa{HEjtmUfZd~z?Faq)=OI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<v1o(uw9zTBk&!0crwryLnV#Vdl
zmv7#@dFRfZ|NsAM+sVHGs^KUJ@(TuXL4e_2^WI3H*iBCt$B>F!NeSsGiAl$}B5p|B
zWMt}SoY>gd$}63anvj&t!lA$>#ujEK)6m+<tI!}ZBjQE@6Ps8ALsG&q-P6ZT@d!9n
zEWJ4csH?%mfkAKr8;1hZB?d+p2PuUH4i9D)0mjS*1|<bv0SA^PWGOmw;7pgkCKHPQ
zGc)tNmNN_j4m>$Kgslvu8Gu5{+QQ#zn9jK{FdjK@?!>VsTW%wU%?b_;j0`?ogfnj_
S{QVE~B!j1`pUXO@geCx@oO|a0
literal 0
HcmV?d00001
diff --git a/ecrire/img_pack/pave-gris-48.png b/ecrire/img_pack/pave-gris-48.png
new file mode 100644
index 0000000000000000000000000000000000000000..39b2772f40e2d0d14a2a7459869aa7807282fbaf
GIT binary patch
literal 509
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`v7|ftIx;X^yK%)o!U)KhEOCt}
z3C>R|DNig)WpGT%PfAtr%uP&B4N6T+sVqF1Y6Dax5#STzdi?nDKY#wLSg~T;wr!U$
zU%q+s=AAot{{R1fZ08<npc;;nAirQB7X%pYHSdjNU|<aQba4!+xRsQUo|2fR#JORE
z;U;Dl0cK@pW^QTChN+D+dj%C5BqAgtZhEljoXKHeJaXX7AvdFh1V#=8HnmHo8#fv;
zvIs=px-o-+slz9ifzf4|Sp$Pou(Sii#Fe}X4JWR!2{@!=F>@#wZ3QZvd22{1Gc?#Z
zX<heJPGAs7NSw%!Fk%3Pjr2=iuLNTekXYnQ&+Pq8(tAO{a_+=2rzqjsj5m(3aTqWp
YZFjhN>t&1>FxVM9UHx3vIVCg!07rqSWB>pF
literal 0
HcmV?d00001
diff --git a/ecrire/img_pack/pave-rouge-24.png b/ecrire/img_pack/pave-rouge-24.png
new file mode 100644
index 0000000000000000000000000000000000000000..71d6382ef4c32b6375754f216d7695b0f062a4dd
GIT binary patch
literal 366
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGEa{HEjtmUfZd~z?Faq)=OI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<v1o(uw{%2(TfBN*7&d%SdsZTa<
zzI*rXPgB$X|Np;S>#z=}hNC3NFBr%L0fu|cdn18jCp=voLn>}1C8Vb$B_H6LAsKm-
zk*T9`;>?+?qS^^b$w{mn3T$d=VKEJ@y@Co25;r0WyfzydGP4LUGi%EoU=VO%SpwA1
zVB)|aIDw5rf$0(hql<%-LIZ~fPz_^d1A~$RFJ+1(X3YGcn$p0KlyGG3g~po<Kvx{7
pWKCCN0=ld$%q{Isq=3Q!2LE6DQ`ya2?SXz`@O1TaS?83{1OSX=ah(7F
literal 0
HcmV?d00001
diff --git a/ecrire/img_pack/tirets-separation.gif b/ecrire/img_pack/tirets-separation.gif
index e3e8af1e07a7519a949b34f2ce251ef720c1ee7e..d8e40fe8c10b611cf0bdfdc35b7b5fa12b7ae4ea 100644
GIT binary patch
delta 22
dcmXpu7I61;v#?AQVPIisU}PvRE}kf$3;;8P1l0fl
delta 22
bcmXpu7I61;v#?AQVPIisU}OM-i2}+1EXM<U
diff --git a/ecrire/inc_barre.php3 b/ecrire/inc_barre.php3
index 32e896f008..97df4fb58c 100644
--- a/ecrire/inc_barre.php3
+++ b/ecrire/inc_barre.php3
@@ -43,7 +43,7 @@ function bouton_barre_racc($action, $img, $help, $formulaire, $texte) {
$champhelp = "document.$formulaire.helpbox$texte";
return "<a href=\"".$action."\" class='spip_barre' tabindex='1000' title=\"".attribut_html($help)."\" "
."onMouseOver=\"helpline('$help',$champhelp)\" onMouseOut=\"helpline('Utilisez les raccourcis typographiques pour enrichir votre mise en page', $champhelp)\">"
- ."<img src='".($flag_ecrire ? "../" : "")."IMG/icones_barre/".$img."' border='0' height='16' align='middle'></a>";
+ ."<img src='".($flag_ecrire ? "../" : "")."IMG/icones_barre/".$img."' border='0' height='16' width='16'></a>";
}
function afficher_barre($formulaire='',$texte='', $forum=false) {
@@ -86,7 +86,7 @@ function afficher_barre($formulaire='',$texte='', $forum=false) {
$ret .= "</td>";
// Insertion de caracteres difficiles a taper au clavier (guillemets, majuscules accentuees...)
- $ret .= "<td align='right'>";
+ $ret .= "<td align='right' style='padding-top: 4px; padding-bottom: 2px;'>";
$col++;
if ($spip_lang == "fr" OR $spip_lang == "eo" OR $spip_lang == "cpf") {
$ret .= bouton_barre_racc ("javascript:barre_raccourci('«','»',$champ)", "guillemets.png", "Entourer de « guillemets français »", $formulaire, $texte);
diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3
index c965ba93d2..aa9421ea76 100644
--- a/ecrire/inc_presentation.php3
+++ b/ecrire/inc_presentation.php3
@@ -942,7 +942,11 @@ function debut_html($titre = "") {
<script type='text/javascript'><!--
function changeclass(objet, myClass)
{
- objet.className = myClass;
+ objet.className = myClass;
+}
+function changesurvol(iddiv, myClass)
+{
+ document.getElementById(iddiv).className = myClass;
}
//--></script>
</head>
@@ -1100,7 +1104,7 @@ function barre_onglets($rubrique, $onglet){
function icone_bandeau_principal($texte, $lien, $fond, $rubrique_icone = "vide", $rubrique = "", $lien_noscript = ""){
global $spip_display, $spip_ecran ;
- global $menu_accesskey;
+ global $menu_accesskey, $compteur_survol;
if ($spip_display == 1){
$hauteur = 20;
@@ -1145,36 +1149,37 @@ function icone_bandeau_principal($texte, $lien, $fond, $rubrique_icone = "vide",
$a_href = "<a$accesskey href=\"$lien\" class='icone'>";
}
+ $compteur_survol ++;
if ($rubrique_icone == $rubrique){
- echo "\n<td background='' align='center' width='$largeur' class=\"fondgrison\" $onClick>";
- echo "\n<table cellpadding=0 cellspacing=0 border=0 width=$largeur>";
- echo "<tr><td background=''>";
- echo "<img src='img_pack/rien.gif' width=$largeur height=1>";
- echo "</td></tr>";
- echo "<tr><td background='' align='center' width='$largeur' height='$hauteur'>";
+ echo "\n<td background='' align='center' valign='top' width='$largeur' onMouseOver=\"changesurvol('survol$compteur_survol','bouton48blanc');\" onMouseOut=\"changesurvol('survol$compteur_survol','bouton48gris');\" $onClick>";
+ if ($spip_display == 1) {
+ echo "\n<table cellpadding=0 cellspacing=0 border=0 width=$largeur class=\"fondgrison\" $onClick>";
+ echo "<tr><td background='' align='center' width='$largeur' height='$hauteur'>";
+ }
+ echo "<div><img src='img_pack/rien.gif' width=$largeur height=1></div>";
if ($spip_display != 1) {
- echo "$a_href_icone<img src='img_pack/$fond'$alt$title border='0'></a><br>";
+ echo "<div class='bouton48gris' id='survol$compteur_survol'>$a_href_icone<img src='img_pack/$fond'$alt$title border='0'></a></div>";
}
if ($spip_display != 3) {
- echo "$a_href<font face='Verdana,Arial,Helvetica,sans-serif' size='2' color='black'><b>$texte</b></font></a>";
+ echo "<div>$a_href<font face='Verdana,Arial,Helvetica,sans-serif' size='2' color='black'><b>$texte</b></font></a></div>";
}
- echo "</td></tr></table>";
+ if ($spip_display == 1) echo "</td></tr></table>";
echo "</td>\n";
}
else {
- echo "\n<td background='' align='center' width='$largeur' class=\"fondgris\" onMouseOver=\"changeclass(this,'fondgrison2');\" onMouseOut=\"changeclass(this,'fondgris');\" $onClick>";
- echo "\n<table cellpadding=0 cellspacing=0 border=0 width=$largeur>";
- echo "<tr><td background=''>";
- echo "<img src='img_pack/rien.gif' width=$largeur height=1>";
- echo "</td></tr>";
- echo "<tr><td background='' align='center' width='$largeur' height='$hauteur'>";
+ echo "\n<td background='' align='center' valign='top' width='$largeur' onMouseOver=\"changesurvol('survol$compteur_survol','bouton48blanc');\" onMouseOut=\"changesurvol('survol$compteur_survol','bouton48off');\" $onClick>";
+ if ($spip_display == 1) {
+ echo "\n<table cellpadding=0 cellspacing=0 border=0 width=$largeur class=\"fondgris\" onMouseOver=\"changeclass(this,'fondgrison2');\" onMouseOut=\"changeclass(this,'fondgris');\" $onClick>";
+ echo "<tr><td background='' align='center' width='$largeur' height='$hauteur'>";
+ }
+ echo "<div><img src='img_pack/rien.gif' width=$largeur height=1></div>";
if ($spip_display != 1) {
- echo "$a_href_icone<img src='img_pack/$fond'$alt$title border='0'></a><br>";
+ echo "<div class='bouton48off' id='survol$compteur_survol'>$a_href_icone<img src='img_pack/$fond'$alt$title border='0'></a></div>";
}
if ($spip_display != 3) {
- echo "$a_href<font face='Verdana,Arial,Helvetica,sans-serif' size='2' color='black'><b>$texte</b></font></a>";
+ echo "<div>$a_href<font face='Verdana,Arial,Helvetica,sans-serif' size='2' color='black'><b>$texte</b></font></a></div>";
}
- echo "</td></tr></table>";
+ if ($spip_display == 1) echo "</td></tr></table>";
echo "</td>\n";
}
@@ -1187,7 +1192,7 @@ function icone_bandeau_principal($texte, $lien, $fond, $rubrique_icone = "vide",
function icone_bandeau_secondaire($texte, $lien, $fond, $rubrique_icone = "vide", $rubrique, $aide=""){
global $spip_display;
- global $menu_accesskey;
+ global $menu_accesskey, $compteur_survol;
if ($spip_display == 1){
$hauteur = 20;
@@ -1202,6 +1207,7 @@ function icone_bandeau_secondaire($texte, $lien, $fond, $rubrique_icone = "vide"
else {
$hauteur = 70;
$largeur = 80;
+ if (strlen($aide) > 0) $largeur = 120;
$alt = " alt=\" \"";
}
@@ -1215,40 +1221,50 @@ function icone_bandeau_secondaire($texte, $lien, $fond, $rubrique_icone = "vide"
$menu_accesskey++;
}
if ($spip_display == 3) $accesskey_icone = $accesskey;
-
+ $compteur_survol ++;
+
if ($rubrique_icone == $rubrique){
- echo "\n<td background='' align='center' width='$largeur' class=\"fondgrison\">";
- echo "\n<table cellpadding=0 cellspacing=0 border=0>";
- if ($spip_display != 1){
+ echo "\n<td background='' align='center' valign='top' width='$largeur' onMouseOver=\"changesurvol('survol$compteur_survol','bouton24blanc');\" onMouseOut=\"changesurvol('survol$compteur_survol','bouton24gris');\">";
+ if ($spip_display == 1) {
+ echo "\n<table cellpadding=0 cellspacing=0 border=0 class=\"fondgrison\">";
echo "<tr><td background='' align='center'>";
- echo "<a$accesskey_icone href='$lien'><img src='img_pack/$fond'$alt$title width='24' height='24' border='0' align='middle'></a>";
- if (strlen($aide)>0) echo aide($aide);
- echo "</td></tr>";
}
- echo "<tr><td background=''>";
- echo "<img src='img_pack/rien.gif' width=$largeur height=1>";
- echo "</td></tr>";
- echo "</table>";
+ if ($spip_display != 1){
+ // echo "<div>";
+ echo "<div class='bouton24gris' id='survol$compteur_survol'><a$accesskey_icone href='$lien'><img src='img_pack/$fond'$alt$title width='24' height='24' border='0' align='middle'></a></div>";
+ //if (strlen($aide)>0) echo aide($aide);
+ // echo "</div>";
+ }
+ echo "<div><img src='img_pack/rien.gif' width=$largeur height=1></div>";
if ($spip_display != 3){
- echo "<a$accesskey href='$lien' class='icone'><font face='Verdana,Arial,Helvetica,sans-serif' size='1' color='black'><b>$texte</b></font></a>";
+ echo "<div><a$accesskey href='$lien' class='icone'><font face='Verdana,Arial,Helvetica,sans-serif' size='1' color='black'><b>$texte</b></font></a></div>";
+ }
+ if ($spip_display == 1) {
+ echo "</td></tr>";
+ echo "</table>";
}
echo "</td>";
}
else {
- echo "\n<td background='' align='center' width='$largeur' class=\"fondgris\" onMouseOver=\"changeclass(this,'fondgrison2');\" onMouseOut=\"changeclass(this,'fondgris');\">";
- echo "\n<table cellpadding=0 cellspacing=0 border=0>";
- if ($spip_display != 1){
+ echo "\n<td background='' align='center' valign='top' width='$largeur' onMouseOver=\"changesurvol('survol$compteur_survol','bouton24blanc');\" onMouseOut=\"changesurvol('survol$compteur_survol','bouton24off');\">";
+ if ($spip_display == 1) {
+ echo "\n<table cellpadding=0 cellspacing=0 border=0 class=\"fondgris\" onMouseOver=\"changeclass(this,'fondgrison2');\" onMouseOut=\"changeclass(this,'fondgris');\">";
echo "<tr><td background='' align='center'>";
- echo "<a$accesskey_icone href='$lien'><img src='img_pack/$fond'$alt$title width='24' height='24' border='0' align='middle'></a>";
- if (strlen($aide)>0) echo aide($aide);
- echo "</td></tr>";
}
- echo "<tr><td background=''>";
- echo "<img src='img_pack/rien.gif' width=$largeur height=1>";
- echo "</td></tr>";
- echo "</table>";
+ if ($spip_display != 1){
+ //echo "<div>";
+ echo "<div class='bouton24off' id='survol$compteur_survol'><a$accesskey_icone href='$lien'><img src='img_pack/$fond'$alt$title width='24' height='24' border='0' align='middle'></a></div>";
+ //echo "</div>";
+ }
+ echo "<div><img src='img_pack/rien.gif' width=$largeur height=1></div>";
if ($spip_display != 3){
- echo "<a$accesskey href='$lien' class='icone'><font face='Verdana,Arial,Helvetica,sans-serif' size='1' color='black'><b>$texte</b></font></a>";
+ echo "<div><a$accesskey href='$lien' class='icone'><font face='Verdana,Arial,Helvetica,sans-serif' size='1' color='black'><b>$texte</b></font></a>";
+ if (strlen($aide)>0) echo aide($aide);
+ echo "</div>";
+ }
+ if ($spip_display == 1) {
+ echo "</td></tr>";
+ echo "</table>";
}
echo "</td>";
}
@@ -1257,7 +1273,7 @@ function icone_bandeau_secondaire($texte, $lien, $fond, $rubrique_icone = "vide"
function icone($texte, $lien, $fond, $fonction="", $align="", $afficher='oui'){
- global $spip_display, $couleur_claire, $couleur_foncee;
+ global $spip_display, $couleur_claire, $couleur_foncee, $compteur_survol;
if (strlen($fonction) < 3) $fonction = "rien.gif";
if (strlen($align) > 2) $aligner = " ALIGN='$align' ";
@@ -1275,21 +1291,28 @@ function icone($texte, $lien, $fond, $fonction="", $align="", $afficher='oui'){
}
else {
$hauteur = 70;
- $largeur = 70;
+ $largeur = 80;
}
$style = 'iconeoff';
- if ($fonction == "supprimer.gif") $style = 'iconedanger';
+ $classe_image = 'bouton24gris';
+ if ($fonction == "supprimer.gif") {
+ $style = 'iconedanger';
+ $classe_image = 'bouton24rouge';
+ }
- $icone .= "\n<table cellpadding=0 cellspacing=0 border=0 $aligner width=$largeur class='$style' onMouseOver=\"changeclass(this,'iconeon');\" onMouseOut=\"changeclass(this,'$style');\" onClick=\"document.location='$lien'\">";
- $icone .= "<tr><td background='' align='center' valign='middle' width=$largeur height=$hauteur>";
- $icone .= "\n<table cellpadding=0 cellspacing=0 border=0>";
+ $compteur_survol ++;
+ if ($spip_display == 1) {
+ $icone .= "\n<table cellpadding=0 cellspacing=0 border=0 $aligner width=$largeur class='$style' onMouseOver=\"changeclass(this,'iconeon');\" onMouseOut=\"changeclass(this,'$style');\" onClick=\"document.location='$lien'\">";
+ $icone .= "<tr><td background='' align='center' valign='middle' width=$largeur height=$hauteur>";
+ }
+ $icone .= "\n<table cellpadding=0 cellspacing=0 border=0 $aligner width=$largeur onMouseOver=\"changesurvol('survol$compteur_survol','bouton24blanc');\" onMouseOut=\"changesurvol('survol$compteur_survol','$classe_image');\">";
if ($spip_display != 1){
$icone .= "<tr><td background='' align='center'>";
if ($fonction != "rien.gif"){
- $icone .= "\n<table cellpadding=0 cellspacing=0 border=0><tr><td background='img_pack/$fond'>";
+ $icone .= "\n<div class='$classe_image' id='survol$compteur_survol'><table cellpadding=0 cellspacing=0 border=0><tr><td background='img_pack/$fond'>";
$icone .= "<a href='$lien'><img src='img_pack/$fonction'$alt$title width='24' height='24' border='0'></a>";
- $icone .= "</td></tr></table>\n";
+ $icone .= "</td></tr></table></div>\n";
}
else {
$icone .= "\n<table cellpadding=0 cellspacing=0 border=0><tr><td background=''>";
@@ -1307,8 +1330,10 @@ function icone($texte, $lien, $fond, $fonction="", $align="", $afficher='oui'){
$icone .= "</td></tr>";
}
$icone .= "</table>";
- $icone .= "</td></tr>";
- $icone .= "</table>";
+ if ($spip_display == 1) {
+ $icone .= "</td></tr>";
+ $icone .= "</table>";
+ }
if ($afficher == 'oui')
echo $icone;
@@ -1317,7 +1342,7 @@ function icone($texte, $lien, $fond, $fonction="", $align="", $afficher='oui'){
}
function icone_horizontale($texte, $lien, $fond = "", $fonction = "") {
- global $spip_display, $couleur_claire, $couleur_foncee;
+ global $spip_display, $couleur_claire, $couleur_foncee, $compteur_survol;
if (strlen($fonction) < 3) $fonction = "rien.gif";
@@ -1325,21 +1350,34 @@ function icone_horizontale($texte, $lien, $fond = "", $fonction = "") {
$largeur = "100%";
$style = "icone-h";
- if ($fonction == "supprimer.gif") $style = "icone-h-danger";
+ $classe_image = "bouton24gris";
+ if ($fonction == "supprimer.gif") {
+ $style = "icone-h-danger";
+ $classe_image = "bouton24rouge";
+ }
+ $compteur_survol++;
- echo "\n<table class=\"$style\" onMouseOver=\"changeclass(this,'icone-h-on');\" onMouseOut=\"changeclass(this,'$style');\" onClick=\"document.location='$lien'\">";
- echo "<tr>";
+ if ($spip_display == 1) {
+ echo "\n<table class=\"$style\" onMouseOver=\"changeclass(this,'icone-h-on');\" onMouseOut=\"changeclass(this,'$style');\" onClick=\"document.location='$lien'\">";
+ echo "<tr>";
+ } else {
+ echo "\n<table cellpadding='0' cellspacing='1' border='0' onMouseOver=\"changesurvol('survol$compteur_survol','bouton24blanc');\" onMouseOut=\"changesurvol('survol$compteur_survol','$classe_image');\" onClick=\"document.location='$lien'\">";
+ echo "<tr>";
+ }
if ($spip_display != 1 AND $fond != "") {
- echo "<td class='image' style='background-image: url(\"img_pack/$fond\")'>";
- echo "<a href='$lien'>";
- echo "<img src='img_pack/$fonction' alt=''>";
- echo "</a>";
+ echo "<td>";
+ echo "<div id='survol$compteur_survol' class='$classe_image'>";
+ echo "<div style='background-image: url(\"img_pack/$fond\")'><a href='$lien'>";
+ echo "<img src='img_pack/$fonction' alt='' border='0'>";
+ echo "</a></div>";
+ echo "</div>";
echo "</td>";
+ echo "<td width='5'></td>";
}
echo "<td valign='middle'>";
- echo "<a href='$lien'>";
+ echo "<a href='$lien' class='verdana1' style='color:#666666; font-weight:bold;'>";
echo "$texte";
echo "</a>";
echo "</td></tr>";
diff --git a/ecrire/spip_style.php3 b/ecrire/spip_style.php3
index fe0f34513b..478413696e 100644
--- a/ecrire/spip_style.php3
+++ b/ecrire/spip_style.php3
@@ -31,6 +31,50 @@ body { font-family: Verdana,Arial,Helvetica,sans-serif; }
.fondgris { cursor: pointer; padding: 4px; margin: 1px; }
.fondgrison { cursor: pointer; padding: 3px; margin: 1px; border: 1px dashed #999999; background-color: #e4e4e4; }
.fondgrison2 { cursor: pointer; padding: 3px; margin: 1px; border: 1px dashed #999999; background-color: white; }
+.bouton48gris {
+ background:url(img_pack/pave-gris-48.png);
+ padding: 3px;
+ margin-bottom: 2px;
+ width: 48px;
+ height: 48px;
+}
+.bouton48blanc {
+ background:url(img_pack/pave-blanc-48.png);
+ padding: 3px;
+ margin-bottom: 2px;
+ width: 48px;
+ height: 48px;
+}
+.bouton48off {
+ padding: 3px;
+ margin-bottom: 2px;
+ width: 48px;
+ height: 48px;
+}
+.bouton24gris {
+ background:url(img_pack/pave-gris-24.png);
+ padding: 3px;
+ width: 24px;
+ height: 24px;
+}
+.bouton24blanc {
+ background:url(img_pack/pave-blanc-24.png);
+ padding: 3px;
+ width: 24px;
+ height: 24px;
+}
+.bouton24rouge {
+ background:url(img_pack/pave-rouge-24.png);
+ padding: 3px;
+ width: 24px;
+ height: 24px;
+}
+.bouton24off {
+ padding: 3px;
+ width: 24px;
+ height: 24px;
+}
+
.reliefblanc { background-image: url(img_pack/barre-blanc.gif) }
.reliefgris { background-image: url(img_pack/barre-noir.gif) }
@@ -58,18 +102,17 @@ a.icone:hover { text-decoration: none; }
* Barre de raccourcis
*/
-a.spip_barre img {
- border-left: 1px solid #ffffff;
- border-top: 1px solid #ffffff;
- border-right: 1px solid #666666;
- border-bottom: 1px solid #666666;
- padding: 3px;
- background-color: <?php echo $couleur_claire; ?>;
-}
-a.spip_barre:hover img {
- border: 1px solid #808080;
- padding: 3px;
- background-color: #f8f8f4;
+a.spip_barre {
+ border: 0px solid #666666;
+ padding: 4px;
+ margin-right: 3px;
+ background: url(img_pack/pave-gris-16.png);
+}
+a.spip_barre:hover {
+ border: 0px solid #666666;
+ padding: 4px;
+ margin-right: 3px;
+ background: url(img_pack/pave-blanc-16.png);
}
td.icone table {
@@ -174,10 +217,6 @@ td.icone a img {
background-color: #f0f0f0;
width: 100%;
color: #666666;
- text-decoration: none;
- font-family: Verdana,Arial,Helvetica,sans-serif;
- font-size: 10px;
- font-weight: bold;
}
.icone-h-danger {
padding: 3px;
@@ -185,11 +224,6 @@ td.icone a img {
border: 1px dashed black;
background: url(img_pack/rayures-sup.gif);
width: 100%;
- color: #666666;
- text-decoration: none;
- font-family: Verdana,Arial,Helvetica,sans-serif;
- font-size: 10px;
- font-weight: bold;
}
.icone-h-on {
cursor: pointer;
@@ -201,51 +235,10 @@ td.icone a img {
border-top: solid 1px #666666;
background-color: #eeeeee;
width: 100%;
- color: #666666;
- text-decoration: none;
- font-family: Verdana,Arial,Helvetica,sans-serif;
- font-size: 10px;
- font-weight: bold;
-}
-.icone-h .image {
- width: 24px;
- height: 24px;
- background-repeat: no-repeat;
-}
-.icone-h-on .image {
- width: 24px;
- height: 24px;
- background-repeat: no-repeat;
-}
-.icone-h a {
- color: #666666;
- text-decoration: none;
-}
-.icone-h-danger a {
- color: #666666;
- text-decoration: none;
-}
-.icone-h-on a {
- color: #666666;
- text-decoration: none;
-}
-.icone-h .image img {
- width: 24px;
- height: 24px;
- border: 0px;
-}
-.icone-h-danger .image img {
- width: 24px;
- height: 24px;
- border: 0px;
-}
-.icone-h-on .image img {
- width: 24px;
- height: 24px;
- border: 0px;
}
+
/*
* Styles generes par les raccourcis de mis en page
*/
--
GitLab