use the same way to display all banners and services contents

we will use only one css classe to display the content of screens which
are not rooms : Summary, Who's online ? Advanced, Configuration, etc.

diff --git a/webcit/auth.c b/webcit/auth.c
index ecde8065b7d0537b594af9900208456e321303f2..0a64641a24114e4cbb1fc9064776bb6de0b9b9da 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -330,11 +330,13 @@ void validate(void)
        int a;
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE class=\"auth_banner\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        wprintf(_("Validate new users"));
-       wprintf("</SPAN></TD></TR></TABLE>\n</div>\n<div id=\"content\">\n");
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        /** If the user just submitted a validation, process it... */
        safestrncpy(buf, bstr("user"), sizeof buf);
@@ -462,14 +464,13 @@ void display_changepw(void)
        char buf[SIZ];
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE class=\"auth_banner\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        wprintf(_("Change your password"));
-       wprintf("</SPAN>"
-               "</TD></TR></TABLE>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>");
+       wprintf("</div>");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        if (!IsEmptyStr(WC->ImportantMessage)) {
                do_template("beginbox_nt");

diff --git a/webcit/calendar.c b/webcit/calendar.c
index d37721a2f17e8f40991f0132d5eaef15d77023fa..ed5bb6dca02382d2e8f457fb0cfffba53d64340e 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -498,15 +498,14 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        }
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE class=\"calendar_banner\"><TR>"
-               "<TD><img src=\"static/taskmanag_48x.gif\"></TD>"
-               "<td><SPAN CLASS=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<img src=\"static/taskmanag_48x.gif\">");
+       wprintf("<h1>");
        wprintf(_("Edit task"));
-       wprintf("</SPAN>"
-               "</TD></TR></TABLE>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table class=\"calendar_background\"><tr><td>");

diff --git a/webcit/downloads.c b/webcit/downloads.c
index d29e7fc7ebd635f8658436332dd2ccaca2c7fbf8..f500fbc84387fef615666d86bbbfa6095c7e64f1 100644 (file)
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -13,15 +13,14 @@ void display_room_directory(void)
        char title[256];
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<table class=\"downloads_banner\"><tr><td>"
-               "<span class=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        snprintf(title, sizeof title, _("Files available for download in %s"), WC->wc_roomname);
        escputs(title);
-       wprintf("</span>"
-               "</td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table class=\"downloads_background\"><tr><td>\n");

