* Merged Thierry's CSS changes

* Don't create 'local' anymore ... create 'static.local'

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 5d1661e1a5cf57cc22da34f7e8018ece2e57e203..73afa4ef32159e5ef86a002dc3c0d66e2d10309b 100644 (file)
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -102,6 +102,7 @@ install-setupbin: install-bin
 
 
 install-wwwdata:
+       test -d $(DESTDIR)$(WWWDIR)/static.local || mkdir -p $(DESTDIR)$(WWWDIR)/static.local
        test -d $(DESTDIR)$(WWWDIR)/static || mkdir -p $(DESTDIR)$(WWWDIR)/static
        for i in `find static -type f | grep -v .svn`; do \
                $(INSTALL) $$i $(DESTDIR)$(WWWDIR)/$$i; \
@@ -120,7 +121,6 @@ install-tinymce:
        done
 
 install-locale:
-       test -d $(DESTDIR)$(LOCALEDIR)/local || mkdir -p $(DESTDIR)$(LOCALEDIR)/local
        for i in `find locale -type d | grep -v .svn` \
                ; do \
                test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \

diff --git a/webcit/auth.c b/webcit/auth.c
index d928b80221e321663e773be78cad3f50e03765ee..474f65d3703296fc12d43604263d1fd0c90c10ae 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -329,7 +329,7 @@ void validate(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"auth_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Validate new users"));
        wprintf("</SPAN></TD></TR></TABLE>\n</div>\n<div id=\"content\">\n");
@@ -363,7 +363,7 @@ void validate(void)
        }
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"auth_validate\"><tr><td>\n");
        wprintf("<center>");
 
        safestrncpy(user, &buf[4], sizeof user);
@@ -461,7 +461,7 @@ void display_changepw(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"auth_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Change your password"));
        wprintf("</SPAN>"
@@ -478,7 +478,7 @@ void display_changepw(void)
        }
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"auth_validate\"><tr><td>\n");
 
        wprintf("<CENTER><br />");
        serv_puts("MESG changepw");

diff --git a/webcit/calendar.c b/webcit/calendar.c
index 5353dfa67d8f11f7cc9502ff53b0239de196cdb5..d705046d2e30a877e26761fc339fe1b15052fe25 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -356,7 +356,7 @@ void respond_to_request(void) {
        output_headers(1, 1, 2, 0, 0, 0);
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+       wprintf("<TABLE class=\"calendar_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Respond to meeting request"));
        wprintf("</SPAN>"
@@ -417,7 +417,7 @@ void handle_rsvp(void) {
        output_headers(1, 1, 2, 0, 0, 0);
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+       wprintf("<TABLE class=\"calendar_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Update your calendar with this RSVP"));
        wprintf("</SPAN>"
@@ -538,7 +538,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR>"
+               "<TABLE class=\"calendar_banner\"><TR>"
                "<TD><img src=\"static/taskmanag_48x.gif\"></TD>"
                "<td><SPAN CLASS=\"titlebar\">");
        wprintf(_("Edit task"));
@@ -548,7 +548,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        );
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
+               "<table class=\"calendar_background\"><tr><td>");
        
        wprintf("<FORM METHOD=\"POST\" action=\"save_task\">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 6aea0e0d99387b8f0fb9e1093b9459ac957c21a4..a783a45bd14533b5f149abb6066d3415d4ea7805 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -1011,7 +1011,7 @@ void do_tasks_view(void) {
        icalproperty *p;
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 cellspacing=0 width=100%% bgcolor=\"#FFFFFF\">\n<tr>\n"
+               "<table class=\"calendar_view_background\">\n<tr>\n"
                "<th>");
        wprintf(_("Name of task"));
        wprintf("</th><th>");

