* add transitional beginboxx template and move some places to the new syntax

[citadel.git] / webcit / summary.c

diff --git a/webcit/summary.c b/webcit/summary.c
index 00a52096dddc9e4e1cf9f99ddd8aa97617c1bae0..c18b57b81b05a08a2ef590dbded5a9680e7ee25a 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -24,19 +24,19 @@ void output_date(void) {
 
 
 
-/**
- * \brief Dummy section
+/*
+ * Dummy section
  */
 void dummy_section(void) {
        svput("BOXTITLE", WCS_STRING, "(dummy section)");
-       do_template("beginbox", NULL);
+       do_template("beginboxx", NULL);
        wprintf(_("(nothing)"));
        do_template("endbox", NULL);
 }
 
 
-/**
- * \brief New messages section
+/*
+ * New messages section
  */
 void new_messages_section(void) {
        char buf[SIZ];
@@ -72,15 +72,20 @@ void new_messages_section(void) {
 }
 
 
-/**
- * \brief Task list section
+/*
+ * Task list section
  */
 void tasks_section(void) {
        int num_msgs = 0;
-       int i;
+       HashPos *at;
+       const char *HashKey;
+       long HKLen;
+       void *vMsg;
+       message_summary *Msg;
+       struct wcsession *WCC = WC;
 
        gotoroom("_TASKS_");
-       if (WC->wc_view != VIEW_TASKS) {
+       if (WCC->wc_view != VIEW_TASKS) {
                num_msgs = 0;
        }
        else {
@@ -93,8 +98,10 @@ void tasks_section(void) {
                wprintf("</i><br />\n");
        }
        else {
-               for (i=0; i<num_msgs; ++i) {
-                       display_task(WC->msgarr[i], 0);
+               at = GetNewHashPos();
+               while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+                       Msg = (message_summary*) vMsg;          
+                       display_task(Msg, 0);
                }
        }
 
@@ -102,12 +109,18 @@ void tasks_section(void) {
 }
 
 
-/**
- * \brief Calendar section
+/*
+ * Calendar section
  */
 void calendar_section(void) {
        int num_msgs = 0;
-       int i;
+       HashPos *at;
+       const char *HashKey;
+       long HKLen;
+       void *vMsg;
+       message_summary *Msg;
+       struct wcsession *WCC = WC;
+       struct calview c;
 
        gotoroom("_CALENDAR_");
        if ( (WC->wc_view != VIEW_CALENDAR) && (WC->wc_view != VIEW_CALBRIEF) ) {
@@ -117,21 +130,25 @@ void calendar_section(void) {
                num_msgs = load_msg_ptrs("MSGS ALL", 0);
        }
 
+       parse_calendar_view_request(&c);
+
        if (num_msgs < 1) {
                wprintf("<i>");
                wprintf(_("(Nothing)"));
                wprintf("</i><br />\n");
        }
        else {
-               for (i=0; i<num_msgs; ++i) {
-                       display_calendar(WC->msgarr[i], 0);
+               at = GetNewHashPos();
+               while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+                       Msg = (message_summary*) vMsg;          
+                       load_calendar_item(Msg, 0, &c);
                }
                calendar_summary_view();
        }
 }
 
-/**
- * \brief Server info section (fluff, really)
+/*
+ * Server info section (fluff, really)
  */
 void server_info_section(void) {
        char message[512];
@@ -147,26 +164,19 @@ void server_info_section(void) {
        escputs(message);
 }
 
-/**
- * \brief summary of inner div????
+/*
+ * Now let's do three columns of crap.  All portals and all groupware
+ * clients seem to want to do three columns, so we'll do three
+ * columns too.  Conformity is not inherently a virtue, but there are
+ * a lot of really shallow people out there, and even though they're
+ * not people I consider worthwhile, I still want them to use WebCit.
  */
-
-
-
 void summary_inner_div(void) {
-       /**
-        * Now let's do three columns of crap.  All portals and all groupware
-        * clients seem to want to do three columns, so we'll do three
-        * columns too.  Conformity is not inherently a virtue, but there are
-        * a lot of really shallow people out there, and even though they're
-        * not people I consider worthwhile, I still want them to use WebCit.
-        */
-
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table width=\"100%%\" cellspacing=\"10px\" cellpadding=\"0\">"
+               "<table width=\"100%%\" cellspacing=\"10\" cellpadding=\"0\">"
                "<tr valign=top>");
 
-       /**
+       /*
         * Column One
         */
        wprintf("<td width=33%%>");
@@ -179,7 +189,7 @@ void summary_inner_div(void) {
        wprintf("</div></div></div>");
        wprintf("</td>");
 
-       /**
+       /*
         * Column Two 
         */
        wprintf("<td width=33%%>");
@@ -192,7 +202,7 @@ void summary_inner_div(void) {
        wprintf("</div></div></div>");
        wprintf("</td>");
 
-       /**
+       /*
         * Column Three
         */
        wprintf("<td width=33%%>");
@@ -207,7 +217,7 @@ void summary_inner_div(void) {
 
        wprintf("</tr><tr valign=top>");
 
-       /**
+       /*
         * Row Two - Column One
         */
        wprintf("<td colspan=2>");
@@ -220,7 +230,7 @@ void summary_inner_div(void) {
        wprintf("</div></div></div>");
        wprintf("</td>");
 
-       /**
+       /*
         * Row Two - Column Two
         */
        wprintf("<td width=33%%>");
@@ -234,15 +244,15 @@ void summary_inner_div(void) {
        wprintf("</td>");
 
 
-       /**
+       /*
         * End of columns
         */
        wprintf("</tr></table>");
 }
 
 
-/**
- * \brief Display this user's summary page
+/*
+ * Display this user's summary page
  */
 void summary(void) {
        char title[256];
@@ -259,11 +269,11 @@ void summary(void) {
         wprintf("</h2></div>");
        wprintf("<ul class=\"room_actions\">\n");
        wprintf("<li class=\"start_page\">");
-       offer_start_page(NULL, 0, NULL, NULL);
+       offer_start_page(NULL, 0, NULL, NULL, CTX_NONE);
         wprintf("</li></ul>");
         wprintf("</div>");
 
-       /**
+       /*
         * You guessed it ... we're going to refresh using ajax.
         * In the future we might consider updating individual sections of the summary
         * instead of the whole thing.
@@ -300,4 +310,3 @@ InitModule_SUMMARY
        WebcitAddUrlHandler(HKEY("summary_inner_div"), summary_inner_div, AJAX);
 }
 
-/*@}*/