diff --git a/webcit/event.c b/webcit/event.c
index 4aa7f9ef1e7bc1a67f7453bf51809e1e63d0468b..cbcd7fa5a1af106a26b4a671b04821d6292c9a73 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -70,14 +70,13 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
        /** Begin output */
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE class=\"event_banner\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        wprintf(_("Add or edit an event"));
-       wprintf("</SPAN>"
-               "</TD></TR></TABLE>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<script type=\"text/javascript\">"
                "function grey_all_day() { "

diff --git a/webcit/floors.c b/webcit/floors.c
index 3ea670d8fc1f6730513874ecd565a59103682550..fb268ff4830d461d3d9b286781f8e4534d447eec 100644 (file)
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -28,14 +28,13 @@ void display_floorconfig(char *prepend_html)
        int refcount;
 
         output_headers(1, 1, 2, 0, 0, 0);
-        wprintf("<div id=\"banner\">\n"
-                "<TABLE class=\"floors_banner\"><TR><TD>"
-                "<SPAN CLASS=\"titlebar\">");
+        wprintf("<div id=\"banner\">\n");
+        wprintf("<h1>");
        wprintf(_("Add/change/delete floors"));
-       wprintf("</SPAN>"
-                "</TD></TR></TABLE>\n"
-                "</div>\n<div id=\"content\">\n"
-        );
+       wprintf("</h1>");
+        wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
                                                                                                                              
        if (prepend_html != NULL) {
                wprintf("<br /><b><i>");

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 55adb98d7f1c66cc94aeda37b0bf438ee5fce8b3..f040f22cdc222978ae3aeb5977012d6ded190410 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -21,14 +21,13 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        output_headers(1, 1, 0, 0, 0, 0);
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE class=\"graphics_banner\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        wprintf(_("Image upload"));
-       wprintf("</SPAN>"
-               "</TD></TR></TABLE>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table class=\"graphics_background\"><tr><td>\n");

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 6c43ac706cdbcbff7d559f2857eee3d1d80e0c62..c05bce888b8d9c78e5b93d6b0088516cf70326ce 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -485,11 +485,12 @@ void display_customize_iconbar(void) {
        }
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\" class=\"service\">\n");
+       wprintf("<div id=\"banner\">");
        wprintf("<h1>");
        wprintf(_("Customize the icon bar"));
        wprintf("</h1></div>\n");
-       wprintf("<div id=\"content\" class=\"customize_menu\">\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">");
 
@@ -791,11 +792,12 @@ void commit_iconbar(void) {
        set_preference("iconbar", iconbar, 1);
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\" class=\"service\">\n");
+       wprintf("<div id=\"banner\">\n");
        wprintf("<h1>");
        wprintf(_("Customize the icon bar"));
        wprintf("</h1></div>\n");
-       wprintf("<div id=\"content\" class=\"customize_menu\">\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
        wprintf(
                "<center><table border=1 bgcolor=\"#ffffff\"><tr><td>"
                "<img src=\"static/advanpage2_48x.gif\">"

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index 56989f73f3182404f2f5a3235df5ad095a043161..7fa0f3b9c5118329bbd09a8f695c4604b0ff51b8 100644 (file)
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -95,12 +95,12 @@ void display_inetconf(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE class=\"inetconf_banner\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("Internet configuration"));
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%%><tr><td valign=top>\n");

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 6d4d1faf8d2614605fa93a04d8c476ef5874135d..e53e883a7d57dd1dea152a0140dac32b0c3f7886 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -159,13 +159,13 @@ void display_aide_menu(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
 
-        wprintf("<div id=\"banner\" class=\"service\">\n");
+        wprintf("<div id=\"banner\">\n");
         wprintf("<h1>");
        wprintf(_("System Administration Menu"));
         wprintf("</h1>");
-        wprintf("</div>");
+        wprintf("</div>\n");
 
-       wprintf("<div id=\"content\">");
+       wprintf("<div id=\"content\" class=\"service\">");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=99%%> "
@@ -208,13 +208,13 @@ void display_aide_menu(void)
 void display_generic(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<table class=\"mainmenu_banner\"><tr><td>"
-               "<span class=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        wprintf(_("Enter a server command"));
-       wprintf("</span></td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table class=\"mainmenu_background\"><tr><td>\n");

diff --git a/webcit/messages.c b/webcit/messages.c
index bff4ec081677f140824163fd0699533db75b999c..eed0838855985a4c724a0371027e2114c12f6433 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -3389,12 +3389,12 @@ void confirm_move_msg(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("Confirm move of message"));
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<CENTER>");
 

diff --git a/webcit/netconf.c b/webcit/netconf.c
index bfb9388708df9a24f15290e24daff3974ed741e6..a1498692f216d6eadbe371caabcb3806cef09a5c 100644 (file)
--- a/webcit/netconf.c
+++ b/webcit/netconf.c
@@ -63,12 +63,12 @@ void display_add_node(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("Add a new node"));
-       wprintf("</SPAN>");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<FORM METHOD=\"POST\" action=\"edit_node\">\n");
        wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
@@ -106,13 +106,13 @@ void display_edit_node(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("Edit node configuration for "));
        escputs(node);
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        serv_puts("CONF getsys|application/x-citadel-ignet-config");
        serv_getln(buf, sizeof buf);
@@ -173,12 +173,12 @@ void display_netconf(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("Network configuration"));
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<CENTER>");
        wprintf("<a href=\"display_add_node\">");
@@ -226,12 +226,12 @@ void display_confirm_delete_node(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("Confirm delete"));
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\" >\n");
 
        strcpy(node, bstr("node"));
        wprintf("<CENTER>");

diff --git a/webcit/paging.c b/webcit/paging.c
index 1e6a9e394ce3f3068fce6d8fad6ba79cde9cc639..e58160733dfa2cd1db4393addc500b3fac18666a 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -18,15 +18,14 @@ void display_page(void)
        strcpy(recp, bstr("recp"));
 
         output_headers(1, 1, 2, 0, 0, 0);
-        wprintf("<div id=\"banner\">\n"
-                "<TABLE class=\"paging_banner\"><TR><TD>"
-                "<SPAN CLASS=\"titlebar\">");
+        wprintf("<div id=\"banner\">\n");
+        wprintf("<h1>");
        wprintf(_("Send instant message"));
-       wprintf("</SPAN>"
-                "</TD></TR></TABLE>\n"
-                "</div>\n<div id=\"content\">\n"
-        );
-                                                                                                                             
+       wprintf("</h1>");
+        wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
+
         wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table class=\"paging_background\"><tr><td>\n");
 

diff --git a/webcit/preferences.c b/webcit/preferences.c
index b60d36dc8d11018348ac2845931c11fc3961ed5d..079fd6a7a8be2875c4417eb2881502bb72c58d89 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -199,15 +199,16 @@ void display_preferences(void)
        int i;
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE class=\"preferences_banner\"><TR><TD>");
-       wprintf("<img src=\"static/advanpage2_48x.gif\" ALT=\" \" ALIGN=MIDDLE>");
-       wprintf("<SPAN CLASS=\"titlebar\">&nbsp;");
+       wprintf("<img src=\"static/advanpage2_48x.gif\">");
+       wprintf("<h1>");
        wprintf(_("Preferences and settings"));
-       wprintf("</SPAN></TD><TD ALIGN=RIGHT>");
+       wprintf("</h1>");
+       wprintf("<ul><li>");
        offer_start_page();
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n"
-               "<div id=\"content\">\n");
+       wprintf("</li></ul>\n");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table class=\"preferences_background\"><tr><td>\n");

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 1efc8149ff3ed8eb37a78560cb4ef24032f0b896..0c5b3c3b56178e94b513521de6be0326896c368d 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -2053,14 +2053,13 @@ void display_entroom(void)
        }
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE class=\"roomops_banner\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        wprintf(_("Create a new room"));
-       wprintf("</SPAN>"
-               "</TD></TR></TABLE>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>");
+       wprintf("</div>");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table class=\"roomops_background\"><tr><td>\n");
@@ -2267,14 +2266,13 @@ void entroom(void)
 void display_private(char *rname, int req_pass)
 {
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE class=\"roomops_banner\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        wprintf(_("Go to a hidden room"));
-       wprintf("</SPAN>"
-               "</TD></TR></TABLE>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table class=\"roomops_background\"><tr><td>\n");
@@ -2361,12 +2359,12 @@ void display_zap(void)
        output_headers(1, 1, 2, 0, 0, 0);
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE class=\"roomops_zap\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("Zap (forget/unsubscribe) the current room"));
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>\n");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf(_("If you select this option, <em>%s</em> will "
                "disappear from your room list.  Is this what you wish "
@@ -3122,10 +3120,8 @@ void knrooms(void)
        }
 
        /** title bar */
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE class=\"roomops_banner\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">"
-       );
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        if (!strcasecmp(listviewpref, "rooms")) {
                wprintf(_("Room list"));
        }
