From c1b3b3fbc8d45d41022e7a390dccd5b5da932653 Mon Sep 17 00:00:00 2001
From: ARNO* <arno@rezo.net>
Date: Sun, 30 Nov 2003 12:23:32 +0000
Subject: [PATCH] =?UTF-8?q?Bug:=20la=20semaine=20d'un=20dimanche=20=C2=8Et?=
=?UTF-8?q?ait=20la=20semaine=20suivante.=20Au=20passage,=20jolis=20arrond?=
=?UTF-8?q?is=20dans=20ligne=20de=20s=C2=8Election=20d'une=20semaine?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/calendrier_semaine.php3 | 2 +-
ecrire/inc_agenda.php3 | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ecrire/calendrier_semaine.php3 b/ecrire/calendrier_semaine.php3
index ced782c628..51292702bb 100644
--- a/ecrire/calendrier_semaine.php3
+++ b/ecrire/calendrier_semaine.php3
@@ -16,11 +16,11 @@ function afficher_semaine($jour_today,$mois_today,$annee_today){
$nom = mktime(1,1,1,$mois_today,$jour_today,$annee_today);
$jour_semaine = date("w",$nom);
+ if ($jour_semaine==0) $jour_semaine=7;
$debut = date("Y-m-d",mktime (1,1,1,$mois_today, $jour_today-$jour_semaine+1, $annee_today));
$fin = date("Y-m-d",mktime (1,1,1,$mois_today, $jour_today-$jour_semaine+7, $annee_today));
- if ($jour_semaine==0) $jour_semaine=7;
if ($spip_ecran == "large") {
$largeur_table = 974;
diff --git a/ecrire/inc_agenda.php3 b/ecrire/inc_agenda.php3
index bcdec917ad..1ad747e823 100644
--- a/ecrire/inc_agenda.php3
+++ b/ecrire/inc_agenda.php3
@@ -14,6 +14,7 @@ define("_ECRIRE_INC_AGENDA", "1");
function agenda ($mois, $annee, $jour_ved, $mois_ved, $annee_ved, $semaine = false) {
global $couleur_foncee, $couleur_claire;
global $connect_id_auteur;
+ global $spip_lang_left, $spip_lang_right;
$today=getdate(time());
$jour_today = $today["mday"];
@@ -42,6 +43,7 @@ function agenda ($mois, $annee, $jour_ved, $mois_ved, $annee_ved, $semaine = fal
if ($semaine) {
$jour_valide = mktime(1,1,1,$mois_ved,$jour_ved,$annee_ved);
$jour_semaine_valide = date("w",$jour_valide);
+ if ($jour_semaine_valide==0) $jour_semaine_valide=7;
$debut = mktime(1,1,1,$mois_ved,$jour_ved-$jour_semaine_valide+1,$annee_ved);
$fin = mktime(1,1,1,$mois_ved,$jour_ved-$jour_semaine_valide+7,$annee_ved);
}
@@ -69,7 +71,16 @@ function agenda ($mois, $annee, $jour_ved, $mois_ved, $annee_ved, $semaine = fal
echo "<a href='$lien?jour=$j&mois=$mois&annee=$annee' style='color: black'><b>$j</b></a>";
echo "</td>";
} else if ($semaine AND $nom >= $debut AND $nom <= $fin) {
- echo "<td class='arial2' style='margin: 0px; padding: 3px; background-color: white; text-align: center;'>";
+ if ($jour_semaine==1) {
+ $style = "-moz-border-radius-top$spip_lang_left: 5px; -moz-border-radius-bottom$spip_lang_left: 5px;";
+ }
+ else if ($jour_semaine==7) {
+ $style = "-moz-border-radius-top$spip_lang_right: 5px; -moz-border-radius-bottom$spip_lang_right: 5px;";
+ }
+ else {
+ $style = "";
+ }
+ echo "<td class='arial2' style='margin: 0px; padding: 3px; background-color: white; text-align: center; $style'>";
echo "<a href='calendrier_semaine.php3?jour=$j&mois=$mois&annee=$annee' style='color: black'><b>$j</b></a>";
echo "</td>";
} else {
--
GitLab