X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar_view.c;h=c8820b22c6333092e972889fc79f4bfaae8b7e6f;hb=4b4dc864ede7c5d8d956febe4a0afb422b78e7c4;hp=c7af4b607304d5f1678d861ecfa8341acc0eb6bd;hpb=c296efdbc83186f6e5bdcdd3a09b862f819dfb6d;p=citadel.git

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index c7af4b607..c8820b22c 100644
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -424,7 +424,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;
@@ -435,9 +434,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)) {
@@ -586,7 +582,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;"
@@ -598,7 +594,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");
 
@@ -722,7 +718,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;"
@@ -734,7 +730,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");
 
@@ -1186,9 +1182,11 @@ void calendar_day_view(int year, int month, int day) {
 		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
 			);
 
@@ -1211,9 +1209,11 @@ void calendar_day_view(int year, int month, int day) {
                 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
 			);
 
@@ -1236,9 +1236,11 @@ void calendar_day_view(int year, int month, int day) {
                 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
                 );
 
@@ -1284,7 +1286,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\">",
 		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,
@@ -1302,7 +1304,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>");
 
@@ -1427,7 +1429,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;
@@ -1535,3 +1539,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);
+}