@@ -3135,32 +3131,32 @@ void knrooms(void)
        if (!strcasecmp(listviewpref, "table")) {
                wprintf(_("Room list"));
        }
-       wprintf("</SPAN></TD>\n");
+       wprintf("</h1>\n");
 
        /** offer the ability to switch views */
-       wprintf("<TD ALIGN=RIGHT><FORM NAME=\"roomlistomatic\">\n"
-               "<SELECT NAME=\"newview\" SIZE=\"1\" "
+       wprintf("<form name=\"roomlistomatic\">\n"
+               "<select name=\"newview\" size=\"1\" "
                "OnChange=\"location.href=roomlistomatic.newview.options"
                "[selectedIndex].value\">\n");
 
-       wprintf("<OPTION %s VALUE=\"knrooms&view=rooms\">"
+       wprintf("<option %s value=\"knrooms&view=rooms\">"
                "View as room list"
-               "</OPTION>\n",
+               "</option>\n",
                ( !strcasecmp(listviewpref, "rooms") ? "SELECTED" : "" )
        );
 
-       wprintf("<OPTION %s VALUE=\"knrooms&view=folders\">"
+       wprintf("<option %s value=\"knrooms&view=folders\">"
                "View as folder list"
-               "</OPTION>\n",
+               "</option>\n",
                ( !strcasecmp(listviewpref, "folders") ? "SELECTED" : "" )
        );
 
-       wprintf("</SELECT><br />");
+       wprintf("</select>");
+       wprintf("</form>");
        offer_start_page();
-       wprintf("</FORM></TD></TR></TABLE>\n");
-       wprintf("</div>\n"
-               "</div>\n"
-               "<div id=\"content\">\n");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        /** Display the room list in the user's preferred format */
        list_all_rooms_by_floor(listviewpref);

diff --git a/webcit/setup_wizard.c b/webcit/setup_wizard.c
index 886046759519bfc5d04cd7c53033b068ed1189f2..a6beb9a0cbca6fa1ec8a792e06a4a4c8ea4d2034 100644 (file)
--- a/webcit/setup_wizard.c
+++ b/webcit/setup_wizard.c
@@ -29,13 +29,11 @@ void do_setup_wizard(void)
        output_headers(1, 1, 2, 0, 0, 0);
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE class=\"setup_banner\"><TR><TD>");
-       wprintf("<img src=\"static/citadel-logo.gif\" WIDTH=64 HEIGHT=64 ALT=\" \" ALIGN=MIDDLE>");
-       wprintf("<SPAN CLASS=\"titlebar\">&nbsp;First time setup");
-       wprintf("</SPAN></TD><TD ALIGN=RIGHT>");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n"
-               "<div id=\"content\">\n");
+       wprintf("<img src=\"static/citadel-logo.gif\" WIDTH=64 HEIGHT=64");
+       wprintf("<h1>&nbsp;First time setup</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<form method=\"post\" action=\"setup_wizard\">\n"

diff --git a/webcit/sieve.c b/webcit/sieve.c
index 9c81a861e3ed02ded1c5689f27968f879789ea5d..3110acd7cb2d20ce3d3034ed294fcd043c55583f 100644 (file)
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -73,13 +73,13 @@ void display_sieve(void)
        );
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE class=\"sieve_banner\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">"
-               "<img src=\"static/advanpage2_48x.gif\">");
+       wprintf("<img src=\"static/advanpage2_48x.gif\">");
+       wprintf("<h1>");
        wprintf(_("View/edit server-side mail filters"));
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>\n");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table class=\"sieve_background\">"
@@ -609,14 +609,12 @@ void display_add_remove_scripts(char *message)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<table class=\"sieve_banner\"><tr>"
-               "<td>"
-               "<span class=\"titlebar\">"
-               "<img src=\"static/advanpage2_48x.gif\">");
+       wprintf("<img src=\"static/advanpage2_48x.gif\">");
        wprintf(_("Add or delete scripts"));