diff --git a/webcit/event.c b/webcit/event.c
index af670ff5906bc7753c61bd7cb24d5f3f0512d336..af9ebe893149a611db52565dbda9e4d007625fbf 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -71,7 +71,7 @@ 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 WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"event_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Add or edit an event"));
        wprintf("</SPAN>"
@@ -109,7 +109,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table  class=\"event_background\"><tr><td>\n");
 
        /************************************************************
         * Uncomment this to see the UID in calendar events for debugging

diff --git a/webcit/floors.c b/webcit/floors.c
index d9192854094877b0aca6e8ecd574c18dca43ad43..bc92b445519abf7c3341b338281866e136325a5f 100644 (file)
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -29,7 +29,7 @@ void display_floorconfig(char *prepend_html)
 
         output_headers(1, 1, 2, 0, 0, 0);
         wprintf("<div id=\"banner\">\n"
-                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+                "<TABLE class=\"floors_banner\"><TR><TD>"
                 "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Add/change/delete floors"));
        wprintf("</SPAN>"
@@ -46,7 +46,7 @@ void display_floorconfig(char *prepend_html)
        serv_printf("LFLR");
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
-               wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+               wprintf("<TABLE  class=\"floors_config\"><TR><TD>");
                wprintf("<SPAN CLASS=\"titlebar\">");
                wprintf(_("Error"));
                wprintf("</SPAN>\n");

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 00f256b98e3ccec7a51ada71444b584fb2cdb770..90333ecd328f8bd53508f401ddafa3fb32d03e1f 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -22,7 +22,7 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"graphics_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Image upload"));
        wprintf("</SPAN>"
@@ -31,7 +31,7 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
        );
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"graphics_background\"><tr><td>\n");
 
        wprintf("<CENTER>\n");
 

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 75b32a04689cc50999cd09ea0c50d809c192480a..d0382c79e29648c6199eb3042b239bdf74295347 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -476,7 +476,7 @@ void display_customize_iconbar(void) {
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"iconbar_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Customize the icon bar"));
        wprintf("</SPAN>"
@@ -485,7 +485,7 @@ void display_customize_iconbar(void) {
        );
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
+               "<table class=\"iconbar_background\"><tr><td>");
 
        wprintf("<FORM METHOD=\"POST\" action=\"commit_iconbar\">\n");
 

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index bee9bc2a82d2e19ebd6e963a5dd47bc0c2ee9a80..7ec1fc42f607161ef4cce9aadcdc6aeb0cca428d 100644 (file)
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -90,7 +90,7 @@ void display_inetconf(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"inetconf_banner\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Internet configuration"));
        wprintf("</SPAN>\n");

diff --git a/webcit/listsub.c b/webcit/listsub.c
index 3f7e9cf53eaef0c1175b0f936e6d90f8ae11fb8f..4afb35ebc68d533aae008d887c2a4c7b087a7f6a 100644 (file)
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -51,7 +51,7 @@ void do_listsub(void)
        strcpy(subtype, bstr("subtype"));
 
        wprintf("<CENTER>"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"listsub_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("List subscribe/unsubscribe"));
        wprintf("</SPAN></TD></TR></TABLE><br />\n");

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 99b29648a567938cc1dcea0fe9e30163b7446c6d..556af35c6bf80560e36f46b13fa9f58d3d910afc 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -200,7 +200,7 @@ void display_aide_menu(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"mainmenu_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("System Administration Menu"));
        wprintf("</SPAN>"
@@ -278,7 +278,7 @@ void display_generic(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"mainmenu_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Enter a server command"));
        wprintf("</SPAN></TD></TR></TABLE>\n"
@@ -286,7 +286,7 @@ void display_generic(void)
        );
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"mainmenu_background\"><tr><td>\n");
 
        wprintf("<CENTER>");
        wprintf(_("This screen allows you to enter Citadel server commands which are "

diff --git a/webcit/messages.c b/webcit/messages.c
index c212cb461c5a5a58789090a33eff3f655c95b433..9e05d552d03a1d2d606ad32ba43519e5faf9b4fa 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -966,7 +966,7 @@ void read_message(long msgnum, int printable_view, char *section) {
        wprintf("</tr></table>\n");
 
        /** Begin body */
