* we have now several bstrs:

[citadel.git] / webcit / calendar_view.c

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index b5525b1beb5274d461db2a0b257f008fa628005d..78325f835832789f462a724429edc39da2917f08 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -1,18 +1,12 @@
- /*
+/*
  * $Id$
+ *
+ * Handles the HTML display of calendar items.
  */
-/**
- * \defgroup CalHtmlHandles Handles the HTML display of calendar items.
- * \ingroup Calendaring
- */
-/*@{*/
+
 #include "webcit.h"
 #include "webserver.h"
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
-
-/****************************************************************************/
-
 
 void embeddable_mini_calendar(int year, int month, char *urlformat)
 {
@@ -163,7 +157,7 @@ void ajax_mini_calendar(void) {
                urlformat[i+1] = 0;
        }
 
-       embeddable_mini_calendar( atoi(bstr("year")), atoi(bstr("month")), urlformat );
+       embeddable_mini_calendar( ibstr("year"), ibstr("month"), urlformat );
 }
 
 
@@ -259,14 +253,16 @@ void calendar_month_view_display_events(int year, int month, int day)
                                }
 
                                wprintf("<font size=-1>"
-                                       "<a href=\"display_edit_event?"
+                                       "<a class=\"event%s\" href=\"display_edit_event?"
                                        "msgnum=%ld&calview=month&year=%d&month=%d&day=%d\""
                                        " btt_tooltext=\"",
+                                       (Cal->unread)?"_unread":"_read",
                                        WC->disp_cal[i].cal_msgnum,
                                        year, month, day
                                );
 
-                               wprintf("<i>%s</i> ", _("Summary:"));
+                               wprintf("<i>%s: %s</i><br />", _("From"), Cal->from);
+                               wprintf("<i>%s</i> ",          _("Summary:"));
                                escputs((char *)icalproperty_get_comment(p));
                                wprintf("<br />");
                                
@@ -356,12 +352,14 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
        time_t event_tt;
        time_t event_tts;
        time_t event_tte;
+       struct wcsession *WCC = WC;     /* This is done to make it run faster; WC is a function */
        struct tm event_tms;
        struct tm event_tme;
        struct tm today_tm;
        icalproperty *p;
        icalproperty *e;
        struct icaltimetype t;
+       struct disp_cal *Cal;
        int month, day, year;
        int all_day_event = 0;
        char *timeformat;