-       wprintf("</span></td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>\n");
+       wprintf("</div>\n");
+       
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        if (message != NULL) wprintf(message);
 

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 61593d39174c71c99c8bfc514441120a6455ff36..55d945e2443a6a38abe3a985f52769253de4a272 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -33,14 +33,13 @@ void display_siteconfig(void)
        int mboxvalue = 0;
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<table class=\"siteconfig_banner\"><tr><td>"
-               "<span class=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        wprintf(_("Site configuration"));
-       wprintf("</span>"
-               "</td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("</div id=\"content\" class=\"service\">\n");
 
        serv_printf("CONF get");
        serv_getln(buf, sizeof buf);

diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index b7d6011b20201cdb45619a7b5858fd7b1ae989e8..8083bf90bcd7d48c5cc3c3415059770ec6a912b0 100644 (file)
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -227,12 +227,12 @@ void display_smtpqueue(void)
        );
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE class=\"smtpqueue_banner\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("View the outbound SMTP queue"));
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>\n");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table class=\"smtpqueue_background\">"

diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 311202e2559cebc3f59abe0285e06900203f579b..6a0f7bff581e16deffe85fe181c1c71fa5e6bdc7 100644 (file)
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -71,12 +71,12 @@ body {
        background: #445;
 }
 
-#banner .room_banner, #banner .service {
+#banner .room_banner {
         float: left;
         width: 48%;
 }
 