-       wprintf("<table border=0 width=100%% bgcolor=\"#FFFFFF\" "
+       wprintf("<table class=\"messages_background\" "
                "cellpadding=1 cellspacing=0><tr><td>");
 
        /**
@@ -2836,7 +2836,7 @@ void display_enter(void)
        wprintf("</div>\n");
        wprintf("<div id=\"content\">\n"
                "<div class=\"fix_scrollbar_bug\">"
-               "<table width=100%% border=0 bgcolor=\"#ffffff\"><tr><td>");
+               "<table class=\"messages_background\"><tr><td>");
 
        /** Now check our actual recipients if there are any */
        if (recipient_required) {

diff --git a/webcit/netconf.c b/webcit/netconf.c
index f3802961a5db6f20d661ea31e279e890f41069fe..e4e01f27b02fe5c76235c35b754a2e2f8286b2c5 100644 (file)
--- a/webcit/netconf.c
+++ b/webcit/netconf.c
@@ -63,7 +63,7 @@ void display_add_node(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Add a new node"));
        wprintf("</SPAN>");
@@ -105,7 +105,7 @@ void display_edit_node(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Edit node configuration for "));
        escputs(node);
@@ -171,7 +171,7 @@ void display_netconf(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Network configuration"));
        wprintf("</SPAN>\n");
@@ -184,7 +184,7 @@ void display_netconf(void)
        wprintf("</A><br />\n");
        wprintf("</CENTER>");
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Currently configured nodes"));
        wprintf("</SPAN>\n");
@@ -224,7 +224,7 @@ void display_confirm_delete_node(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Confirm delete"));
        wprintf("</SPAN>\n");

diff --git a/webcit/paging.c b/webcit/paging.c
index 1bc28e4883a65e2de830516dd0661dd1d2cdc892..b05378db7118dd98d6f5829b559fe215bcf5547d 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -19,7 +19,7 @@ void display_page(void)
 
         output_headers(1, 1, 2, 0, 0, 0);
         wprintf("<div id=\"banner\">\n"
-                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+                "<TABLE class=\"paging_banner\"><TR><TD>"
                 "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Send instant message"));
        wprintf("</SPAN>"
@@ -28,7 +28,7 @@ void display_page(void)
         );
                                                                                                                              
         wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"paging_background\"><tr><td>\n");
 
        wprintf(_("Send an instant message to: "));
        escputs(recp);

diff --git a/webcit/preferences.c b/webcit/preferences.c
index 987b2ac2c625857add7b921a9369baa2d602eabd..2c761b05c358c32fa685bb976d671b7858f2ce5e 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -199,7 +199,7 @@ void display_preferences(void)
        int i;
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"preferences_banner\"><TR><TD>");
        wprintf("<img src=\"static/advanpage2_48x.gif\" ALT=\" \" ALIGN=MIDDLE>");
        wprintf("<SPAN CLASS=\"titlebar\">&nbsp;");
        wprintf(_("Preferences and settings"));
@@ -210,7 +210,7 @@ void display_preferences(void)
                "<div id=\"content\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"preferences_background\"><tr><td>\n");
 
        /** begin form */
        wprintf("<center>\n"

diff --git a/webcit/roomops.c b/webcit/roomops.c
index f191a1b5a9f7f2e42d55243fe6d43ea14ba6e82d..b79351d52e852178036527d1f250e5a0b830cc4a 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1010,10 +1010,10 @@ void display_editroom(void)
                "<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "admin")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=admin\">");
+               wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=admin\">");
        }
        wprintf(_("Administration"));
        if (!strcmp(tab, "admin")) {
@@ -1026,10 +1026,10 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "config")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=config\">");
+               wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=config\">");
        }
        wprintf(_("Configuration"));
        if (!strcmp(tab, "config")) {
@@ -1042,10 +1042,10 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "expire")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=expire\">");
+               wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=expire\">");
        }
        wprintf(_("Message expire policy"));
        if (!strcmp(tab, "expire")) {
@@ -1058,10 +1058,10 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "access")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=access\">");
+               wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=access\">");
        }
        wprintf(_("Access controls"));
        if (!strcmp(tab, "access")) {
@@ -1074,10 +1074,10 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "sharing")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=sharing\">");
+               wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=sharing\">");
        }
        wprintf(_("Sharing"));
        if (!strcmp(tab, "sharing")) {
@@ -1090,10 +1090,10 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "listserv")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=listserv\">");
+               wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=listserv\">");
        }
        wprintf(_("Mailing list service"));
        if (!strcmp(tab, "listserv")) {
@@ -1110,7 +1110,7 @@ void display_editroom(void)
 
        /** begin content of whatever tab is open now */
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<TABLE border=0 width=100%% bgcolor=\"#FFFFFF\">\n"
+               "<TABLE class=\"roomops_background\">\n"
                "<TR><TD>\n");
 
        if (!strcmp(tab, "admin")) {
@@ -1360,7 +1360,7 @@ void display_editroom(void)
                wprintf("</I></B></TD></TR>\n"
                        "<TR><TD VALIGN=TOP>\n");
 
-               wprintf("<TABLE border=0 cellpadding=5><TR BGCOLOR=\"#CCCCCC\"><TD>");
+               wprintf("<TABLE border=0 cellpadding=5><TR class=\"roomops_cell\"><TD>");
                wprintf(_("Remote node name"));
                wprintf("</TD><TD>");
                wprintf(_("Remote room name"));
@@ -1405,7 +1405,7 @@ void display_editroom(void)
 
                wprintf("</TABLE>\n");
                wprintf("</TD><TD VALIGN=TOP>\n");
-               wprintf("<TABLE border=0 cellpadding=5><TR BGCOLOR=\"#CCCCCC\"><TD>");
+               wprintf("<TABLE border=0 cellpadding=5><TR class=\"roomops_cell\"><TD>");
                wprintf(_("Remote node name"));
                wprintf("</TD><TD>");
                wprintf(_("Remote room name"));
@@ -1953,7 +1953,7 @@ void display_entroom(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"roomops_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Create a new room"));
        wprintf("</SPAN>"
@@ -1962,7 +1962,7 @@ void display_entroom(void)
        );
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"roomops_background\"><tr><td>\n");
 
        wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
 
