From cc8fecca55197080981fa46c8812243fe09da687 Mon Sep 17 00:00:00 2001
From: ARNO* <arno@rezo.net>
Date: Thu, 5 Aug 2004 13:00:21 +0000
Subject: [PATCH] Icones dans calendrier: zoom +/-, AM/PM Suppresion icone
deconnecter RTL
---
.gitattributes | 6 ++++-
ecrire/img_pack/deconnecter-24_rtl.gif | Bin 208 -> 0 bytes
ecrire/img_pack/heures-am.png | Bin 0 -> 413 bytes
ecrire/img_pack/heures-pm.png | Bin 0 -> 447 bytes
ecrire/img_pack/heures-tout.png | Bin 0 -> 403 bytes
ecrire/img_pack/loupe-moins.gif | Bin 0 -> 256 bytes
ecrire/img_pack/loupe-plus.gif | Bin 0 -> 281 bytes
ecrire/inc_calendrier.php | 32 +++++++++++++++----------
ecrire/inc_presentation.php3 | 10 ++------
ecrire/spip_style.php3 | 2 +-
10 files changed, 28 insertions(+), 22 deletions(-)
delete mode 100644 ecrire/img_pack/deconnecter-24_rtl.gif
create mode 100644 ecrire/img_pack/heures-am.png
create mode 100644 ecrire/img_pack/heures-pm.png
create mode 100644 ecrire/img_pack/heures-tout.png
create mode 100644 ecrire/img_pack/loupe-moins.gif
create mode 100644 ecrire/img_pack/loupe-plus.gif
diff --git a/.gitattributes b/.gitattributes
index 5fbc155188..fc2897979c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -103,7 +103,6 @@ ecrire/img_pack/cookie-24.gif -text
ecrire/img_pack/creer.gif -text
ecrire/img_pack/croix-rouge.gif -text
ecrire/img_pack/deconnecter-24.gif -text
-ecrire/img_pack/deconnecter-24_rtl.gif -text
ecrire/img_pack/degrade.jpg -text
ecrire/img_pack/deplierbas.gif -text
ecrire/img_pack/deplierhaut.gif -text
@@ -127,6 +126,9 @@ ecrire/img_pack/forum-droite_rtl.gif -text
ecrire/img_pack/forum-interne-24.gif -text
ecrire/img_pack/forum-vert.gif -text
ecrire/img_pack/groupe-mot-24.gif -text
+ecrire/img_pack/heures-am.png -text
+ecrire/img_pack/heures-pm.png -text
+ecrire/img_pack/heures-tout.png -text
ecrire/img_pack/historique-24.gif -text
ecrire/img_pack/image-24.gif -text
ecrire/img_pack/interface-display.gif -text
@@ -138,6 +140,8 @@ ecrire/img_pack/langues-24.gif -text
ecrire/img_pack/langues-modif-12.gif -text
ecrire/img_pack/langues-off-12.gif -text
ecrire/img_pack/logo-spip.gif -text
+ecrire/img_pack/loupe-moins.gif -text
+ecrire/img_pack/loupe-plus.gif -text
ecrire/img_pack/loupe.gif -text
ecrire/img_pack/m_envoi.gif -text
ecrire/img_pack/m_envoi_bleu.gif -text
diff --git a/ecrire/img_pack/deconnecter-24_rtl.gif b/ecrire/img_pack/deconnecter-24_rtl.gif
deleted file mode 100644
index c6f5141d11080d4f03414d5e8d26415fbfae93b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 208
zcmV;>05AVXNk%w1VHyAw0J9GOt*x!1uu_YQi-CcG|NsAHW@g_2Bme*a#pE28mX`GN
z^tR42`1tt5;vdt~)9&u>A^8LW000jFEC2ui02%-k000Diu*gZPl`j{<yZ>O3J=<WO
zXo?b|MyM-z9PC)arfkqH`Qn4m!LX~jfWgj?IBOnmI3;mPeg2|^CAA8LWw&4}lA{Ih
zx+<ypeD$h#PB9R`Q1fgrgnqAY1OyIJcSn4M2nz`S3S@&m1BQiufE+<RXh<uTAe)?)
K7oQg+5db^N?pn71
diff --git a/ecrire/img_pack/heures-am.png b/ecrire/img_pack/heures-am.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ded5eec0772970e16b9bfcafdb07c7a1a9373b9
GIT binary patch
literal 413
zcmV;O0b>4%P)<h;3K|Lk000e1NJLTq000dD000dL1^@s6a_i)L00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzFG)l}RCwBA
zWIzI`si_G-${&aWkc2k?@y6M+XD@&WFhUgz0IB(0yng~TjovXxDSTznRE%Yi5(r_q
zaNz>O=FOWK-oAYc(wqp?{DBFoc|O1J&j9D3#|-jnpBY%${xKXq@Q8tni;Ka^%8H@3
zww6IwRu*LYe2`*hkduHmR5<!S1uKSuUF(<`e0_bvY*toQ22)d0hSR4{YiMd}J_On1
z4{{Q+25bOiE7TBwkfs2TABX`41_mH10PH7Rwxp${fibdeAix45e*a>^&{)=B!=NG+
zha&dv+cz)`vT4J!2i!zC4;1_$^&m|fub&eF+lCK-Yyrg=NIerMroVk=*>Gr!6i$sG
z4ZXd+;0Ok(XMu_*etgT$uy>s-JVn41qo)XXG9oqY0R$KTc$a)<*$@oB00000NkvXX
Hu0mjftTCaZ
literal 0
HcmV?d00001
diff --git a/ecrire/img_pack/heures-pm.png b/ecrire/img_pack/heures-pm.png
new file mode 100644
index 0000000000000000000000000000000000000000..82e87bf94fffd2ed8354f768308ae8afd2193c05
GIT binary patch
literal 447
zcmV;w0YLtVP)<h;3K|Lk000e1NJLTq000dD000dL1^@s6a_i)L00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzQAtEWRCwBA
zWIzI`si_G-${&aWkc2k?@y6M+XD@&WFhUgz0IB)H!omT*zP=0w1_lgQ9@Q|se0!PU
z*#mBd>*s_RzI|o^X-))c{=fp&JYQB;HlVn;n1PFn3oLN%_%8+poqr7SYM&XT6uvSX
z+9DP3@hv+@Dv$}}B#;fr8ep1WfR*hZgPqSa1}@$|0U-5EAU}YdgscG@0BO`TdIw_q
zgER$z{6Gu<ITNHFqzR`j>t-v1F|utS01k+6-@ajJOex}Fc=!1tirDX8U^^H<<c13u
zE)eBBQ1FA)gEVd2ym>R&HhchN3n;!o>Y2}-J9j}-Q`6w;)vFq&rlt(6tgK)~Pv7ih
z`2Oo9Tmvwk7`}X9+W?H*N@kFtv9a;aPoF+%oIZV81LQYgyfM7`xR2q}m)8tW?(#64
p+9v_l07?-+OMWntllA}t3;+qYgt1IA2j~C*002ovPDHLkV1oFCv%UZT
literal 0
HcmV?d00001
diff --git a/ecrire/img_pack/heures-tout.png b/ecrire/img_pack/heures-tout.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ce56aa9fecf4dab4079b202b57c3fbc56802bd2
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq000dD000dL1^@s6a_i)L00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzB}qg<RCwBA
zWIzI`si_G-${&aWkc2k?@y6M+XD@&WFhUgz0IB(0yng~TjovXxDSTyMW&6kQ`xg_#
zvj^M^*Ut$teEZA-(wqp?{DBFoc|O1J&j9D3#|-jnpTQbH3PCi84-yB-gVcc(GlQH2
zw4uV$|0!4z3>@Af#h_{Y9?WKD{?8z*{DtAkJzfnx9n*&(oBTmeLe_u{faF2yK<Yu7
z0ziHs20+yXFu_d02G-4124iH~K!62AfI<mfV^Hc{3`0QbKmbH;00k>C0IF^SNYh48
z@WM>N1wis3bs+W3=gytG01QThmruAfK*0(MUThi;0i)o{2eu8s$gPAKpZM`D`-Z*i
xWEmdb;)UA^qCtF+I7l9(4xWriO?v<V1^~dGd-$$3K(hb<002ovPDHLkV1gl%pIHC^
literal 0
HcmV?d00001
diff --git a/ecrire/img_pack/loupe-moins.gif b/ecrire/img_pack/loupe-moins.gif
new file mode 100644
index 0000000000000000000000000000000000000000..672b14e2f11f4fa5ae80cea38e3e26a40f6b138b
GIT binary patch
literal 256
zcmV+b0ssC-Nk%w1VHyAw0J8u9l$DO7tY)>xNWsuw&(F{C^W=GaY0=z|yT@|k>9U`n
zpNWZyva+%O003oWW&i*GA^8LV00000EC2ui02%-k000E7(8)=wwTo%3%rw9zZi~b`
z=%YBn;dV=r&JSaz9pWZ@vMjWe&2f4V9D`k=&@&Wi!y+J%JS-mtCc+S`-5w6X;79(s
z95U!PJZQMz4V{4yjH1|OasYv@f2RTh0fU5tTz*6-M}Yzej*bIPU3Mr728;ulkq!!z
zUsxppi~$}Joob0Q1f>p6E2gMVT{sh`D3r4^ube`kxwNoeslU3l!WkpUBP9|)7thcW
G5db@Wi)!rv
literal 0
HcmV?d00001
diff --git a/ecrire/img_pack/loupe-plus.gif b/ecrire/img_pack/loupe-plus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fc0f1359b04c95ce65d78696b9e4c67bedf088cf
GIT binary patch
literal 281
zcmV+!0p|WkNk%w1VHyAw0J8u9lA2w_(rLHJNY2`W=k36Yi;AhLpziVDd3<H1ta{qx
zp~lC>va+%O00960|7B%mA^8LV00000EC2ui02%-k000EW@X1N5wJ2%BIqO=2JWN>@
z5-=zVK^%wUz%H9Si!3uK+Y*RI0d}Y<1`mVI!F#A!t{`IJBKQV~!m_DaA-;_)!Z^Tc
zb=<O|!EQGgSMxSi#)7|@RXLEII|F+nVIg$^0ZD!UhILYkbpru6IcO;YhL<6LkcMAN
zOqG_GqMHH$B%WLXs-dEWst*XBpH8c_wgMBAl%Th&rWCrfBeb@^D8Rc63&XI?1vv{9
flT8dV2Ok9mB{4eD$W7WN;^QY3*%#>P6A=JAvOINy
literal 0
HcmV?d00001
diff --git a/ecrire/inc_calendrier.php b/ecrire/inc_calendrier.php
index e27539fc3c..5887bd8a07 100644
--- a/ecrire/inc_calendrier.php
+++ b/ecrire/inc_calendrier.php
@@ -279,27 +279,35 @@ function http_calendrier_navigation($jour, $mois, $annee, $echelle, $nom,
$retour .= " ";
$retour .= http_calendrier_href($script . "type=$type&set_echelle=" .
floor($echelle * 1.5) . "&$args",
- "<img src='$img_dir/loupe.gif' alt='zoom-' />");
+ "<img src='$img_dir/loupe-moins.gif' alt='zoom-' />");
$retour .= http_calendrier_href(($script . "type=$type&set_echelle=" .
floor($echelle / 1.5) .
"&$args"),
- "<img src='$img_dir/loupe.gif' alt='zoom-' />");
-
- $retour .= "<span style='font-size: 9px'>";
- $retour .= http_calendrier_href(($script . "type=$type".
+ "<img src='$img_dir/loupe-plus.gif' alt='zoom+' />");
+
+ $retour .= " ";
+
+
+ if ($GLOBALS['partie_cal'] == "tout") $img_att = " class='navigation-bouton-desactive'";
+ else $img_att = "";
+ $retour .= "<span$img_att>".http_calendrier_href(($script . "type=$type".
"&set_partie_cal=tout" .
"&$args"),
- " [tout]");
- $retour .= http_calendrier_href(($script . "type=$type".
+ "<img src='$img_dir/heures-tout.png' alt='tout' class='format_png' /></span>");
+
+ if ($GLOBALS['partie_cal'] == "matin") $img_att = " class='navigation-bouton-desactive'";
+ else $img_att = "";
+ $retour .= "<span$img_att>".http_calendrier_href(($script . "type=$type".
"&set_partie_cal=matin" .
"&$args"),
- "[AM]");
- $retour .= http_calendrier_href(($script . "type=$type".
+ "<img src='$img_dir/heures-am.png' alt='AM' class='format_png' /></span>");
+
+ if ($GLOBALS['partie_cal'] == "soir") $img_att = " class='navigation-bouton-desactive'";
+ else $img_att = "";
+ $retour .= "<span$img_att>".http_calendrier_href(($script . "type=$type".
"&set_partie_cal=soir" .
"&$args"),
- "[PM]");
- $retour .= "</span>";
-
+ "<img src='$img_dir/heures-pm.png' alt='PM' class='format_png' /></span>");
}
diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3
index 64b698fdc3..8e4fc3a2ad 100644
--- a/ecrire/inc_presentation.php3
+++ b/ecrire/inc_presentation.php3
@@ -2250,13 +2250,7 @@ else {
$ecran = "<div><b>"._T('info_petit_ecran')."</b>/<a href='".$lien->getUrl()."' class='lien_sous'>"._T('info_grand_ecran')."</a></div>";
}
-
- // choix de la couleur
- //echo "<img src='img_pack/rien.gif' width='10' height='1' />";
- //echo "<img src='img_pack/barre-couleurs.gif' onMouseOver=\"changestyle('bandeauinterface','visibility', 'visible');\" alt='' width='70' height='10' border='0' usemap='#map_couleur'>";
-
-
- // Choix de la couleur: automatique en fonction de $couleur_spip
+ // Choix de la couleur: automatique en fonction de $couleurs_spip
// nettoyer le lien global
$clean_link->delVar('var_lang');
@@ -2289,7 +2283,7 @@ else {
echo "<td class='bandeau_couleur' style='text-align: $spip_lang_right; width: 28px;' valign='middle'>";
if ($auth_can_disconnect) {
- echo "<a href='../spip_cookie.php3?logout=$connect_login' class='icone26' onMouseOver=\"changestyle('bandeaudeconnecter','visibility', 'visible');\"><img src='img_pack/deconnecter-24$spip_lang_rtl.gif' border='0'></a>";
+ echo "<a href='../spip_cookie.php3?logout=$connect_login' class='icone26' onMouseOver=\"changestyle('bandeaudeconnecter','visibility', 'visible');\"><img src='img_pack/deconnecter-24.gif' border='0'></a>";
}
echo "</td>";
diff --git a/ecrire/spip_style.php3 b/ecrire/spip_style.php3
index 0ecd9eb9db..c7be6e0843 100644
--- a/ecrire/spip_style.php3
+++ b/ecrire/spip_style.php3
@@ -1072,7 +1072,7 @@ div.navigation-calendrier img {
margin: 1px;
}
-div.navigation-calendrier img.navigation-bouton-desactive {
+.navigation-bouton-desactive {
-moz-opacity: 0.3;
filter: alpha(opacity=30);
}
--
GitLab