From 3a7a9df1dced7e3dd5913d5134e3e9f888e12f4b Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Thu, 31 Mar 2005 21:29:09 +0000
Subject: [PATCH] =?UTF-8?q?r=C3=A9tablissement=20du=20nom=20du=20jour=20su?=
=?UTF-8?q?r=20le=20calendrier=20des=20scripts=20index=20&=20message;=20me?=
=?UTF-8?q?nage=20dans=20la=20bibli=20principale,=20pas=20encore=20ideal?=
=?UTF-8?q?=20mais=20minuit=20approche....?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/calendrier.css | 5 +----
ecrire/index.php3 | 22 +++++++++++-----------
ecrire/message.php3 | 1 +
3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/ecrire/calendrier.css b/ecrire/calendrier.css
index e2aee628b6..6f42ed3247 100644
--- a/ecrire/calendrier.css
+++ b/ecrire/calendrier.css
@@ -93,10 +93,7 @@ a.calendrier-annee:hover {
.calendrier-jour {
color: #999999;
background-color: white;
- border-left: 1px solid #aaaaaa;
- border-right: 1px solid #aaaaaa;
- border-bottom: 1px solid #aaaaaa;
- border-top: 1px solid #aaaaaa;
+ border: 1px solid #aaaaaa;
}
.calendrier-agenda {
diff --git a/ecrire/index.php3 b/ecrire/index.php3
index e4723a9abe..93c4a84850 100644
--- a/ecrire/index.php3
+++ b/ecrire/index.php3
@@ -168,20 +168,20 @@ if ($spip_display != 4) {
// rendez-vous personnels dans le mois
$evt = sql_calendrier_agenda($mois, $annee);
- if ($evt) {
- echo "<p />";
- echo http_calendrier_agenda ($mois_today, $annee_today, $jour_today, $mois_today, $annee_today, false, 'calendrier.php3', $evt);
- }
+ if ($evt)
+ echo http_calendrier_agenda ($mois_today, $annee_today, $jour_today, $mois_today, $annee_today, false, 'calendrier.php3', '', $evt);
+
// et ceux du jour
- if (spip_num_rows(spip_query("SELECT messages.id_message FROM spip_messages AS messages, spip_auteurs_messages AS lien ".
- "WHERE ((lien.id_auteur='$connect_id_auteur' AND lien.id_message=messages.id_message) OR messages.type='affich') ".
- "AND messages.rv='oui' AND messages.date_heure >='$annee_today-$mois_today-$jour_today' AND messages.date_heure < DATE_ADD('$annee_today-$mois_today-$jour_today', INTERVAL 1 DAY) AND messages.statut='publie' LIMIT 0,1"))) {
- echo "<p />";
- echo http_calendrier_jour($jour_today,$mois_today,$annee_today, "col", $partie_cal, $echelle);
- }
+ $evt = date("Y-m-d");
+ $evt = sql_calendrier_interval_rv("'$evt'", "'$evt 23:59:59'");
+
+ if ($evt)
+ {
+ echo http_calendrier_entetecol('calendrier.php3',$jour_today,$mois_today,$annee_today);
+ echo http_calendrier_jour($jour_today,$mois_today,$annee_today, 90, $partie_cal, $echelle, '', '', '', array('', $evt));
+ }
}
-
debut_droite();
diff --git a/ecrire/message.php3 b/ecrire/message.php3
index 8e5a56559d..f7c6ad8048 100644
--- a/ecrire/message.php3
+++ b/ecrire/message.php3
@@ -280,6 +280,7 @@ if ($row = spip_fetch_array(spip_query("SELECT * FROM spip_messages WHERE id_mes
if ($rv != "non") {
creer_colonne_droite();
+ echo http_calendrier_entetecol('', $lejour,$lemois,$lannee);
echo http_calendrier_jour($lejour,$lemois,$lannee, 90, $partie_cal, $echelle, $id_message);
}
debut_droite();
--
GitLab