X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar_view.c;h=0e8ac9843385bc217f6326014f2110af9c2033cd;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=05ed56d5824440e5f116b0f994a0520c8ceca51a;hpb=17ce76a935cdbd2e2fda4a6ee1680e603413eb0c;p=citadel.git

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 05ed56d58..0e8ac9843 100644
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -1,21 +1,15 @@
 /*
  * Handles the HTML display of calendar items.
  *
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-2012 by the citadel.org team
  *
  * This program is open source software.  You can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * modify it under the terms of the GNU General Public License, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "webcit.h"
@@ -188,7 +182,7 @@ void calendar_month_view_display_events(int year, int month, int day)
 	time_t tt;
 
 	if (GetCount(WCC->disp_cal_items) == 0) {
-		wc_printf("<br /><br /><br />\n");
+		wc_printf("<br>\n");
 		return;
 	}
 
@@ -259,6 +253,14 @@ void calendar_month_view_display_events(int year, int month, int day)
 		 * If we determined that this event occurs today, then display it.
 	 	 */
 		if (show_event) {
+
+			/* time_t logtt = icaltime_as_timet(t);
+			syslog(LOG_DEBUG, "Match on %04d-%02d-%02d for event %x%s on %s",
+				year, month, day,
+				(int)Cal, ((all_day_event) ? " (all day)" : ""),
+				ctime(&logtt)
+			); */
+
 			p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
 			if (p == NULL) {
 				p = icalproperty_new_summary(_("Untitled Event"));
@@ -286,10 +288,10 @@ void calendar_month_view_display_events(int year, int month, int day)
 
 				wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
 
-				wc_printf("<i>%s: %s</i><br />", _("From"), Cal->from);
+				wc_printf("<i>%s: %s</i><br>", _("From"), Cal->from);
 				wc_printf("<i>%s</i> ",          _("Summary:"));
 				escputs((char *)icalproperty_get_comment(p));
-				wc_printf("<br />");
+				wc_printf("<br>");
 
 				q = icalcomponent_get_first_property(
 					Cal->cal,
@@ -297,7 +299,7 @@ void calendar_month_view_display_events(int year, int month, int day)
 				if (q) {
 					wc_printf("<i>%s</i> ", _("Location:"));
 					escputs((char *)icalproperty_get_comment(q));
-					wc_printf("<br />");
+					wc_printf("<br>");
 				}
 
 				/*
@@ -377,11 +379,11 @@ void calendar_month_view_display_events(int year, int month, int day)
 				if (q) {
 					wc_printf("<i>%s</i> ", _("Notes:"));
 					escputs((char *)icalproperty_get_comment(q));
-					wc_printf("<br />");
+					wc_printf("<br>");
 				}
 
 				wc_printf("</span><span class=\"bttbottom\"></span></span>");
-				wc_printf("</a></font><br />\n");
+				wc_printf("</a></font><br>\n");
 
 				if (all_day_event) {
 					wc_printf("</td></tr></table>");
@@ -416,7 +418,6 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
 	icalproperty *e;
 	struct icaltimetype t;
 	disp_cal *Cal;
-	int month, day, year;
 	int all_day_event = 0;
 	char *timeformat;
 	int time_format;
@@ -427,9 +428,6 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
 	else timeformat="%I:%M %p";
 
 	localtime_r(&thetime, &today_tm);
-	month = today_tm.tm_mon + 1;
-	day = today_tm.tm_mday;
-	year = today_tm.tm_year + 1900;
 
 	Pos = GetNewHashPos(WCC->disp_cal_items, 0);
 	while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
@@ -578,7 +576,7 @@ void calendar_month_view(int year, int month, int day) {
 	localtime_r(&previous_month, &tm);
 	wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
-	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/prevdate_32x.gif\" border=\"0\"></a>\n", _("previous"));
+	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
 
 	wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
 	wc_printf("&nbsp;&nbsp;"
@@ -590,7 +588,7 @@ void calendar_month_view(int year, int month, int day) {
 	localtime_r(&next_month, &tm);
 	wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
-	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/nextdate_32x.gif\" border=\"0\"></A>\n", _("next"));
+	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\" border=\"0\"></A>\n", _("next"));
 
 	wc_printf("</td></tr></table>\n");
 
@@ -714,7 +712,7 @@ void calendar_brief_month_view(int year, int month, int day) {
 	localtime_r(&previous_month, &tm);
 	wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
-	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/prevdate_32x.gif\" border=\"0\"></a>\n", _("previous"));
+	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>\n", _("previous"));
 
 	wc_strftime(month_label, sizeof month_label, "%B", &tm);
 	wc_printf("&nbsp;&nbsp;"
@@ -726,7 +724,7 @@ void calendar_brief_month_view(int year, int month, int day) {
 	localtime_r(&next_month, &tm);
 	wc_printf("<a href=\"readfwd?calview=month?year=%d?month=%d?day=1\">",
 		(int)(tm.tm_year)+1900, tm.tm_mon + 1);
-	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/nextdate_32x.gif\" border=\"0\"></a>\n", _("next"));
+	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\" border=\"0\"></a>\n", _("next"));
 
 	wc_printf("</td></tr></table>\n");
 
@@ -791,7 +789,7 @@ void calendar_brief_month_view(int year, int month, int day) {
  * Calendar week view -- not implemented yet, this is a stub function
  */
 void calendar_week_view(int year, int month, int day) {
-	wc_printf("<center><i>week view FIXME</i></center><br />\n");
+	wc_printf("<center><i>week view FIXME</i></center><br>\n");
 }
 
 
@@ -950,16 +948,16 @@ void calendar_day_view_display_events(time_t thetime,
 				);
                                 escputs((char *) icalproperty_get_comment(p));
 				wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
-                                wc_printf("<i>%s</i><br />",      _("All day event"));
-				wc_printf("<i>%s: %s</i><br />",  _("From"), Cal->from);
+                                wc_printf("<i>%s</i><br>",      _("All day event"));
+				wc_printf("<i>%s: %s</i><br>",  _("From"), Cal->from);
                                 wc_printf("<i>%s</i> ",           _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
-                                wc_printf("<br />");
+                                wc_printf("<br>");
 				q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
                                 if (q) {
                                         wc_printf("<i>%s</i> ", _("Location:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wc_printf("<br />");
+                                        wc_printf("<br>");
 				}
 				if (!icaltime_compare(t, end_t)) { /* one day only */
 					webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
@@ -975,7 +973,7 @@ void calendar_day_view_display_events(time_t thetime,
                                 if (q) {
                                         wc_printf("<i>%s</i> ", _("Notes:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wc_printf("<br />");
+                                        wc_printf("<br>");
                                 }
 				wc_printf("</span><span class=\"bttbottom\"></span></span>");
                                 wc_printf("</a> <span>(");
@@ -994,16 +992,16 @@ void calendar_day_view_display_events(time_t thetime,
 				);
 				escputs((char *) icalproperty_get_comment(p));
 				wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
-                                wc_printf("<i>%s</i><br />",     _("Ongoing event"));
-				wc_printf("<i>%s: %s</i><br />", _("From"), Cal->from);
+                                wc_printf("<i>%s</i><br>",     _("Ongoing event"));
+				wc_printf("<i>%s: %s</i><br>", _("From"), Cal->from);
                                 wc_printf("<i>%s</i> ",          _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
-                                wc_printf("<br />");
+                                wc_printf("<br>");
                                 q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
                                 if (q) {
                                         wc_printf("<i>%s</i> ", _("Location:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wc_printf("<br />");
+                                        wc_printf("<br>");
 								}
                                 webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
                                 wc_printf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
@@ -1013,7 +1011,7 @@ void calendar_day_view_display_events(time_t thetime,
                                 if (q) {
                                         wc_printf("<i>%s</i> ", _("Notes:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wc_printf("<br />");
+                                        wc_printf("<br>");
                                 }
                                 wc_printf("</span><span class=\"bttbottom\"></span></span>");
 				wc_printf("</a> <span>(");
@@ -1076,15 +1074,15 @@ void calendar_day_view_display_events(time_t thetime,
 				);
 				escputs((char *) icalproperty_get_comment(p));
 				wc_printf("<span class=\"tooltip\"><span class=\"btttop\"></span><span class=\"bttmiddle\">");
-				wc_printf("<i>%s: %s</i><br />", _("From"), Cal->from);
+				wc_printf("<i>%s: %s</i><br>", _("From"), Cal->from);
                                 wc_printf("<i>%s</i> ",          _("Summary:"));
                                 escputs((char *) icalproperty_get_comment(p));
-                                wc_printf("<br />");
+                                wc_printf("<br>");
                                 q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY);
                                 if (q) {
                                         wc_printf("<i>%s</i> ", _("Location:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wc_printf("<br />");
+                                        wc_printf("<br>");
 								}
 				if (!icaltime_compare(t, end_t)) { /* one day only */
 					webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
@@ -1100,7 +1098,7 @@ void calendar_day_view_display_events(time_t thetime,
                                 if (q) {
                                         wc_printf("<i>%s</i> ", _("Notes:"));
                                         escputs((char *)icalproperty_get_comment(q));
-                                        wc_printf("<br />");
+                                        wc_printf("<br>");
                                 }
 				wc_printf("</span><span class=\"bttbottom\"></span></span>");
 				wc_printf("</a></dd>\n");
@@ -1175,18 +1173,14 @@ void calendar_day_view(int year, int month, int day) {
 	if (hourlabel > (timeline - 2)) hourlabel = timeline - 2;
 
 	for (hour = 0; hour < daystart; ++hour) {	/* could do HEIGHT=xx */
-		wc_printf("<dt class=\"extrahour\" 	"
-			"style=\"		"
-			"position: absolute; 	"
-			"top: %dpx; left: 0px; 	"
-			"height: %dpx;		"
-			"font-size: %dpx;	"
-			"\" >			"
+		wc_printf("<dt class=\"extrahour\">"
 			"<a href=\"display_edit_event?msgnum=0"
 			"?calview=day?year=%d?month=%d?day=%d?hour=%d?minute=0\">",
+/* TODO: what have these been used for?
 			(hour * extratimeline ),
 			extratimeline,
 			extrahourlabel,
+*/
 			year, month, day, hour
 			);
 
@@ -1206,18 +1200,14 @@ void calendar_day_view(int year, int month, int day) {
 	gap = daystart * extratimeline;
 
         for (hour = daystart; hour <= dayend; ++hour) {       /* could do HEIGHT=xx */
-                wc_printf("<dt class=\"hour\"     "
-                        "style=\"               "
-                        "position: absolute;    "
-                        "top: %ldpx; left: 0px; "
-                        "height: %dpx;          "
-			"font-size: %dpx;	"
-                        "\" >                   "
+                wc_printf("<dt class=\"hour\">"
                         "<a href=\"display_edit_event?msgnum=0?calview=day"
                         "?year=%d?month=%d?day=%d?hour=%d?minute=0\">",
+/*TODO: what have these been used for?
                         gap + ((hour - daystart) * timeline ),
 			timeline,
 			hourlabel,
+*/
                         year, month, day, hour
 			);
 
@@ -1237,18 +1227,14 @@ void calendar_day_view(int year, int month, int day) {
 	gap = gap + ((dayend - daystart + 1) * timeline);
 
         for (hour = (dayend + 1); hour < 24; ++hour) {       /* could do HEIGHT=xx */
-                wc_printf("<dt class=\"extrahour\"     "
-                        "style=\"               "
-                        "position: absolute;    "
-                        "top: %ldpx; left: 0px; "
-                        "height: %dpx;          "
-			"font-size: %dpx;	"
-                        "\" >                   "
+                wc_printf("<dt class=\"extrahour\">"
                         "<a href=\"display_edit_event?msgnum=0?calview=day"
                         "?year=%d?month=%d?day=%d?hour=%d?minute=0\">",
+/*TODO: what have these been used for?
                         gap + ((hour - dayend - 1) * extratimeline ),
 			extratimeline,
 			extrahourlabel,
+*/
                         year, month, day, hour
                 );
 
@@ -1294,15 +1280,15 @@ void calendar_day_view(int year, int month, int day) {
 	wc_printf("<td align=\"center\">");
 	wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
 		yesterday.year, yesterday.month, yesterday.day);
-	wc_printf("<img alt=\"previous\" align=\"middle\" src=\"static/prevdate_32x.gif\" border=\"0\"></a>");
+	wc_printf("<img alt=\"previous\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/back.png\" border=\"0\"></a>");
 	wc_printf("</td>");
 
 	wc_strftime(d_str, sizeof d_str,
 		"<td align=\"center\">"
-		"<font size='+2'>%A</font><br />"
-		"<font size='+2'>%B</font><br />"
-		"<font size='+3'>%d</font><br />"
-		"<font size='+2'>%Y</font><br />"
+		"<font size='+2'>%A</font><br>"
+		"<font size='+2'>%B</font><br>"
+		"<font size='+3'>%d</font><br>"
+		"<font size='+2'>%Y</font><br>"
 		"</td>",
 		&d_tm
 		);
@@ -1312,7 +1298,7 @@ void calendar_day_view(int year, int month, int day) {
 	wc_printf("<td align=\"center\">");
 	wc_printf("<a href=\"readfwd?calview=day?year=%d?month=%d?day=%d\">",
 		tomorrow.year, tomorrow.month, tomorrow.day);
-	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/nextdate_32x.gif\""
+	wc_printf("<img alt=\"%s\" align=\"middle\" src=\"static/webcit_icons/essen/32x32/forward.png\""
 		" border=\"0\"></a>\n", _("next"));
 	wc_printf("</td>");
 
@@ -1320,7 +1306,7 @@ void calendar_day_view(int year, int month, int day) {
 	/* End todays-date-with-left-and-right-arrows */
 
 	/* Embed a mini month calendar in this space */
-	wc_printf("<br />\n");
+	wc_printf("<br>\n");
 	embeddable_mini_calendar(year, month);
 
 	wc_printf("</td></tr>");			/* end stuff-on-the-right */
@@ -1393,7 +1379,7 @@ int calendar_summary_view(void) {
 						wc_printf("<a href=\"display_edit_task"
 							"?msgnum=%ld"
 							"?return_to_summary=1"
-							"?gotofirst=",
+							"?go=",
 							Cal->cal_msgnum
 						);
 						escputs(ChrPtr(WCC->CurRoom.name));
@@ -1406,7 +1392,7 @@ int calendar_summary_view(void) {
 							"?year=%d"
 							"?month=%d"
 							"?day=%d"
-							"?gotofirst=",
+							"?go=",
 							Cal->cal_msgnum,
 							today_tm.tm_year + 1900,
 							today_tm.tm_mon + 1,
@@ -1419,7 +1405,7 @@ int calendar_summary_view(void) {
 					if (!all_day_event) {
 						wc_printf(" (%s)", timestring);
 					}
-					wc_printf("</a><br />\n");
+					wc_printf("</a><br>\n");
 					++num_displayed;
 				}
 			}
@@ -1437,7 +1423,9 @@ int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat,
 				    void **ViewSpecific,
 				    long oper,
 				    char *cmd,
-				    long len)
+				    long len,
+				    char *filter,
+				    long flen)
 {
 	wcsession *WCC = WC;
 	calview *c;
@@ -1545,3 +1533,10 @@ int calendar_RenderView_or_Tail(SharedMessageStatus *Stat,
 	DeleteHash(&WC->disp_cal_items);
 	return 0;
 }
+
+void 
+InitModule_CALENDAR_VIEW
+(void)
+{
+	WebcitAddUrlHandler(HKEY("mini_calendar"), "", 0, ajax_mini_calendar, AJAX);
+}