Summary/location/notes are now in the bubbles.

Still need to add date/time and fix a rendering bug.

diff --git a/webcit/src/calendar_view.c b/webcit/src/calendar_view.c
index 2092a66836ff2dd619b3b1648d2ab351fb3e8e83..da76ca5d524c804599d45be2729fc16482e7983f 100644 (file)
--- a/webcit/src/calendar_view.c
+++ b/webcit/src/calendar_view.c
@@ -38,7 +38,8 @@ void calendar_month_view_display_events(time_t thetime) {
        time_t event_tt;
        struct tm event_tm;
        struct tm today_tm;
-       icalproperty *p;
+       icalproperty *p = NULL;
+       icalproperty *q = NULL;
        struct icaltimetype t;
        int month, day, year;
        int all_day_event = 0;
@@ -96,17 +97,27 @@ void calendar_month_view_display_events(time_t thetime) {
                                                bstr("day")
                                        );
 
-                                       wprintf("<b>Summary:</b> ");
-                                       escputs("lorem ipsum dolor sit amet");
+                                       wprintf("<b>%s</b> ", _("Summary:"));
+                                       escputs((char *)icalproperty_get_comment(p));
                                        wprintf("<br />");
 
-                                       wprintf("<b>Location:</b> ");
-                                       escputs("lorem ipsum dolor sit amet");
-                                       wprintf("<br />");
+                                       q = icalcomponent_get_first_property(
+                                                       WC->disp_cal[i].cal,
+                                                       ICAL_LOCATION_PROPERTY);
+                                       if (q) {
+                                               wprintf("<b>%s</b> ", _("Location:"));
+                                               escputs((char *)icalproperty_get_comment(q));
+                                               wprintf("<br />");
+                                       }
 
-                                       wprintf("<b>Notes:</b> ");
-                                       escputs("lorem ipsum dolor sit amet");
-                                       wprintf("<br />");
+                                       q = icalcomponent_get_first_property(
+                                                       WC->disp_cal[i].cal,
+                                                       ICAL_DESCRIPTION_PROPERTY);
+                                       if (q) {
+                                               wprintf("<b>%s</b> ", _("Notes:"));
+                                               escputs((char *)icalproperty_get_comment(q));
+                                               wprintf("<br />");
+                                       }
 
                                        wprintf("\">");
                                        escputs((char *)

diff --git a/webcit/static/bt.css b/webcit/static/bt.css
index 7d3d87f6f7857513126127c6b574139b2b90a668..e30010d107eb9ff3cc29fc451faaf1ffed295225 100644 (file)
--- a/webcit/static/bt.css
+++ b/webcit/static/bt.css
@@ -3,7 +3,7 @@
        color: #000;\r
        font:lighter 11px/1.3 sans-serif;\r
        text-decoration:none;\r
-       text-align:center\r
+       text-align:left;\r
 }\r
 \r
 .tooltip span.top {\r