@@ -2166,7 +2166,7 @@ void display_private(char *rname, int req_pass)
 {
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"roomops_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Go to a hidden room"));
        wprintf("</SPAN>"
@@ -2258,7 +2258,7 @@ void display_zap(void)
        output_headers(1, 1, 2, 0, 0, 0);
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<TABLE class=\"roomops_zap\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Zap (forget/unsubscribe) the current room"));
        wprintf("</SPAN>\n");
@@ -2996,7 +2996,7 @@ void knrooms(void)
 
        /** title bar */
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"roomops_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">"
        );
        if (!strcasecmp(listviewpref, "rooms")) {

diff --git a/webcit/setup_wizard.c b/webcit/setup_wizard.c
index bc2b2277a722261bdff60371e6dd13eb7fbfd921..76c7ed8e29f06d0966896b430bc8bf0ad2129ca2 100644 (file)
--- a/webcit/setup_wizard.c
+++ b/webcit/setup_wizard.c
@@ -29,7 +29,7 @@ void do_setup_wizard(void)
        output_headers(1, 1, 2, 0, 0, 0);
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       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>");

diff --git a/webcit/sieve.c b/webcit/sieve.c
index d0f2752797906bc4f53473abd1c27ea0d137f42b..e4c97d1d85db65f6892849d5b23609e9b2c39ba9 100644 (file)
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -73,7 +73,7 @@ void display_sieve(void)
        );
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"sieve_banner\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">"
                "<img src=\"static/advanpage2_48x.gif\">");
        wprintf(_("View/edit server-side mail filters"));
@@ -82,7 +82,7 @@ void display_sieve(void)
        wprintf("</div>\n<div id=\"content\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#FFFFFF\">"
+               "<table class=\"sieve_background\">"
                "<tr><td valign=top>\n");
 
 
@@ -592,7 +592,7 @@ void display_add_remove_scripts(char *message)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<table width=100%% border=0 bgcolor=#444455><tr>"
+       wprintf("<table class=\"sieve_banner\"><tr>"
                "<td>"
                "<span class=\"titlebar\">"
                "<img src=\"static/advanpage2_48x.gif\">");

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index ceb48d1f73d6f097fb949472a944267db00a9c64..c60e56fff0b2e98b52d406fc2afe079dd0dcff7b 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -34,7 +34,7 @@ void display_siteconfig(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>"
+               "<table class=\"siteconfig_banner\"><tr><td>"
                "<span class=\"titlebar\">");
        wprintf(_("Site configuration"));
        wprintf("</span>"
@@ -45,7 +45,7 @@ void display_siteconfig(void)
        serv_printf("CONF get");
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
-               wprintf("<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>");
+               wprintf("<table class=\"siteconfig_banner\"><tr><td>");
                wprintf("<span class=\"titlebar\">");
                wprintf(_("Error"));
                wprintf("</span>\n");
@@ -56,7 +56,7 @@ void display_siteconfig(void)
        }
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
+               "<table class=\"siteconfig_background\"><tr><td>");
 
        char *tabnames[] = {
                _("General"),

diff --git a/webcit/smtpqueue.c b/webcit/smtpqueue.c
index b226b986f3fe278e506937a96957a653bc4f76e2..d51ec4d78c67940ab1fc4a5f44b59eea97d1f237 100644 (file)
--- a/webcit/smtpqueue.c
+++ b/webcit/smtpqueue.c
@@ -225,7 +225,7 @@ void display_smtpqueue(void)
        );
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"smtpqueue_banner\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("View the outbound SMTP queue"));
        wprintf("</SPAN>\n");
