diff --git a/.gitattributes b/.gitattributes
index 5fbc1551885c141e171f5a7b7843d6dcd234c694..fc2897979c9805946cd4c8d9fd9b31ebe6342470 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
Binary files a/ecrire/img_pack/deconnecter-24_rtl.gif and /dev/null differ
diff --git a/ecrire/img_pack/heures-am.png b/ecrire/img_pack/heures-am.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ded5eec0772970e16b9bfcafdb07c7a1a9373b9
Binary files /dev/null and b/ecrire/img_pack/heures-am.png differ
diff --git a/ecrire/img_pack/heures-pm.png b/ecrire/img_pack/heures-pm.png
new file mode 100644
index 0000000000000000000000000000000000000000..82e87bf94fffd2ed8354f768308ae8afd2193c05
Binary files /dev/null and b/ecrire/img_pack/heures-pm.png differ
diff --git a/ecrire/img_pack/heures-tout.png b/ecrire/img_pack/heures-tout.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ce56aa9fecf4dab4079b202b57c3fbc56802bd2
Binary files /dev/null and b/ecrire/img_pack/heures-tout.png differ
diff --git a/ecrire/img_pack/loupe-moins.gif b/ecrire/img_pack/loupe-moins.gif
new file mode 100644
index 0000000000000000000000000000000000000000..672b14e2f11f4fa5ae80cea38e3e26a40f6b138b
Binary files /dev/null and b/ecrire/img_pack/loupe-moins.gif differ
diff --git a/ecrire/img_pack/loupe-plus.gif b/ecrire/img_pack/loupe-plus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fc0f1359b04c95ce65d78696b9e4c67bedf088cf
Binary files /dev/null and b/ecrire/img_pack/loupe-plus.gif differ
diff --git a/ecrire/inc_calendrier.php b/ecrire/inc_calendrier.php
index e27539fc3ca7f91089c4273d8ebac7636ff2504d..5887bd8a07a3861382f7537e965edd952fc53b91 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 64b698fdc330ef5c0cd1eba6426601bca82cac63..8e4fc3a2ad3e34b7f3e494620ca41a12a5b16ea5 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 0ecd9eb9dbb44233d0b7c1170620e16762e94f57..c7be6e08437870e515888ace49cf61ab6736dba0 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);
}