]> code.citadel.org Git - citadel.git/blobdiff - webcit/summary.c
projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* collect sender / read / unread information for calendar items
[citadel.git] / webcit / summary.c
diff --git a/webcit/summary.c b/webcit/summary.c
index 95fa8a8a418cb025b28c005b696eb40cade0af43..06487fb9f94716bb44534da086f4070793ac6c38 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -47,8 +47,6 @@ void new_messages_section(void) {
        int number_of_rooms_to_check;
        char *rooms_to_check = "Mail|Lobby";
 
-       svprintf("BOXTITLE", WCS_STRING, _("Messages"));
-       do_template("beginbox");
 
        number_of_rooms_to_check = num_tokens(rooms_to_check, '|');
        if (number_of_rooms_to_check == 0) return;
@@ -72,7 +70,6 @@ void new_messages_section(void) {
                }
        }
        wprintf("</table>\n");
-       do_template("endbox");
 
 }
 
@@ -83,17 +80,38 @@ void new_messages_section(void) {
 void wholist_section(void) {
        char buf[SIZ];
        char user[SIZ];
+        time_t last_activity;
+        time_t now;
+
+       serv_puts("TIME");
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '2') {
+               now = extract_long(&buf[4], 0);
+       }
+       else {
+               now = time(NULL);
+       }
 
-       svprintf("BOXTITLE", WCS_STRING, _("Who's&nbsp;online&nbsp;now"));
-       do_template("beginbox");
        serv_puts("RWHO");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                extract_token(user, buf, 1, '|', sizeof user);
-               escputs(user);
-               wprintf("<br />\n");
+                last_activity = extract_long(buf, 5);
+               if (strcmp(user, NLI)) {
+                       wprintf("<li class=\"");
+                        if ((now - last_activity) > 900L) {
+                                wprintf("inactiveuser");
+                        }
+                        else {
+                                wprintf("activeuser");
+                        }
+                       wprintf("\"><a href=\"showuser?who=");
+                       urlescputs(user);
+                       wprintf("\">");
+                       escputs(user);
+                       wprintf("</a></li>");
+               }
        }
-       do_template("endbox");
 }
 
 
