* fix_scrollbar_bug is now a class instead of an id. Fixes validator warnings.

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 1ce681fafd2f71cd13184e583264590c2d383321..5ed5c5a3e67709ff7441413bef49a45f02d26e8a 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -225,6 +225,9 @@ void readinfo(void)
        if (buf[0] == '1') {
                fmout("CENTER");
        }
+       else {
+               wprintf(" ");
+       }
 }
 
 
@@ -341,6 +344,13 @@ void embed_room_banner(char *got, int navbar_style) {
                got = fakegot;
        }
 
+       /* The browser needs some information for its own use */
+       wprintf("<script type=\"text/javascript\">      \n"
+               "       room_is_trash = %d;             \n"
+               "</script>\n",
+               WC->wc_is_trash
+       );
+
        /* If the user happens to select the "make this my start page" link,
         * we want it to remember the URL as a "/dotskip" one instead of
         * a "skip" or "gotonext" or something like that.
@@ -353,8 +363,11 @@ void embed_room_banner(char *got, int navbar_style) {
        WC->wc_view = extract_int(&got[4], 11);
 
        svprintf("ROOMNAME", WCS_STRING, "%s", WC->wc_roomname);
-       svprintf("NEWMSGS", WCS_STRING, "%d", extract_int(&got[4], 1));
-       svprintf("TOTALMSGS", WCS_STRING, "%d", extract_int(&got[4], 2));
+       svprintf("NUMMSGS", WCS_STRING,
+               _("%d new of %d messages"),
+               extract_int(&got[4], 1),
+               extract_int(&got[4], 2)
+       );
        svcallback("ROOMPIC", embed_room_graphic);
        svcallback("ROOMINFO", readinfo);
        svcallback("VIEWOMATIC", embed_view_o_matic);
@@ -584,6 +597,7 @@ int gotoroom(char *gname)
        WC->wc_floor = extract_int(&buf[4], 10);
        WC->wc_view = extract_int(&buf[4], 11);
        WC->wc_default_view = extract_int(&buf[4], 12);
+       WC->wc_is_trash = extract_int(&buf[4], 13);
 
        if (WC->is_aide)
                WC->is_room_aide = WC->is_aide;
@@ -867,7 +881,7 @@ void display_editroom(void)
 
        /* print the tabbed dialog */
        wprintf("<br />"
-               "<div id=\"fix_scrollbar_bug\">"
+               "<div class=\"fix_scrollbar_bug\">"
                "<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
                "<TR ALIGN=CENTER>"
                "<TD>&nbsp;</TD>\n");
@@ -972,7 +986,7 @@ void display_editroom(void)
        /* end tabbed dialog */ 
 
        /* begin content of whatever tab is open now */
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<TABLE border=0 width=100%% bgcolor=\"#FFFFFF\">\n"
                "<TR><TD>\n");
 
@@ -1824,7 +1838,7 @@ void display_entroom(void)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
@@ -2033,7 +2047,7 @@ void display_private(char *rname, int req_pass)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div id=\"fix_scrollbar_bug\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER>\n");
@@ -2831,13 +2845,13 @@ void knrooms() {
                "<SPAN CLASS=\"titlebar\">"
        );
        if (!strcasecmp(listviewpref, "rooms")) {
-               wprintf("Room list");
+               wprintf(_("Room list"));
        }
        if (!strcasecmp(listviewpref, "folders")) {
-               wprintf("Folder list");
+               wprintf(_("Folder list"));
        }
        if (!strcasecmp(listviewpref, "table")) {
-               wprintf("Room list");
+               wprintf(_("Room list"));
        }
        wprintf("</SPAN></TD>\n");