* Calendar day view: in am/pm mode, display midnight as 12:00am, not 0:00am

[citadel.git] / webcit / calendar_view.c

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 9a9cd74cda354a542ef6a561a2cbbc11faf295b2..69bf1bf4393ac63f03a15bd82eef2e2c8554d27d 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -1093,7 +1093,7 @@ void calendar_day_view(int year, int month, int day) {
                }
                else {
                        wprintf("%d:00%s</a> ",
-                               (hour <= 12 ? hour : hour-12),
+                               ((hour == 0) ? 12 : (hour <= 12 ? hour : hour-12)),
                                (hour < 12 ? "am" : "pm")
                                );
                }
@@ -1140,10 +1140,13 @@ void calendar_day_view(int year, int month, int day) {
                         "position: absolute;    "
                         "top: %ldpx; left: 0px; "
                         "height: %dpx;          "
+                       "font-size: %dpx;       "
                         "\" >                   "
                         "<a href=\"display_edit_event?msgnum=0?calview=day"
                         "?year=%d?month=%d?day=%d?hour=%d?minute=0\">",
-                        gap + ((hour - dayend - 1) * extratimeline ), extratimeline,
+                        gap + ((hour - dayend - 1) * extratimeline ),
+                       extratimeline,
+                       extratimeline - 2,
                         year, month, day, hour
                 );