@@ -233,7 +233,7 @@ void display_smtpqueue(void)
        wprintf("</div>\n<div id=\"content\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#FFFFFF\">"
+               "<table class=\"smtpqueue_background\">"
                "<tr><td valign=top>\n");
 
        wprintf("<div id=\"smtpqueue_inner_div\">");

diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 29d710813a289f3bc3b6f6688de2a8cfff4b0dc1..099e935c374051760d69a9a1787930ff43697ee7 100644 (file)
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -568,3 +568,38 @@ div.auto_complete ul strong.highlight {
 }
 
 
+.floors_config, .roomops_zap {
+        border: 0;
+        background-color: #770000;
+        width: 100%;
+}
+
+.roomops_cell_label {
+        background-color: #FFFFFF;
+}
+
+.roomops_cell, .roomops_cell_edit {
+        background-color: #CCCCCC;
+}
+
+.auth_validate, .event_background, .calendar_background, .calendar_view_background, .graphics_background, .iconbar_background, .mainmenu_b
+ackground, .messages_background, .paging_background, .preferences_background, .roomops_background, .sieve_background, .siteconfig_backgrou
+nd, .smtpqueue_background, .tabs_background, .useredit_background, .userlist_background, .vcard_edit_background, .who_background   {
+        border: 0;
+        width: 100%;
+        background-color: #ffffff;
+}
+
+.auth_banner, .event_banner, .floors_banner, .calendar_banner, .graphics_banner, .iconbar_banner, .inetconf_banner, .listsub_banner, .mainmenu_banner, .netconf_banner, .paging_banner, .preferences_banner, .roomops_banner, .setup_banner, .sieve_banner, .siteconfig_banner, .smtpqueue_banner, .summary_banner, .useredit_banner, .userlist_banner, .vcard_edit_banner, .who_banner   {
+        border: 0;
+        width: 100%;
+        background-color: #444455;
+}
+
+
+.vcard_edit_background_alt {
+        border: 0;
+        width: 100%;
+        background-color: #dddddd;
+}
+

