]> code.citadel.org Git - citadel.git/blobdiff - webcit/calendar_view.c
Day view work with IE 6 and IE 5.5
[citadel.git] / webcit / calendar_view.c
index 17a0cbf9c95e228912aa6f5c972fe1aec73be6a4..ffa6356d6cad656606bba06d8bf7df15a35928cd 100644 (file)
 /****************************************************************************/
 
 
-/**
- */
 void embeddable_mini_calendar(int year, int month, char *urlformat)
 {
        struct tm starting_tm;
        struct tm tm;
        time_t thetime;
-       int i;
+       int i, len;
        time_t previous_month;
        time_t next_month;
        time_t colheader_time;
@@ -31,6 +29,7 @@ void embeddable_mini_calendar(int year, int month, char *urlformat)
        char weekstart_buf[16];
        char url[256];
        char div_id[256];
+       char escaped_urlformat[256];
 
        snprintf(div_id, sizeof div_id, "mini_calendar_%d", rand() );
 
@@ -68,15 +67,10 @@ void embeddable_mini_calendar(int year, int month, char *urlformat)
 
        wprintf("<div class=\"mini_calendar\" id=\"%s\">\n", div_id);
 
+       /* Previous month link */
        localtime_r(&previous_month, &tm);
-
-       wprintf("<a href=\"javascript:minical_previous_month();\">&laquo;</a>");
-       wprintf("&nbsp;");
-/* previous month
-       wprintf("<a href=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
+       wprintf("<a href=\"javascript:minical_change_month(%d,%d);\">&laquo;</a>", 
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wprintf("<img align=middle src=\"static/prevdate_32x.gif\" border=0></A>\n");
-*/
 
        wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
        wprintf("&nbsp;&nbsp;"
@@ -85,14 +79,10 @@ void embeddable_mini_calendar(int year, int month, char *urlformat)
                "</span>"
                "&nbsp;&nbsp;", colheader_label, year);
 
-       wprintf("&nbsp;");
-       wprintf("<a href=\"javascript:minical_next_month();\">&raquo;</a>");
-/*
+       /* Next month link */
        localtime_r(&next_month, &tm);
-       wprintf("<a href=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
+       wprintf("<a href=\"javascript:minical_change_month(%d,%d);\">&raquo;</a>",
                (int)(tm.tm_year)+1900, tm.tm_mon + 1);
-       wprintf("<img align=middle src=\"static/nextdate_32x.gif\" border=0></A>\n");
-*/
 
        wprintf("<table border=0 cellpadding=1 cellspacing=1 class=\"mini_calendar_days\">"
                "<tr>");
@@ -139,6 +129,41 @@ void embeddable_mini_calendar(int year, int month, char *urlformat)
 
        wprintf("</table>"                      /** end of inner table */
                "</div>\n");
+
+       /* javascript for previous and next month */
+       len = strlen(urlformat);
+       for (i=0; i<len; ++i) {
+               sprintf(&escaped_urlformat[i*2], "%02X", urlformat[i]);
+       }
+
+       wprintf("<script type=\"text/javascript\">                                                      "
+               "       function minical_change_month(year, month) {                                    "
+               "               p = 'year=' + year + '&month=' + month                                  "
+               "                       + '&urlformat=%s&r=' + CtdlRandomString();                      "
+               "               new Ajax.Updater('%s', 'mini_calendar',                                 "
+               "                       { method: 'get', parameters: p, evalScripts: true } );          "
+               "       }                                                                               "
+               "</script>\n"
+               ,
+               escaped_urlformat, div_id
+       );
+
+}
+
+/* ajax embedder for the above mini calendar */
+void ajax_mini_calendar(void) {
+       char urlformat[256];
+       int i, len;
+       char *escaped_urlformat;
+
+       escaped_urlformat = bstr("urlformat");
+        len = strlen(escaped_urlformat) * 2 ;
+       for (i=0; i<len; ++i) {
+               urlformat[i] = xtoi(&escaped_urlformat[i*2], 2);
+               urlformat[i+1] = 0;
+       }
+
+       embeddable_mini_calendar( atoi(bstr("year")), atoi(bstr("month")), urlformat );
 }
 
 
@@ -774,7 +799,10 @@ void calendar_day_view_display_events(time_t thetime, int year, int month,
        struct tm ending_tm;
        int top = 0;
        int height = 0;
-       int gap = 0;
+       int gap = 1;
+       int startmin = 0;
+       int diffmin = 0;
+       int endmin = 0;
 
        if (WCC->num_cal == 0) {
                // \todo FIXME wprintf("<br /><br /><br />\n");
@@ -853,64 +881,84 @@ void calendar_day_view_display_events(time_t thetime, int year, int month,
 
                        if (all_day_event) 
                        {
-                               wprintf("<li><a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\">",
+                               wprintf("<li class=\"event\"> "
+                               "<a href=\"display_edit_event?"
+                               "msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\" "
+                               " class=\"event_title\" >",
                                        Cal->cal_msgnum, year, month, day, hour);
                                escputs((char *) icalproperty_get_comment(p));
-                               wprintf("</a> (");
+                               wprintf("</a> <span>(");
                                wprintf(_("All day event"));
-                               wprintf(")</li>\n");
+                               wprintf(")</span></li>\n");
                        }
                        else if (ongoing_event && (hour == -1)) 
                        {
-                               wprintf("<li><a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\">",
+                               wprintf("<li class=\"event\"> "
+                               "<a href=\"display_edit_event?"
+                               "msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d\" "
+                               " class=\"event_title\" >",
                                        Cal->cal_msgnum, year, month, day, hour);
                                escputs((char *) icalproperty_get_comment(p));
-                               wprintf("</a> (");
+                               wprintf("</a> <span>(");
                                wprintf(_("Ongoing event"));
-                               wprintf(")</li>\n");
+                               wprintf(")</span></li>\n");
                        }
                        else 
                        {
+                               gap++;
                                if ((hour == event_te.tm_hour) && ! ongoing_event ) {
 
                                        if (event_te.tm_mday != today_start_t.day)      event_te.tm_hour = 0;
                                        if (event_tm.tm_mday != today_start_t.day) event_tm.tm_hour = 24;
 
                                        if ((event_te.tm_hour < dstart) && (event_tm.tm_hour <= dstart)) {
-                                               top = (event_te.tm_hour * 11) -1;
-                                               height= (event_tm.tm_hour - event_te.tm_hour) * 11;
+                                               startmin = diffmin = event_te.tm_min / 6;
+                                               endmin = ((event_tm.tm_hour == hour) ? (event_tm.tm_min / 2) : (event_tm.tm_min / 6)) ;
+                                               top = (event_te.tm_hour * 10) + startmin -1;
+                                               height= ((event_tm.tm_hour - event_te.tm_hour) * 10) + endmin - diffmin ;
                                        }
                                        if ((event_te.tm_hour < dstart) && (event_tm.tm_hour >= dstart)) {
-                                               top = (event_te.tm_hour * 11) - 1;
-                                               height = ((dstart - event_te.tm_hour) * 11) + ((event_tm.tm_hour - dstart) * 31);
+                                               startmin = diffmin = event_te.tm_min / 6;
+                                               endmin = event_tm.tm_min / 2;
+                                               top = (event_te.tm_hour * 10) + startmin - 1;
+                                               height = ((dstart - event_te.tm_hour) * 10) + ((event_tm.tm_hour - dstart) * 30) + endmin - (diffmin * 3);
                                        }
                                        if ((event_te.tm_hour <= dstart) && (event_tm.tm_hour > dend)) {
-                                               top = (event_te.tm_hour * 11) - 1;
-                                               height = ((dstart - event_te.tm_hour) * 11) + ((dend - dstart + 1) * 31) + ((event_tm.tm_hour - dend - 1) * 10);
+                                               startmin = diffmin = ((event_te.tm_hour == hour) ? (event_te.tm_min / 2) : (event_te.tm_min / 6)) ;
+                                               endmin = event_tm.tm_min / 6; 
+                                               top = (event_te.tm_hour * 10)  + startmin - 1;
+                                               height = ((dstart - event_te.tm_hour) * 10) + ((dend - dstart + 1) * 30) + ((event_tm.tm_hour - dend - 1) * 10) + endmin - diffmin;
                                        }
                                        if ((event_te.tm_hour >= dstart) && (event_tm.tm_hour <= dend)) {
-                                               top = (dstart * 11) + ((event_te.tm_hour - dstart) * 31) - 1;
-                                               height = ((event_tm.tm_hour - event_te.tm_hour) * 31);
+                                               startmin = diffmin = (event_te.tm_min / 2);
+                                               endmin = event_tm.tm_min / 2;
+                                               top = (dstart * 10) + ((event_te.tm_hour - dstart) * 30) + startmin - 1;
+                                               height = ((event_tm.tm_hour - event_te.tm_hour) * 30) + endmin - diffmin;
                                        }
                                        if ((event_te.tm_hour >= dstart) && (event_te.tm_hour <= dend) && (event_tm.tm_hour > dend)) {
-                                               top = (dstart * 11) + ((event_te.tm_hour - dstart) * 31) - 1;
-                                               height = (((dend - event_te.tm_hour + 1) * 31) + ((event_tm.tm_hour - dend - 1) * 11));
+                                               startmin = diffmin = (event_te.tm_min / 2);
+                                               endmin = event_tm.tm_min / 6;
+                                               top = (dstart * 10) + ((event_te.tm_hour - dstart) * 30)  + diffmin - 1;
+                                               height = (((dend - event_te.tm_hour + 1) * 30) + ((event_tm.tm_hour - dend - 1) * 10)) + endmin - diffmin;
                                        }
                                        if ((event_te.tm_hour > dend) && (event_tm.tm_hour > dend)) {
-                                               top = (dstart * 11) + ((dend - dstart + 1) * 31) + ((event_tm.tm_hour - event_te.tm_hour) * 11) - 1;
-                                               height = ((event_tm.tm_hour - event_te.tm_hour) * 11);
+                                               startmin = diffmin = event_te.tm_min / 6;
+                                               endmin = event_tm.tm_min / 6;
+                                               top = (dstart * 10) + ((dend - dstart + 1) * 30) + ((event_tm.tm_hour - event_te.tm_hour) * 10) + startmin - 1;
+                                               height = ((event_tm.tm_hour - event_te.tm_hour) * 10) + endmin - diffmin;
                                        }
                                wprintf("<dd  class=\"event\" "
                                        "style=\"position: absolute; "
                                        "top:%dpx; left:%dpx; "
                                        "height:%dpx; \" >",
-                                       top, (50 + (gap * 50)), height
+                                       top, (gap * 40), height
                                        );
-                               wprintf("<a href=\"display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d&case=%d\">",
+                               wprintf("<a href=\"display_edit_event?"
+                                       "msgnum=%ld&calview=day&year=%d&month=%d&day=%d&hour=%d&case=%d\" "
+                                       "class=\"event_title\" >",
                                        Cal->cal_msgnum, year, month, day, t.hour, hour);
                                escputs((char *) icalproperty_get_comment(p));
                                wprintf("</a></dd>\n");
-                               gap++;
                                }
                                
                        }
@@ -934,6 +982,9 @@ void calendar_day_view(int year, int month, int day) {
        char d_str[128];
        int time_format;
        time_t today_t;
+       int timeline = 30;
+       int extratimeline = 0;
+       int gap = 0;
 
        time_format = get_time_format_cached ();
        get_preference("daystart", daystart_str, sizeof daystart_str);
@@ -972,11 +1023,21 @@ void calendar_day_view(int year, int month, int day) {
        /** Innermost cell (contains hours etc.) */
        wprintf("<td class=\"events_of_the_day\" >");
                wprintf("<dl class=\"events\" >");
-       /** Now the middle of the day... */     
-       for (hour = 0; hour < 24; ++hour) {     /* could do HEIGHT=xx */
-               wprintf("<dt class=\"hour%s\"><a href=\"display_edit_event?msgnum=0"
+
+       /** Now the middle of the day... */
+
+       extratimeline = timeline / 3;   
+
+       for (hour = 0; hour < daystart; ++hour) {       /* could do HEIGHT=xx */
+               wprintf("<dt class=\"extrahour\"        "
+                       "style=\"               "
+                       "position: absolute;    "
+                       "top: %dpx; left: 0px;  "
+                       "height: %dpx;          "       
+                       "\" >                   "
+                       "<a href=\"display_edit_event?msgnum=0"
                        "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
-                       (hour < daystart ? "before" : (hour > dayend ? "after" : "")),
+                       (hour * extratimeline ), extratimeline, 
                        year, month, day, hour
                );
 
@@ -992,12 +1053,75 @@ void calendar_day_view(int year, int month, int day) {
 
                wprintf("</dt>");
        
-
                /* put the data here, stupid */
                calendar_day_view_display_events(today_t, year, month, day, hour, daystart, dayend);
 
        }
 
+       gap = daystart * extratimeline;
+
+        for (hour = daystart; hour <= dayend; ++hour) {       /* could do HEIGHT=xx */
+                wprintf("<dt class=\"hour\"     "
+                        "style=\"               "
+                        "position: absolute;    "
+                        "top: %dpx; left: 0px;  "
+                        "height: %dpx;          "
+                        "\" >                   "
+                        "<a href=\"display_edit_event?msgnum=0"
+                        "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
+                        gap + ((hour - daystart) * timeline ), timeline,
+                        year, month, day, hour
+                );
+
+                if (time_format == WC_TIMEFORMAT_24) {
+                        wprintf("%2d:00</a> ", hour);
+                }
+                else {
+                        wprintf("%d:00%s</a> ",
+                                (hour <= 12 ? hour : hour-12),
+                                (hour < 12 ? "am" : "pm")
+                        );
+                }
+
+                wprintf("</dt>");
+
+                /* put the data here, stupid */
+                calendar_day_view_display_events(today_t, year, month, day, hour, daystart, dayend);
+
+        }
+
+       gap = gap + ((dayend - daystart + 1) * timeline);
+
+        for (hour = (dayend + 1); hour < 24; ++hour) {       /* could do HEIGHT=xx */
+                wprintf("<dt class=\"extrahour\"     "
+                        "style=\"               "
+                        "position: absolute;    "
+                        "top: %dpx; left: 0px;  "
+                        "height: %dpx;          "
+                        "\" >                   "
+                        "<a href=\"display_edit_event?msgnum=0"
+                        "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
+                        gap + ((hour - dayend - 1) * extratimeline ), extratimeline,
+                        year, month, day, hour
+                );
+
+                if (time_format == WC_TIMEFORMAT_24) {
+                        wprintf("%2d:00</a> ", hour);
+                }
+                else {
+                        wprintf("%d:00%s</a> ",
+                                (hour <= 12 ? hour : hour-12),
+                                (hour < 12 ? "am" : "pm")
+                        );
+                }
+
+                wprintf("</dt>");
+
+                /* put the data here, stupid */
+                calendar_day_view_display_events(today_t, year, month, day, hour, daystart, dayend);
+
+        }
+
                wprintf("</dl>");
        wprintf("</td>");                       /* end of innermost table */
 
@@ -1334,6 +1458,9 @@ void do_tasks_view(void) {
        wprintf("</i></center><br />\n");
 }
 
+/**\brief stub for non-libical builds */
+void ajax_mini_calendar(void) {
+}
 
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */