]> code.citadel.org Git - citadel.git/blobdiff - webcit/roomops.c
* look and feel overhaul -- almost done!
[citadel.git] / webcit / roomops.c
index 068ab233a9d06bcc21a168681601877826a3c07a..7031fd6da10eb7ed788872013aa52428e268dee1 100644 (file)
 #include <signal.h>
 #include "webcit.h"
 
+struct folder {
+       int floor;
+       char room[SIZ];
+       char name[SIZ];
+       int hasnewmsgs;
+       int is_mailbox;
+       int selectable;
+};
 
 char *viewdefs[] = {
        "Messages",
@@ -93,12 +101,12 @@ void room_tree_list(struct roomlisting *rp)
        char rmname[64];
        int f;
 
-       if (rp == NULL)
+       if (rp == NULL) {
                return;
-
-       if (rp->lnext != NULL) {
-               room_tree_list(rp->lnext);
        }
+
+       room_tree_list(rp->lnext);
+
        strcpy(rmname, rp->rlname);
        f = rp->rlflags;
 
@@ -117,9 +125,7 @@ void room_tree_list(struct roomlisting *rp)
                wprintf("&gt;");
        wprintf("</A><TT> </TT>\n");
 
-       if (rp->rnext != NULL) {
-               room_tree_list(rp->rnext);
-       }
+       room_tree_list(rp->rnext);
        free(rp);
 }
 
@@ -209,22 +215,16 @@ void listrms(char *variety)
 }
 
 
-
-
-
-
-
-
-
 /*
  * list all rooms by floor (only should get called from knrooms() because
  * that's where output_headers() is called from)
  */
-void list_all_rooms_by_floor(void)
+void tabular_room_list(void)
 {
        int a;
        char buf[SIZ];
 
+       do_template("beginbox_nt");
        wprintf("<TABLE width=100%% border><TR><TH>Floor</TH>");
        wprintf("<TH>Rooms with new messages</TH>");
        wprintf("<TH>Rooms with no new messages</TH></TR>\n");
@@ -260,23 +260,33 @@ void list_all_rooms_by_floor(void)
                        wprintf("</TD></TR>\n");
                }
        wprintf("</TABLE>\n");
+       do_template("endbox");
        wDumpContent(1);
 }
 
 
+
+
+
+
+
+
+
 /*
  * list all forgotten rooms
  */
 void zapped_list(void)
 {
-       output_headers(1);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Zapped (forgotten) rooms</B>\n");
-       wprintf("</TD></TR></TABLE><BR>\n");
+       output_headers(3);
+
+       svprintf("BOXTITLE", WCS_STRING, "Zapped (forgotten) rooms");
+       do_template("beginbox");
+
        listrms("LZRM -1");
+
        wprintf("<BR><BR>\n");
        wprintf("Click on any room to un-zap it and goto that room.\n");
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -309,7 +319,7 @@ void embed_room_graphic(void) {
        serv_puts("OIMG _roompic_");
        serv_gets(buf);
        if (buf[0] == '2') {
-               wprintf("<TD BGCOLOR=444455>");
+               wprintf("<TD BGCOLOR=\"#444455\">");
                wprintf("<IMG SRC=\"/image&name=_roompic_&room=");
                urlescputs(WC->wc_roomname);
                wprintf("\"></TD>");
@@ -328,8 +338,8 @@ void embed_newmail_button(void) {
                        "<A HREF=\"/dotgoto?room=_MAIL_\">"
                        "<IMG SRC=\"/static/mail.gif\" border=0 "
                        "ALT=\"You have new mail\">"
-                       "<BR><FONT SIZE=2 COLOR=FFFFFF>"
-                       "%d new mail</FONT></A>", WC->new_mail);
+                       "<BR><SPAN CLASS=\"youhavemail\">"
+                       "%d new mail</SPAN></A>", WC->new_mail);
                WC->remember_new_mail = WC->new_mail;
        }
 }
