diff --git a/ecrire/calendrier.css b/ecrire/calendrier.css index e2aee628b697ca2c489627b919a3a2129ae5200d..6f42ed324708a365f3f547f09e02b4d437d9d10e 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 e4723a9abed78570d0f95d0e4df265e8a48b3208..93c4a8485078d3c716b5030f494e097bcca8758a 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 8e5a56559d8586fffcbc58331817406eb7a28e6d..f7c6ad80481a7c6bffefcf4c0bf32f5060a300b1 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();