* Merged the 'banner' and 'room_banner' classes. There is no reason for them to...

[citadel.git] / webcit / summary.c

diff --git a/webcit/summary.c b/webcit/summary.c
index 208169eb1d2f7419cc566fe0472f7d74f251fd02..8266714b2dfeac17bbd3199fa0b719d19a4b4847 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -95,11 +95,12 @@ void tasks_section(void) {
        Buf = NewStrBufPlain(HKEY("_TASKS_"));
        gotoroom(Buf);
        FreeStrBuf(&Buf);
-       if (WCC->wc_view != VIEW_TASKS) {
+
+       if (WCC->CurRoom.view != VIEW_TASKS) {
                num_msgs = 0;
        }
        else {
-               num_msgs = load_msg_ptrs("MSGS ALL", &Stat);
+               num_msgs = load_msg_ptrs("MSGS ALL", &Stat, NULL);
        }
 
        if (num_msgs > 0) {
@@ -143,11 +144,11 @@ void calendar_section(void) {
        Buf = NewStrBufPlain(HKEY("_CALENDAR_"));
        gotoroom(Buf);
        FreeStrBuf(&Buf);
-       if ( (WC->wc_view != VIEW_CALENDAR) && (WC->wc_view != VIEW_CALBRIEF) ) {
+       if ( (WC->CurRoom.view != VIEW_CALENDAR) && (WC->CurRoom.view != VIEW_CALBRIEF) ) {
                num_msgs = 0;
        }
        else {
-               num_msgs = load_msg_ptrs("MSGS ALL", &Stat);
+               num_msgs = load_msg_ptrs("MSGS ALL", &Stat, NULL);
        }
        calendar_GetParamsGetServerCall(&Stat, 
                                        &v,
@@ -251,7 +252,7 @@ void summary_inner_div(void) {
        wc_printf(_("Who's online now"));
        wc_printf("</div><div class=\"boxcontent\">");  
        wc_printf("<div id=\"who_inner\">");    
-       do_template("wholistsummarysection", NULL);
+       do_template("who_summary", NULL);
        wc_printf("</div></div></div>");
        wc_printf("</td>");
 
@@ -284,7 +285,7 @@ void summary(void) {
 
        output_headers(1, 1, 2, 0, 0, 0);
        wc_printf("<div id=\"banner\">\n");
-       wc_printf("<div class=\"room_banner\">");
+       wc_printf("<div class=\"banner\">");
         wc_printf("<img src=\"static/summscreen_48x.gif\">");
         wc_printf("<h1>");
         snprintf(title, sizeof title, _("Summary page for %s"), ChrPtr(WC->wc_fullname));
@@ -317,7 +318,7 @@ void summary(void) {
                "                            { method: 'get', frequency: 120 }  );      "
                " new Ajax.PeriodicalUpdater('calendar_inner', 'calendar_inner_html',           "
                "                            { method: 'get', frequency: 90 }  );       "
-               " new Ajax.PeriodicalUpdater('do_template', 'template=wholistsummarysection',   "
+               " new Ajax.PeriodicalUpdater('do_template', 'template=who_summary',     "
                "                            { method: 'get', frequency: 30 }  );       "
                "</script>                                                              \n"
        );