@@ -746,18 +756,18 @@ void display_editroom(void)
 
        /* print the tabbed dialog */
        wprintf("<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
-               "<TR ALIGN=CENTER BGCOLOR=FFFFFF>"
+               "<TR ALIGN=CENTER BGCOLOR=\"#FFFFFF\">"
                "<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "admin")) {
-               wprintf("<TD BGCOLOR=000077><FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<TD BGCOLOR=\"#000077\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=AAAAAA><A HREF=\"/display_editroom&tab=admin\">");
+               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=admin\">");
        }
        wprintf("Room administration");
        if (!strcmp(tab, "admin")) {
-               wprintf("</B></FONT></TD>\n");
+               wprintf("</SPAN></TD>\n");
        }
        else {
                wprintf("</A></TD>\n");
@@ -766,14 +776,14 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "config")) {
-               wprintf("<TD BGCOLOR=000077><FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<TD BGCOLOR=\"#000077\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=AAAAAA><A HREF=\"/display_editroom&tab=config\">");
+               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=config\">");
        }
        wprintf("Room configuration");
        if (!strcmp(tab, "config")) {
-               wprintf("</B></FONT></TD>\n");
+               wprintf("</SPAN></TD>\n");
        }
        else {
                wprintf("</A></TD>\n");
@@ -782,14 +792,14 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "sharing")) {
-               wprintf("<TD BGCOLOR=000077><FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<TD BGCOLOR=\"#000077\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=AAAAAA><A HREF=\"/display_editroom&tab=sharing\">");
+               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=sharing\">");
        }
        wprintf("Sharing");
        if (!strcmp(tab, "sharing")) {
-               wprintf("</B></FONT></TD>\n");
+               wprintf("</SPAN></TD>\n");
        }
        else {
                wprintf("</A></TD>\n");
@@ -798,25 +808,25 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "listserv")) {
-               wprintf("<TD BGCOLOR=000077><FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<TD BGCOLOR=\"#000077\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=AAAAAA><A HREF=\"/display_editroom&tab=listserv\">");
+               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=listserv\">");
        }
        wprintf("Mailing list service");
        if (!strcmp(tab, "listserv")) {
-               wprintf("</B></FONT></TD>\n");
+               wprintf("</SPAN></TD>\n");
        }
        else {
                wprintf("</A></TD>\n");
        }
 
-       wprintf("<TD>&nbsp;</TD></TR>"
-               "<TR><TD BGCOLOR=000077 COLSPAN=9 HEIGHT=5> </TD></TR>"
-               "</TABLE>\n");
-
+       wprintf("</TR></TABLE>\n");
        /* end tabbed dialog */ 
 
+       /* begin content of whatever tab is open now */
+       wprintf("<TABLE border=0 width=100%% bgcolor=\"#FFFFFF\">\n"
+               "<TR><TD>\n");
 
        if (!strcmp(tab, "admin")) {
                wprintf("<UL>"
@@ -1132,6 +1142,9 @@ void display_editroom(void)
                wprintf("</CENTER>\n");
        }
 
+       /* end content of whatever tab is open now */
+       wprintf("</TD></TR></TABLE>\n");
+
        wDumpContent(1);
 }
 
@@ -1314,11 +1327,9 @@ void display_whok(void)
         strcpy(username, bstr("username"));
 
         output_headers(1);
-
-        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>Access control list for ");
-       escputs(WC->wc_roomname);
-        wprintf("</B></FONT></TD></TR></TABLE>\n");
+       stresc(buf, WC->wc_roomname, 1);
+       svprintf("BOXTITLE", WCS_STRING, "Access control list for %s", buf);
+       do_template("beginbox");
 
         if(!strcmp(bstr("sc"), "Kick")) {
                 sprintf(buf, "KICK %s", username);
@@ -1382,6 +1393,7 @@ void display_whok(void)
                "</FORM></CENTER>\n");
 
        wprintf("</TD></TR></TABLE>\n");
+       do_template("endbox");
         wDumpContent(1);
 }
 
@@ -1402,12 +1414,9 @@ void display_entroom(void)
                display_error(&buf[4]);
                return;
        }
-       output_headers(1);
-
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Enter (create) a new room</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       output_headers(3);
+       svprintf("BOXTITLE", WCS_STRING, "Create a new room");
+       do_template("beginbox");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/entroom\">\n");
 
@@ -1428,6 +1437,9 @@ void display_entroom(void)
 
        wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
        wprintf("> Private - invitation only\n");
+
+       wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"personal\" ");
+       wprintf("> Personal (mailbox for you only)\n");
        wprintf("</UL>\n");
 
         wprintf("<LI>Resides on floor: ");
@@ -1454,6 +1466,7 @@ void display_entroom(void)
        if (buf[0] == '1') {
                fmout(NULL);
        }
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -1487,6 +1500,8 @@ void entroom(void)
                er_num_type = 2;
        if (!strcmp(er_type, "invonly"))
                er_num_type = 3;