@@ -106,8 +124,6 @@ void tasks_section(void) {
        int i;
 #endif
 
-       svprintf("BOXTITLE", WCS_STRING, _("Tasks"));
-       do_template("beginbox");
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
        gotoroom("_TASKS_");
        if (WC->wc_view != VIEW_TASKS) {
@@ -124,7 +140,7 @@ void tasks_section(void) {
        }
        else {
                for (i=0; i<num_msgs; ++i) {
-                       display_task(WC->msgarr[i]);
+                       display_task(WC->msgarr[i], 0);
                }
        }
 
@@ -135,7 +151,6 @@ void tasks_section(void) {
        wprintf(_("(This server does not support task lists)"));
        wprintf("</i>\n");
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-       do_template("endbox");
 }
 
 
@@ -148,8 +163,6 @@ void calendar_section(void) {
        int i;
 #endif
 
-       svprintf("BOXTITLE", WCS_STRING, _("Today&nbsp;on&nbsp;your&nbsp;calendar"));
-       do_template("beginbox");
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
        gotoroom("_CALENDAR_");
        if ( (WC->wc_view != VIEW_CALENDAR) && (WC->wc_view != VIEW_CALBRIEF) ) {
@@ -166,7 +179,7 @@ void calendar_section(void) {
        }
        else {
                for (i=0; i<num_msgs; ++i) {
-                       display_calendar(WC->msgarr[i]);
+                       display_calendar(WC->msgarr[i], 0);
                }
                calendar_summary_view();
        }
@@ -176,7 +189,6 @@ void calendar_section(void) {
        wprintf(_("(This server does not support calendars)"));
        wprintf("</i>\n");
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-       do_template("endbox");
 }
 
 /**
@@ -185,23 +197,22 @@ void calendar_section(void) {
 void server_info_section(void) {
        char message[512];
 
-       svprintf("BOXTITLE", WCS_STRING, _("About&nbsp;this&nbsp;server"));
-       do_template("beginbox");
-
        snprintf(message, sizeof message,
                _("You are connected to %s, running %s with %s, and located in %s.  Your system administrator is %s."),
                serv_info.serv_humannode,
                serv_info.serv_software,
-               SERVER,
+               PACKAGE_STRING,
                serv_info.serv_bbs_city,
                serv_info.serv_sysadm);
        escputs(message);
-       do_template("endbox");
 }
 
 /**
  * \brief summary of inner div????
  */
+
+
+
 void summary_inner_div(void) {
        /**
         * Now let's do three columns of crap.  All portals and all groupware
@@ -212,34 +223,81 @@ void summary_inner_div(void) {
         */
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%%><tr valign=top>");
+               "<table width=\"100%%\" cellspacing=\"10px\" cellpadding=\"0\">"
+               "<tr valign=top>");
 
        /**
         * Column One
         */
        wprintf("<td width=33%%>");
-       wholist_section();
+       wprintf("<div class=\"box\">"); 
+       wprintf("<div class=\"boxlabel\">");    
+       wprintf(_("Messages"));
+       wprintf("</div><div class=\"boxcontent\">");    
+       wprintf("<div id=\"msg_inner\">");      
+       new_messages_section();
+       wprintf("</div></div></div>");
+       wprintf("</td>");
 
        /**
-        * Column Two
+        * Column Two 
         */
-       wprintf("</td><td width=33%%>");
-       server_info_section();
-       wprintf("<br />");
+       wprintf("<td width=33%%>");
+       wprintf("<div class=\"box\">"); 
+       wprintf("<div class=\"boxlabel\">");    
+       wprintf(_("Tasks"));
+       wprintf("</div><div class=\"boxcontent\">");    
+       wprintf("<div id=\"tasks_inner\">");    
        tasks_section();
+       wprintf("</div></div></div>");
+       wprintf("</td>");
 
        /**
         * Column Three
         */
-       wprintf("</td><td width=33%%>");
-       new_messages_section();
-       wprintf("<br />");
+       wprintf("<td width=33%%>");
+       wprintf("<div class=\"box\">"); 
+       wprintf("<div class=\"boxlabel\">");    
+       wprintf(_("Today&nbsp;on&nbsp;your&nbsp;calendar"));
+       wprintf("</div><div class=\"boxcontent\">");    
+       wprintf("<div id=\"calendar_inner\">"); 
        calendar_section();
+       wprintf("</div></div></div>");
+       wprintf("</td>");
+
+       wprintf("</tr><tr valign=top>");
+
+       /**
+        * Row Two - Column One
+        */
+       wprintf("<td colspan=2>");
+       wprintf("<div class=\"box\">"); 
+       wprintf("<div class=\"boxlabel\">");    
+       wprintf(_("Who's&nbsp;online&nbsp;now"));
+       wprintf("</div><div class=\"boxcontent\">");    
+       wprintf("<div id=\"who_inner\">");      
+       who_inner_div(); 
+       wprintf("</div></div></div>");
+       wprintf("</td>");
+
+       /**
+        * Row Two - Column Two
+        */
+       wprintf("<td width=33%%>");
+       wprintf("<div class=\"box\">"); 
+       wprintf("<div class=\"boxlabel\">");    
+       wprintf(_("About&nbsp;this&nbsp;server"));
+       wprintf("</div><div class=\"boxcontent\">");    
+       wprintf("<div id=\"info_inner\">");     
+       server_info_section();
+       wprintf("</div></div></div>");
+       wprintf("</td>");
+
 
        /**
         * End of columns
         */
-       wprintf("</td></tr></table>");
+       wprintf("</tr></table>");
 }
 
 
@@ -251,16 +309,17 @@ void summary(void) {
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-        wprintf("<div class=\"service_banner\">\n");
+       wprintf("<div class=\"room_banner\">");
         wprintf("<img src=\"static/summscreen_48x.gif\">");
         wprintf("<h1>");
         snprintf(title, sizeof title, _("Summary page for %s"), WC->wc_fullname);
         escputs(title);
-        wprintf("</h1><h2>\n");
+        wprintf("</h1><h2>");
         output_date();
         wprintf("</h2></div>");
-        wprintf("<ul><li class=\"start_page\">");
-        offer_start_page();
+       wprintf("<ul class=\"room_actions\">\n");
+       wprintf("<li class=\"start_page\">");
+       offer_start_page();
         wprintf("</li></ul>");
         wprintf("</div>");
 
@@ -269,14 +328,20 @@ void summary(void) {
         * In the future we might consider updating individual sections of the summary
         * instead of the whole thing.
         */
-       wprintf("<div id=\"content\">\n");
+       wprintf("<div id=\"content\" class=\"service\">\n");
        summary_inner_div();
        wprintf("</div>\n");
 
        wprintf(
                "<script type=\"text/javascript\">                                      "
-               " new Ajax.PeriodicalUpdater('content', 'summary_inner_div',            "
+               " new Ajax.PeriodicalUpdater('msg_inner', 'new_messages_html',          "
                "                            { method: 'get', frequency: 60 }  );       "
+               " new Ajax.PeriodicalUpdater('tasks_inner', 'tasks_inner_html',         "
+               "                            { method: 'get', frequency: 120 }  );      "
+               " new Ajax.PeriodicalUpdater('calendar_inner', 'calendar_inner_html',           "
+               "                            { method: 'get', frequency: 90 }  );       "
+               " new Ajax.PeriodicalUpdater('who_inner', 'who_inner_html',             "
+               "                            { method: 'get', frequency: 30 }  );       "
                "</script>                                                              \n"
        );
 
Citadel server, clients, utilities