-.room_banner img,  .service img {
+#banner img {
         float: left;
         margin-top: 0;
         margin-left: 0;
@@ -84,7 +84,7 @@ body {
         margin-right: 5px;
 }
 
-.room_banner h1 {
+#banner h1 {
         font-size: 14pt;
         font-weight: bold;
         color: #FFFFEE;
@@ -92,15 +92,7 @@ body {
         padding: 2px;
 }
 
-.service h1 {
-        font-size: 12pt;
-        font-weight: bold;
-        color: #FFFFEE;
-        margin: 0;
-        padding: 2px;
-}
-
-.service h2 {
+#banner h2 {
         font-size: 11pt;
         font-weight: bold;
         color: #FFFFEE;
@@ -207,6 +199,7 @@ li.start_page {
 }
 
 #navbar ul li img {
+        float: none;
        margin-top: 0;
        margin-right: 2px;
        margin-bottom:0 ;
@@ -621,18 +614,6 @@ ul.adminitems span {
        background-color: #DDDDCC;
 }
 
-.room_banner_room_name {
-}
-
-.room_banner_room_info {
-}
-
-.room_banner_new_messages {
-}
-
-.room_banner_start_page {
-}
-
 .view_name, .search_name, .selectbox, .inputbox {
        font-size: 7pt;
        background: #444455; 
@@ -1527,25 +1508,6 @@ div.auto_complete ul strong.highlight {
         background-color: #ffffff;
 }
 
-.auth_banner, .event_banner, .floors_banner, .calendar_banner, .graphics_banner, .inetconf_banner, .listsub_banner {
-        border: 0;
-        width: 100%;
-        background-color: #444455;
-}
-
-.netconf_banner, .paging_banner, .preferences_banner, .roomops_banner, .setup_banner, .sieve_banner, .siteconfig_banner {
-        border: 0;
-        width: 100%;
-        background-color: #444455;
-}
-
-.smtpqueue_banner, .useredit_banner, .userlist_banner, .downloads_banner, .vcard_edit_banner, .who_banner, .room_banner   {
-        border: 0;
-        width: 100%;
-        background-color: #444455;
-}
-
-
 .vcard_edit_background_alt, .roomops_background_alt {
         border: 0;
         width: 100%;

diff --git a/webcit/summary.c b/webcit/summary.c
index c2df827a3fe33f9379e990d72f05187eb7bbe707..14edade6aba1f1237242552f13b8f1dd2f4094fe 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -309,12 +309,12 @@ void summary(void) {
        char title[256];
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\" class=\"service\">\n");
+       wprintf("<div id=\"banner\">\n");
         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>");
         wprintf("<ul><li class=\"start_page\">");
@@ -327,7 +327,7 @@ 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");
 

diff --git a/webcit/useredit.c b/webcit/useredit.c
index a69787c07e5fcd2070dba2842327303d44b10495..16f4c48f72c5324a028c70ad83677e67be428786 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -24,14 +24,13 @@ void select_user_to_edit(char *message, char *preselect)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<table class=\"useredit_banner\"><tr>"
-               "<td>"
-               "<span class=\"titlebar\">"
-               "<img src=\"static/usermanag_48x.gif\">");
+       wprintf("<img src=\"static/usermanag_48x.gif\">");
+        wprintf("<h1>");
        wprintf(_("Edit or delete users"));
-       wprintf("</span></td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+        wprintf("</h1>");
+        wprintf("</div>");
+
+        wprintf("<div id=\"content\" class=\"service\">\n");
 
        if (message != NULL) wprintf(message);
 
@@ -280,12 +279,13 @@ void display_edituser(char *supplied_username, int is_new) {
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<table class=\"useredit_banner\"><tr><td>");
-       wprintf("<span class=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("Edit user account: "));
        escputs(username);
-       wprintf("</span></td></tr></table>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+        wprintf("</h1>");
+        wprintf("</div>");
+
+        wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table class=\"useredit_background\"><tr><td>\n");

diff --git a/webcit/userlist.c b/webcit/userlist.c
index 38539c0e1a6ed5b11b51f574fa487831a3d7e02d..20450d9281d7a7b8309c669d3b6f7cccea1e9ddf 100644 (file)
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -42,15 +42,14 @@ void userlist(void)
                        bio = bptr;
                }
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<table class=\"userlist_banner\"><tr><td>"
-               "<span class=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        snprintf(title, sizeof title, _("User list for %s"), serv_info.serv_humannode);
        escputs(title);
-       wprintf("</span>"
-               "</td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>");
+        wprintf("</div>");
+
+        wprintf("<div id=\"content\" class=\"service\">\n");
 
        serv_puts("LIST");
        serv_getln(buf, sizeof buf);
@@ -122,15 +121,14 @@ void showuser(void)
        strcpy(who, bstr("who"));
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<table class=\"userlist_banner\"><tr>"
-               "<td><img src=\"static/usermanag_48x.gif\"></td>"
-               "<td align=left><span class=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<img src=\"static/usermanag_48x.gif\">");
+        wprintf("<h1>");
        wprintf(_("User profile"));
-       wprintf("</span>"
-               "</td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+        wprintf("</h1>");
+        wprintf("</div>");
+
+        wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table class=\"userlist_background\"><tr><td>\n");

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 24a0c14e33b32ad66a8c96ff8a80859d9d2ce2a4..4f6183dc570775b37d05cec92022d16092f07a59 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -175,15 +175,13 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 
        /** Display the form */
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<table class=\"vcard_edit_banner\"><tr><td>"
-               "<span class=\"titlebar\">"
-               "<img src=\"static/savecontact_48x.gif\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<img src=\"static/savecontact_48x.gif\">");
+       wprintf("<h1>");
        wprintf(_("Edit contact information"));
-       wprintf("</span>"
-               "</td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>");
+       wprintf("</div>\n");
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<form method=\"POST\" action=\"submit_vcard\">\n");
        wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);

diff --git a/webcit/who.c b/webcit/who.c
index f5de0ddf32a0f0302ac571a8fa9c420550e53120..959abc9629af7f57720fa071a80c8b24c78c731d 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -143,21 +143,17 @@ void who(void)
        );
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<table class=\"who_banner\"><tr><td>");
-       wprintf("<img src=\"static/usermanag_48x.gif\" alt=\" \" "
-               "align=middle "
-               ">");
-       wprintf("<span class=\"titlebar\"> ");
-
+       wprintf("<img src=\"static/usermanag_48x.gif\">");
+       wprintf("<h1>");
        snprintf(title, sizeof title, _("Users currently on %s"), serv_info.serv_humannode);
        escputs(title);
-
-       wprintf("</span></td><td align=right>");
+       wprintf("</h1>");
+        wprintf("<ul><li class=\"start_page\">");
        offer_start_page();
-       wprintf("</td></tr></table>\n");
-       wprintf("</div>\n");
+       wprintf("</li></ul>");
+       wprintf("</div>");
 
-       wprintf("<div id=\"content\" class=\"who_is_online\">\n");
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div style=\"display:inline\" id=\"fix_scrollbar_bug\">");
        who_inner_div();