+       if (!strcmp(er_type, "personal"))
+               er_num_type = 4;
 
        sprintf(buf, "CRE8 1|%s|%d|%s|%d", 
                er_name, er_num_type, er_password, er_floor);
@@ -1506,12 +1521,10 @@ void entroom(void)
 void display_private(char *rname, int req_pass)
 {
 
-       output_headers(1);
+       output_headers(3);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Goto a private room</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       svprintf("BOXTITLE", WCS_STRING, "Go to a hidden room");
+       do_template("beginbox");
 
        wprintf("<CENTER>\n");
        wprintf("If you know the name of a hidden (guess-name) or\n");
@@ -1532,11 +1545,12 @@ void display_private(char *rname, int req_pass)
                wprintf("Enter room password:</TD><TD>");
                wprintf("<INPUT TYPE=\"password\" NAME=\"gr_pass\" MAXLENGTH=\"9\">\n");
        }
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</TD></TR></TABLE><BR>\n");
 
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
        wprintf("</FORM>\n");
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -1582,10 +1596,9 @@ void display_zap(void)
 {
        output_headers(1);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Zap (forget) the current room</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Zap (forget) the current room</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("If you select this option, <em>%s</em> will ", WC->wc_roomname);
        wprintf("disappear from your room list.  Is this what you wish ");
@@ -1647,10 +1660,9 @@ void confirm_delete_room(void)
                return;
        }
        output_headers(1);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Confirm deletion of room</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Confirm deletion of room</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<CENTER>");
        wprintf("<FORM METHOD=\"GET\" ACTION=\"/delete_room\">\n");
@@ -1777,10 +1789,10 @@ void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
        }
 
        /*
-        * Replace "/" characters with "|" for pseudo-folder-delimiting
+        * Replace "\" characters with "|" for pseudo-folder-delimiting
         */
        for (i=0; i<strlen(folder); ++i) {
-               if (folder[i] == '/') folder[i] = '|';
+               if (folder[i] == '\\') folder[i] = '|';
        }
 }
 
@@ -1806,32 +1818,150 @@ void change_view(void) {
 
 
 /*
- * Show the room list in "folders" format.  (only should get called by
- * knrooms() because that's where output_headers() is called from)
+ * One big expanded tree list view --- like a folder list
  */
-void folders(void) {
+void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
        char buf[SIZ];
+       int levels, oldlevels;
+       int i, t;
 
+       do_template("beginbox_nt");
+       levels = 0;
+       oldlevels = 0;
+       for (i=0; i<max_folders; ++i) {
+
+               levels = num_tokens(fold[i].name, '|');
+               oldlevels = levels;
+
+               for (t=0; t<levels; ++t) wprintf("&nbsp;&nbsp;&nbsp;");
+               if (fold[i].selectable) {
+                       wprintf("<A HREF=\"/dotgoto?room=");
+                       urlescputs(fold[i].room);
+                       wprintf("\">");
+               }
+               else {
+                       wprintf("<i>");
+               }
+               if (fold[i].hasnewmsgs) wprintf("<B>");
+               extract(buf, fold[i].name, levels-1);
+               escputs(buf);
+               if (fold[i].hasnewmsgs) wprintf("</B>");
+               if (fold[i].selectable) {
+                       wprintf("</A>");
+               }
+               else {
+                       wprintf("</i>");
+               }
+               if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
+                       wprintf(" (INBOX)");
+               }
+               wprintf("<BR>\n");
+       }
+       do_template("endbox");
+}
+
+/*
+ * Boxes and rooms and lists ... oh my!
+ */
+void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
+       char buf[SIZ];
+       char boxtitle[SIZ];
        int levels, oldlevels;
