Began making changes to do better handling of character sets.

[citadel.git] / webcit / summary.c

diff --git a/webcit/summary.c b/webcit/summary.c
index 1146f51540d3148ebb9fa384cbc80a58fabcb5a8..3d994038960259914d4eadca5adeb60d8d43cdff 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -14,40 +14,13 @@
 void output_date(void) {
        struct tm tm;
        time_t now;
-
-       static char *wdays[7];
-       static char *months[12];
-
-       wdays[0] = _("Sunday");
-       wdays[1] = _("Monday");
-       wdays[2] = _("Tuesday");
-       wdays[3] = _("Wednesday");
-       wdays[4] = _("Thursday");
-       wdays[5] = _("Friday");
-       wdays[6] = _("Saturday");
-
-       months[0] = _("January");
-       months[1] = _("February");
-       months[2] = _("March");
-       months[3] = _("April");
-       months[4] = _("May");
-       months[5] = _("June");
-       months[6] = _("July");
-       months[7] = _("August");
-       months[8] = _("September");
-       months[9] = _("October");
-       months[10] = _("November");
-       months[11] = _("December");
+       char buf[128];
 
        time(&now);
        localtime_r(&now, &tm);
 
-       wprintf("%s, %s %d, %d",
-               wdays[tm.tm_wday],
-               months[tm.tm_mon],
-               tm.tm_mday,
-               tm.tm_year + 1900
-       );
+       wc_strftime(buf, 32, "%A, %x", &tm);
+       wprintf("%s", buf);
 }
 
 
@@ -80,7 +53,7 @@ void new_messages_section(void) {
        number_of_rooms_to_check = num_tokens(rooms_to_check, '|');
        if (number_of_rooms_to_check == 0) return;
 
-       wprintf("<TABLE BORDER=0 WIDTH=100%%>\n");
+       wprintf("<table border=0 width=100%%>\n");
        for (i=0; i<number_of_rooms_to_check; ++i) {
                extract_token(room, rooms_to_check, i, '|', sizeof room);
 
@@ -88,17 +61,17 @@ void new_messages_section(void) {
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
                        extract_token(room, &buf[4], 0, '|', sizeof room);
-                       wprintf("<TR><TD><a href=\"dotgoto?room=");
+                       wprintf("<tr><td><a href=\"dotgoto?room=");
                        urlescputs(room);
                        wprintf("\">");
                        escputs(room);
-                       wprintf("</A></TD><TD>%d/%d</TD></TR>\n",
+                       wprintf("</a></td><td>%d/%d</td></tr>\n",
                                extract_int(&buf[4], 1),
                                extract_int(&buf[4], 2)
                        );
                }
        }
-       wprintf("</TABLE>\n");
+       wprintf("</table>\n");
        do_template("endbox");
 
 }
@@ -158,9 +131,9 @@ void tasks_section(void) {
        calendar_summary_view();
 
 #else /* WEBCIT_WITH_CALENDAR_SERVICE */
-       wprintf("<I>");
+       wprintf("<i>");
        wprintf(_("(This server does not support task lists)"));
-       wprintf("</I>\n");
+       wprintf("</i>\n");
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */
        do_template("endbox");
 }
@@ -179,7 +152,7 @@ void calendar_section(void) {
        do_template("beginbox");
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
        gotoroom("_CALENDAR_");
-       if (WC->wc_view != VIEW_CALENDAR) {
+       if ( (WC->wc_view != VIEW_CALENDAR) && (WC->wc_view != VIEW_CALBRIEF) ) {
                num_msgs = 0;
        }
        else {
@@ -199,9 +172,9 @@ void calendar_section(void) {
        }
 
 #else /* WEBCIT_WITH_CALENDAR_SERVICE */
-       wprintf("<I>");
+       wprintf("<i>");
        wprintf(_("(This server does not support calendars)"));
-       wprintf("</I>\n");
+       wprintf("</i>\n");
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */
        do_template("endbox");
 }
@@ -278,19 +251,19 @@ void summary(void) {
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=#444455><TR>"
-               "<TD><img src=\"static/summscreen_48x.gif\"></TD><TD>"
-               "<SPAN CLASS=\"titlebar\">"
+       wprintf("<table width=100%% border=0 bgcolor=#444455><tr>"
+               "<td><img src=\"static/summscreen_48x.gif\"></td><td>"
+               "<span class=\"titlebar\">"
        );
 
        snprintf(title, sizeof title, _("Summary page for %s"), WC->wc_fullname);
        escputs(title);
-       wprintf("</SPAN></TD><TD>\n");
-       wprintf("</TD><TD ALIGN=RIGHT><SPAN CLASS=\"titlebar\">");
+       wprintf("</span></td><td>\n");
+       wprintf("</td><td aling=right><span class=\"titlebar\">");
        output_date();
-       wprintf("</SPAN><br />");
+       wprintf("</span><br />");
        offer_start_page();
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</td></tr></table>\n");
 
        /**
         * You guessed it ... we're going to refresh using ajax.