@@ -378,7 +376,8 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
        year = today_tm.tm_year + 1900;
 
        for (i=0; i<(WC->num_cal); ++i) {
-               p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
+               Cal = &WCC->disp_cal[i];
+               p = icalcomponent_get_first_property(Cal->cal,
                                                ICAL_DTSTART_PROPERTY);
                if (p != NULL) {
                        t = icalproperty_get_dtstart(p);
@@ -418,16 +417,17 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
                                        hours=(int)(difftime / 60);
                                        minutes=difftime % 60;
                                        wprintf("<tr><td bgcolor='%s'>%i:%2i</td><td bgcolor='%s'>"
-                                                       "<font size=-1>"
-                                                       "<a href=\"display_edit_event?msgnum=%ld&calview=calbrief&year=%s&month=%s&day=%s\">",
-                                                       daycolor,
-                                                       hours, minutes,
-                                                       daycolor,
-                                                       WC->disp_cal[i].cal_msgnum,
-                                                       bstr("year"),
-                                                       bstr("month"),
-                                                       bstr("day")
-                                                       );
+                                               "<font size=-1>"
+                                               "<a class=\"event%s\" href=\"display_edit_event?msgnum=%ld&calview=calbrief&year=%s&month=%s&day=%s\">",
+                                               daycolor,
+                                               hours, minutes,
+                                               (Cal->unread)?"_unread":"_read",                                                
+                                               daycolor,
+                                               WC->disp_cal[i].cal_msgnum,
+                                               bstr("year"),
+                                               bstr("month"),
+                                               bstr("day")
+                                               );
 
                                        escputs((char *)
                                                        icalproperty_get_comment(p));
@@ -880,14 +880,16 @@ void calendar_day_view_display_events(time_t thetime,
 
                        if (all_day_event && notime_events)
                        {
-                              wprintf("<li class=\"event\"> "
+                              wprintf("<li class=\"event_framed%s\"> "
                                 "<a href=\"display_edit_event?"
                                 "msgnum=%ld&calview=day&year=%d&month=%d&day=%d\" "
                                 " class=\"event_title\" "
                                 " btt_tooltext=\"",
+                                     (Cal->unread)?"_unread":"_read",
                                         Cal->cal_msgnum, year, month, day);
-                                wprintf("<i>%s</i><br />", _("All day event"));
-                                wprintf("<i>%s</i> ",    _("Summary:"));
+                                wprintf("<i>%s</i><br />",      _("All day event"));
+                               wprintf("<i>%s: %s</i><br />",  _("From"), Cal->from);
+                                wprintf("<i>%s</i> ",           _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
                                 wprintf("<br />");
                                q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
@@ -916,14 +918,16 @@ void calendar_day_view_display_events(time_t thetime,
                        }
                        else if (ongoing_event && notime_events) 
                        {
-                               wprintf("<li class=\"event\"> "
+                               wprintf("<li class=\"event_framed%s\"> "
                                "<a href=\"display_edit_event?"
                                "msgnum=%ld&calview=day&year=%d&month=%d&day=%d\" "
                                " class=\"event_title\" " 
                                 "btt_tooltext=\"",
+                                       (Cal->unread)?"_unread":"_read",
                                Cal->cal_msgnum, year, month, day);
-                                wprintf("<i>%s</i><br />", _("Ongoing event"));
-                                wprintf("<i>%s</i> ",    _("Summary:"));
+                                wprintf("<i>%s</i><br />",     _("Ongoing event"));
+                               wprintf("<i>%s: %s</i><br />", _("From"), Cal->from);
+                                wprintf("<i>%s</i> ",          _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
                                 wprintf("<br />");
                                 q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
@@ -989,10 +993,11 @@ void calendar_day_view_display_events(time_t thetime,
                                        /* should never get here */
                                }
 
-                               wprintf("<dd  class=\"event\" "
+                               wprintf("<dd  class=\"event_framed%s\" "
                                        "style=\"position: absolute; "
                                        "top:%dpx; left:%dpx; "
                                        "height:%dpx; \" >",
+                                       (Cal->unread)?"_unread":"_read",
                                        top, (gap * 40), (bottom-top)
                                        );
                                wprintf("<a href=\"display_edit_event?"
@@ -1000,7 +1005,8 @@ void calendar_day_view_display_events(time_t thetime,
                                        "class=\"event_title\" "
                                                "btt_tooltext=\"",
                                        Cal->cal_msgnum, year, month, day, t.hour);
-                                wprintf("<i>%s</i> ",    _("Summary:"));
+                               wprintf("<i>%s: %s</i><br />", _("From"), Cal->from);
+                                wprintf("<i>%s</i> ",          _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
                                 wprintf("<br />");
                                 q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
@@ -1340,12 +1346,12 @@ void do_calendar_view(void) {
        day = tm.tm_mday;
 
        /** Now see if a date was specified */
-       if (!IsEmptyStr(bstr("year"))) year = atoi(bstr("year"));
-       if (!IsEmptyStr(bstr("month"))) month = atoi(bstr("month"));
-       if (!IsEmptyStr(bstr("day"))) day = atoi(bstr("day"));
+       if (havebstr("year")) year = ibstr("year");
+       if (havebstr("month")) month = ibstr("month");
+       if (havebstr("day")) day = ibstr("day");
 
        /** How would you like that cooked? */
-       if (!IsEmptyStr(bstr("calview"))) {
+       if (havebstr("calview")) {
                strcpy(calview, bstr("calview"));
        }
        else {
@@ -1495,26 +1501,3 @@ void do_tasks_view(void) {
 
 }
 
-#else  /* WEBCIT_WITH_CALENDAR_SERVICE */
-
-/**\brief stub for non-libical builds */
-void do_calendar_view(void) {
-       wprintf("<center><i>");
-       wprintf(_("The calendar view is not available."));
-       wprintf("</i></center><br />\n");
-}
-
-/**\brief stub for non-libical builds */
-void do_tasks_view(void) {     
-       wprintf("<center><I>");
-       wprintf(_("The tasks view is not available."));
-       wprintf("</i></center><br />\n");
-}
-
-/**\brief stub for non-libical builds */
-void ajax_mini_calendar(void) {
-}
-
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-
-/** @} */