-       int swap = 0;
+       int i, t;
+       int num_boxes = 0;
+       static int columns = 3;
+       int boxes_per_column = 0;
+       int current_column = 0;
+
+       boxes_per_column = (num_floors / columns);
+       if (boxes_per_column < 1) boxes_per_column = 1;
+
+       /* Outer table (for columnization) */
+       wprintf("<TABLE BORDER=0 WIDTH=100%% CELLPADDING=5>"
+               "<TR><TD VALIGN=TOP>");
+
+       levels = 0;
+       oldlevels = 0;
+       for (i=0; i<max_folders; ++i) {
+
+               levels = num_tokens(fold[i].name, '|');
 
-       struct folder {
-               char room[SIZ];
-               char name[SIZ];
-               int hasnewmsgs;
-               int is_mailbox;
-               int selectable;
-       };
+               if ((levels == 1) && (oldlevels == 2)) {
 
+                       /* End inner box */
+                       do_template("endbox");
+
+                       ++num_boxes;
+                       if ((num_boxes % boxes_per_column) == 0) {
+                               ++current_column;
+                               if (current_column < columns) {
+                                       wprintf("</TD><TD VALIGN=TOP>\n");
+                               }
+                       }
+               }
+
+               if (levels == 1) {
+
+                       /* Begin inner box */
+                       extract(buf, fold[i].name, levels-1);
+                       stresc(boxtitle, buf, 1);
+                       svprintf("BOXTITLE", WCS_STRING, boxtitle);
+                       do_template("beginbox");
+
+               }
+
+               oldlevels = levels;
+
+               if (levels > 1) {
+                       wprintf("&nbsp;");
+                       if (levels>2) for (t=0; t<(levels-2); ++t) wprintf("&nbsp;&nbsp;&nbsp;");
+                       if (fold[i].selectable) {
+                               wprintf("<A HREF=\"/dotgoto?room=");
+                               urlescputs(fold[i].room);
+                               wprintf("\">");
+                       }
+                       else {
+                               wprintf("<i>");
+                       }
+                       if (fold[i].hasnewmsgs) wprintf("<B>");
+                       extract(buf, fold[i].name, levels-1);
+                       escputs(buf);
+                       if (fold[i].hasnewmsgs) wprintf("</B>");
+                       if (fold[i].selectable) {
+                               wprintf("</A>");
+                       }
+                       else {
+                               wprintf("</i>");
+                       }
+                       if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
+                               wprintf(" (INBOX)");
+                       }
+                       wprintf("<BR>\n");
+               }
+       }
+       /* End the final inner box */
+       do_template("endbox");
+
+       wprintf("</TD></TR></TABLE>\n");
+}
+
+
+/*
+ * Show the room list.  (only should get called by
+ * knrooms() because that's where output_headers() is called from)
+ */
+
+void list_all_rooms_by_floor(char *viewpref) {
+       char buf[SIZ];
+       int swap = 0;
        struct folder *fold = NULL;
        struct folder ftmp;
        int max_folders = 0;
        int alloc_folders = 0;
-       int i, j, k, t;
-       int p;
-       int flags;
-       int floor;
-       int nests = 0;
+       int i, j;
+       int ra_flags = 0;
+       int flags = 0;
+       int num_floors = 1;     /* add an extra one for private folders */
 
        /* Start with the mailboxes */
        max_folders = 1;
@@ -1853,34 +1983,34 @@ void folders(void) {
                memset(&fold[max_folders], 0, sizeof(struct folder));
                extract(fold[max_folders].name, buf, 1);
                ++max_folders;
+               ++num_floors;
        }
 
        /* Now add rooms */
-       for (p = 0; p < 2; ++p) {
-               if (p == 0) serv_puts("LKRN");
-               else if (p == 1) serv_puts("LKRO");
-               serv_gets(buf);
-               if (buf[0]=='1') while(serv_gets(buf), strcmp(buf, "000")) {
-                       if (max_folders >= alloc_folders) {
-                               alloc_folders = max_folders + 100;
-                               fold = realloc(fold,
-                                       alloc_folders * sizeof(struct folder));
-                       }
-                       memset(&fold[max_folders], 0, sizeof(struct folder));
-                       extract(fold[max_folders].room, buf, 0);
-                       if (p == 0) fold[max_folders].hasnewmsgs = 1;
-                       flags = extract_int(buf, 1);
-                       floor = extract_int(buf, 2);
-                       if (flags & QR_MAILBOX) {
-                               fold[max_folders].is_mailbox = 1;
-                       }
-                       room_to_folder(fold[max_folders].name,
-                                       fold[max_folders].room,
-                                       floor,
-                                       fold[max_folders].is_mailbox);
-                       fold[max_folders].selectable = 1;
-                       ++max_folders;
+       serv_puts("LKRA");
+       serv_gets(buf);
+       if (buf[0]=='1') while(serv_gets(buf), strcmp(buf, "000")) {
+               if (max_folders >= alloc_folders) {
+                       alloc_folders = max_folders + 100;
+                       fold = realloc(fold,
+                               alloc_folders * sizeof(struct folder));
+               }
+               memset(&fold[max_folders], 0, sizeof(struct folder));
+               extract(fold[max_folders].room, buf, 0);
+               ra_flags = extract_int(buf, 5);
+               flags = extract_int(buf, 1);
+               fold[max_folders].floor = extract_int(buf, 2);
+               fold[max_folders].hasnewmsgs =
+                       ((ra_flags & UA_HASNEWMSGS) ? 1 : 0 );
+               if (flags & QR_MAILBOX) {
+                       fold[max_folders].is_mailbox = 1;
                }
+               room_to_folder(fold[max_folders].name,
+                               fold[max_folders].room,
+                               fold[max_folders].floor,
+                               fold[max_folders].is_mailbox);
+               fold[max_folders].selectable = 1;
+               ++max_folders;
        }
 
        /* Bubble-sort the folder list */
@@ -1908,50 +2038,12 @@ void folders(void) {
                }
        }
 
-       /* Output */
-       nests = 0;
-       levels = 0;
-       oldlevels = 0;
-       for (i=0; i<max_folders; ++i) {
-
-               levels = num_tokens(fold[i].name, '|');
-               if (levels > oldlevels) {
-                       for (k=0; k<(levels-oldlevels); ++k) {
-                               ++nests;
-                       }
-               }
-               if (levels < oldlevels) {
-                       for (k=0; k<(oldlevels-levels); ++k) {
-                               --nests;
-                       }
-               }
-               oldlevels = levels;
-
-               for (t=0; t<nests; ++t) wprintf("&nbsp;&nbsp;&nbsp;");
-               if (fold[i].selectable) {
-                       wprintf("<A HREF=\"/dotgoto?room=");
-                       urlescputs(fold[i].room);
-                       wprintf("\">");
-               }
-               else {
-                       wprintf("<i>");
-               }
-               if (fold[i].hasnewmsgs) wprintf("<B>");
-               extract(buf, fold[i].name, levels-1);
-               escputs(buf);
-               if (fold[i].hasnewmsgs) wprintf("</B>");
-               if (fold[i].selectable) {
-                       wprintf("</A>");
-               }
-               else {
-                       wprintf("</i>");
-               }
-               if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
-                       wprintf(" (INBOX)");
-               }
-               wprintf("<BR>\n");
+       if (!strcasecmp(viewpref, "folders")) {
+               do_folder_view(fold, max_folders, num_floors);
+       }
+       else {
+               do_rooms_view(fold, max_folders, num_floors);
        }
-       while (nests-- > 0) ;; 
 
        free(fold);
        wDumpContent(1);
@@ -1976,13 +2068,14 @@ void knrooms() {
 
        get_preference("roomlistview", listviewpref);
 
-       if (strcasecmp(listviewpref, "folders")) {
+       if ( (strcasecmp(listviewpref, "folders"))
+          && (strcasecmp(listviewpref, "table")) ) {
                strcpy(listviewpref, "rooms");
        }
 
        /* title bar */
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>"
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">"
        );
        if (!strcasecmp(listviewpref, "rooms")) {
                wprintf("Room list");
@@ -1990,7 +2083,10 @@ void knrooms() {
        if (!strcasecmp(listviewpref, "folders")) {
                wprintf("Folder list");
        }
-       wprintf("</B></TD>\n");
+       if (!strcasecmp(listviewpref, "table")) {
+               wprintf("Room list");
+       }
+       wprintf("</SPAN></TD>\n");
 
 
        /* offer the ability to switch views */
@@ -2011,15 +2107,21 @@ void knrooms() {
                ( !strcasecmp(listviewpref, "folders") ? "SELECTED" : "" )
        );
 
+       wprintf("<OPTION %s VALUE=\"/knrooms&view=table\">"
+               "Classic table view"
+               "</OPTION>\n",
+               ( !strcasecmp(listviewpref, "table") ? "SELECTED" : "" )
+       );
+
        wprintf("</SELECT></FORM></TD><TD>\n");
        offer_start_page();
-       wprintf("</TD></TR></TABLE><BR>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        /* Display the room list in the user's preferred format */
-       if (!strcasecmp(listviewpref, "folders")) {
-               folders();
+       if (!strcasecmp(listviewpref, "table")) {
+               tabular_room_list();
        }
        else {
-               list_all_rooms_by_floor();
+               list_all_rooms_by_floor(listviewpref);
        }
 }