diff --git a/webcit/summary.c b/webcit/summary.c
index 3d994038960259914d4eadca5adeb60d8d43cdff..13dfdf70abca7e2bc4d2bda46677ca73bed42747 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -251,7 +251,7 @@ void summary(void) {
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<table width=100%% border=0 bgcolor=#444455><tr>"
+       wprintf("<table class=\"summary_banner\"><tr>"
                "<td><img src=\"static/summscreen_48x.gif\"></td><td>"
                "<span class=\"titlebar\">"
        );

diff --git a/webcit/tabs.c b/webcit/tabs.c
index 9c00bc99d20d245b0a869d83dc04b48645960579..f0c72b06911e5a77305f7538187b3f79507d6599 100644 (file)
--- a/webcit/tabs.c
+++ b/webcit/tabs.c
@@ -52,7 +52,7 @@ void tabbed_dialog(int num_tabs, char *tabnames[]) {
        }
 
        wprintf("</tr></table>\n");
-       wprintf("<table border=\"0\" width=\"100%%\" bgcolor=\"#ffffff\"><tr><td>");
+       wprintf("<table class=\"tabs_background\"><tr><td>");
 }
 
 /**

diff --git a/webcit/useredit.c b/webcit/useredit.c
index 265f9158792467ba1add965fb165f13269b1fbc1..585a954db833cb8a29740f9323c8ae1104a89422 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -24,7 +24,7 @@ void select_user_to_edit(char *message, char *preselect)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<table width=100%% border=0 bgcolor=#444455><tr>"
+       wprintf("<table class=\"useredit_banner\"><tr>"
                "<td>"
                "<span class=\"titlebar\">"
                "<img src=\"static/usermanag_48x.gif\">");
@@ -278,7 +278,7 @@ void display_edituser(char *supplied_username, int is_new) {
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>");
+       wprintf("<table class=\"useredit_banner\"><tr><td>");
        wprintf("<span class=\"titlebar\">");
        wprintf(_("Edit user account: "));
        escputs(username);
@@ -286,7 +286,7 @@ void display_edituser(char *supplied_username, int is_new) {
        wprintf("</div>\n<div id=\"content\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"useredit_background\"><tr><td>\n");
        wprintf("<form method=\"POST\" action=\"edituser\">\n"
                "<input type=\"hidden\" name=\"username\" value=\"");
        escputs(username);

diff --git a/webcit/userlist.c b/webcit/userlist.c
index cbd6c669a69589ec20e163c2316b2b6b8c362cb9..e74ab2305150772e1dda831f291b98b571398857 100644 (file)
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -43,7 +43,7 @@ void userlist(void)
                }
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>"
+               "<table class=\"userlist_banner\"><tr><td>"
                "<span class=\"titlebar\">");
        snprintf(title, sizeof title, _("User list for %s"), serv_info.serv_humannode);
        escputs(title);
@@ -60,7 +60,7 @@ void userlist(void)
        }
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"userlist_background\"><tr><td>\n");
        wprintf("<tr><th>%s</th><th>%s</th><th>%s</th>"
                        "<th>%s</th><th>%s</th><th>%s</th></tr>",
                        _("User Name"),
@@ -123,7 +123,7 @@ void showuser(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<table width=100%% border=0 bgcolor=\"#444455\"><tr>"
+               "<table class=\"userlist_banner\"><tr>"
                "<td><img src=\"static/usermanag_48x.gif\"></td>"
                "<td align=left><span class=\"titlebar\">");
        wprintf(_("User profile"));
@@ -133,7 +133,7 @@ void showuser(void)
        );
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"userlist_background\"><tr><td>\n");
 
        serv_printf("OIMG _userpic_|%s", who);
        serv_getln(buf, sizeof buf);

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index cb17968a4e56708529e19c72856147226171178d..09f5df8a70cc5b0020f4a2a618b6734e810279a8 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -176,7 +176,7 @@ 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 width=100%% border=0 bgcolor=\"#444455\"><tr><td>"
+               "<table class=\"vcard_edit_banner\"><tr><td>"
                "<span class=\"titlebar\">"
                "<img src=\"static/savecontact_48x.gif\">");
        wprintf(_("Edit contact information"));
@@ -187,7 +187,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 
        wprintf("<form method=\"POST\" action=\"submit_vcard\">\n");
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"vcard_edit_background\"><tr><td>\n");
 
        wprintf("<table border=0><tr>"
                "<td>%s</td>"
@@ -213,7 +213,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                "value=\"%s\" maxlength=\"10\" size=\"10\"></td></tr></table>\n",
                suffix);
 
-       wprintf("<table border=0 width=100%% bgcolor=\"#dddddd\">");
+       wprintf("<table  class=\"vcard_edit_background_alt\">");
        wprintf("<tr><td>");
 
        wprintf(_("Display name:"));
@@ -297,7 +297,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
                "value=\"%s\" maxlength=\"29\"></td></tr></table>\n",
                worktel);
 
-       wprintf("<table border=0 width=100%% bgcolor=\"#dddddd\">");
+       wprintf("<table class=\"vcard_edit_background_alt\">");
        wprintf("<tr><td>");
 
        wprintf("<table border=0><TR>"

diff --git a/webcit/who.c b/webcit/who.c
index e81b911e9aa52f6bcf1b09174e494731cd5cc4d2..5215e77275e9068416ee057268b44425b21788ef 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -21,7 +21,7 @@ void who_inner_div(void) {
        time_t now;
        int bg = 0;
 
-       wprintf("<table border=\"0\" cellspacing=\"0\" width=\"100%%\" bgcolor=\"#FFFFFF\">"
+       wprintf("<table class=\"who_background\">"
                "<tr>\n");
        wprintf("<th colspan=\"3\"> </th>\n");
        wprintf("<th>%s</th>\n", _("User name"));
@@ -142,7 +142,7 @@ void who(void)
        );
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>");
+       wprintf("<table class=\"who_banner\"><tr><td>");
        wprintf("<img src=\"static/usermanag_48x.gif\" alt=\" \" "
                "align=middle "
                ">");
@@ -223,7 +223,7 @@ void edit_me(void)
                output_headers(1, 1, 0, 0, 0, 0);
 
                wprintf("<div id=\"banner\">\n");
-               wprintf("<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>");
+               wprintf("<table class=\"who_banner\"><tr><td>");
                wprintf("<span class=\"titlebar\">");
                wprintf(_("Edit your session display"));
                wprintf("</span></td></tr></table>\n");