* The previous <div style=\"margin-right:1px\"> has been replaced by a

  named div in the stylesheet.  This allows us to perform a vile, sleazy
  hack to keep IE6 from exhibiting its horizontal scrollbar bug.  There
  will unfortunately always be a right margin in IE6, but there
  doesn't appear to be any easy workaround.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 8ca6db249a40a81d504011aaa1381bf0d5199a71..eefe5237f1d54656637004a1cc8e3ac4bf3b674c 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,11 @@
 $Log$
+Revision 602.6  2005/02/19 06:01:14  ajc
+* The previous <div style=\"margin-right:1px\"> has been replaced by a
+  named div in the stylesheet.  This allows us to perform a vile, sleazy
+  hack to keep IE6 from exhibiting its horizontal scrollbar bug.  There
+  will unfortunately always be a right margin in IE6, but there
+  doesn't appear to be any easy workaround.
+
 Revision 602.5  2005/02/19 05:22:00  ajc
 * Replaced all the "centered 99% tables" with 100% width tables wrapped
   inside a div with margin-right:1px to remove the horizontal scrollbar
@@ -2393,3 +2400,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+

diff --git a/webcit/auth.c b/webcit/auth.c
index 1f2a62d1b0cee1dac59d133614ee24247b2358b0..42c3c0a263d2889365e26308be1c9fa0b24575ce 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -249,7 +249,7 @@ void validate(void)
                return;
        }
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
        wprintf("<center>");
 
@@ -359,7 +359,7 @@ void display_changepw(void)
                strcpy(WC->ImportantMessage, "");
        }
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER><br />");

diff --git a/webcit/calendar.c b/webcit/calendar.c
index 5dfa23453d31cc9356a815aedea802a7f05e6162..f7e48d8bfca4b35737a9d077f6a6a6c8391e1567 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -529,7 +529,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
        
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/save_task\">\n");

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 0428d382bfca3cf8c73d08f3a2073f964b0ca169..b180909003e55fa95101070303b77e4bc36fbd7c 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -155,7 +155,7 @@ void calendar_month_view(int year, int month, int day) {
        }
 
        /* Outer table (to get the background color) */
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
                "bgcolor=#204B78><TR><TD>\n");
 
@@ -335,7 +335,7 @@ void calendar_day_view(int year, int month, int day) {
 
 
        /* Outer table (to get the background color) */
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
                "bgcolor=#204B78><TR><TD>\n");
 
@@ -614,7 +614,7 @@ void do_tasks_view(void) {
        char buf[SIZ];
        icalproperty *p;
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 cellspacing=0 width=100%% bgcolor=\"#FFFFFF\">\n<tr>\n"
                "<TH>Name of task</TH>\n"
                "<TH>Date due</TH></TR>\n"

diff --git a/webcit/event.c b/webcit/event.c
index 1de559ffb91956c213ad71e668b5b6136b8a0c38..eff197c51956186252b4b7c685e778151970d12b 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -92,7 +92,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        /************************************************************

diff --git a/webcit/floors.c b/webcit/floors.c
index e2dbcd1316c0550b35cc970b21536752a7ccd42c..a0b4edf1061cd5a6776576671e9a8e430bbf73e6 100644 (file)
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -68,7 +68,7 @@ void display_floorconfig(char *prepend_html)
                return;
        }
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<TABLE BORDER=1 WIDTH=100%% bgcolor=\"#ffffff\">\n"
                "<TR><TH>Floor number</TH>"
                "<TH>Floor name</TH>"

diff --git a/webcit/graphics.c b/webcit/graphics.c
index fdcf30ce8d533f431a5074afa7c2544c7f07180b..396f21f7e3def1b82789ca315e91d1c5321ef81f 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -46,7 +46,7 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER>\n");

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index c5601f2574cdd42ba3d1122209641a2d671c005f..4940f7710fb4f91f00de2c7398bb4baabd7dc71e 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -367,7 +367,7 @@ void display_customize_iconbar(void) {
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/commit_iconbar\">\n");

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index 091592f2fd88e5908eb02dbfbedd132db1877933..cbdf3260077c8704e1ceeff4b3ee3dd94d2eb1d6 100644 (file)
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -113,7 +113,7 @@ void display_inetconf(void)
        wprintf("</TD></TR></TABLE>\n");
        wprintf("</div>\n<div id=\"content\">\n");
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%%><tr><td valign=top>\n");
        for (which=0; which<ic_max; ++which) {
                if (which == (ic_max / 2)) {

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 6a79433f1b6bd20f91a13eac49218f05fbc33f80..fa08b32f43e4360eedfbfd9048d1ed56e7c99b13 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -35,7 +35,7 @@ void display_main_menu(void)
 {
        output_headers(1, 1, 1, 0, 0, 0, 0);
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<TABLE WIDTH=100%%>"
                "<TR><TD COLSPAN=2>\n");
 
@@ -203,7 +203,7 @@ void display_aide_menu(void)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%%><tr valign=top><td>");
 
        svprintf("BOXTITLE", WCS_STRING, "Global Configuration");
@@ -271,7 +271,7 @@ void display_generic(void)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER>");

diff --git a/webcit/messages.c b/webcit/messages.c
index 123c894602f681d00ffb3ee84d602b5e2d47e150..8a12605f7b896a10d8f257c4c3223ed2d2c45553 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -375,7 +375,7 @@ void read_message(long msgnum) {
        }
 
        /* begin everythingamundo table */
-       wprintf("<div style=\"margin-right:1px\">\n");
+       wprintf("<div id=\"fix_scrollbar_bug\">\n");
        wprintf("<table width=100%% border=1 cellspacing=0 "
                "cellpadding=0><TR><TD>\n");
 
@@ -1146,7 +1146,7 @@ void readloop(char *oper)
        wprintf("<FORM NAME=\"msgomatic\" "
                "METHOD=\"POST\" ACTION=\"/do_stuff_to_msgs\">\n");
        if (is_summary) {
-               wprintf("<div style=\"margin-right:1px\">"
+               wprintf("<div id=\"fix_scrollbar_bug\">"
                        "<table border=0 cellspacing=0 "
                        "cellpadding=0 width=100%%>\n"
                        "<TR>"
@@ -1238,7 +1238,7 @@ void readloop(char *oper)
        if (num_displayed == 1) {
           if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_notes) && (!is_singlecard)) {
 
-               wprintf("<div style=\"margin-right:1px\">"
+               wprintf("<div id=\"fix_scrollbar_bug\">"
                        "<table border=0 width=100%% bgcolor=\"#dddddd\"><tr><td>"
                        "Reading #%d of %d messages.</TD>\n"
                        "<TD ALIGN=RIGHT><FONT SIZE=+1>",
@@ -1717,7 +1717,7 @@ void confirm_move_msg(void)
 
        output_headers(1, 1, 1, 0, 0, 0, 0);
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>");
        wprintf("<font size=+1 color=\"#ffffff\"");
        wprintf("<b>Confirm move of message</b>\n");

diff --git a/webcit/paging.c b/webcit/paging.c
index 2717d174799e4cb9a7b2d523424ebb0cf600b75c..c892b7a64ed9926286d76b34962692e584450297 100644 (file)
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -44,7 +44,7 @@ void display_page(void)
                 "</div>\n<div id=\"content\">\n"
         );
                                                                                                                              
-        wprintf("<div style=\"margin-right:1px\">"
+        wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("Send an instant message to: ");

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 62b0fbb124c843c4732116c914dd111189621fa0..079e3bc8fcc3222b592768a6ff4e1216d2be3516 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -827,7 +827,7 @@ void display_editroom(void)
 
        /* print the tabbed dialog */
        wprintf("<br />"
-               "<div style=\"margin-right:1px\">"
+               "<div id=\"fix_scrollbar_bug\">"
                "<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
                "<TR ALIGN=CENTER>"
                "<TD>&nbsp;</TD>\n");
@@ -932,7 +932,7 @@ void display_editroom(void)
        /* end tabbed dialog */ 
 
        /* begin content of whatever tab is open now */
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<TABLE border=0 width=100%% bgcolor=\"#FFFFFF\">\n"
                "<TR><TD>\n");
 
@@ -1717,7 +1717,7 @@ void display_entroom(void)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/entroom\">\n");

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 3174b9d931740fbf0a60ef176ba2dd607614484a..0034b6481fe6828e000db57e43b24fff78584c7e 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -51,7 +51,7 @@ void display_siteconfig(void)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
 
        whichmenu = bstr("whichmenu");

diff --git a/webcit/static/head.html b/webcit/static/head.html
index 85a6cab0c9ca5332cf1ebca9f9967010fef50ffd..82f7aeed274a01d25ccf2fba66635ab146d3416a 100644 (file)
--- a/webcit/static/head.html
+++ b/webcit/static/head.html
@@ -95,6 +95,11 @@ body {
        /* overflow-x: hidden; */
 }
 
+#fix_scrollbar_bug {
+       margin-right:1px;               /* Gecko */
+       width: expression('97%');       /* Only IE6 understands 'expression' and it also has the weird scrollbarbug */
+}
+
 #button {
        width: 100%;
        padding: 0 0 1em 0;

diff --git a/webcit/summary.c b/webcit/summary.c
index 114902babd1a394914a80fa9f0c791397e49b53b..c9073c7da784008e9eb29d703229bb96800ab7d4 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -249,7 +249,7 @@ void summary(void) {
         * not people I consider worthwhile, I still want them to use WebCit.
         */
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%%><tr valign=top>");
 
        /*

diff --git a/webcit/useredit.c b/webcit/useredit.c
index 5439ff0f90291d774fcb79d20637b7a2ed72e2c7..60ee1881c48a21f06f4da6bf702d34815e834d24 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -291,7 +291,7 @@ void display_edituser(char *supplied_username, int is_new) {
        wprintf("</SPAN></TD></TR></TABLE>\n");
        wprintf("</div>\n<div id=\"content\">\n");
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/edituser\">\n"
                "<INPUT TYPE=\"hidden\" NAME=\"username\" VALUE=\"");

diff --git a/webcit/userlist.c b/webcit/userlist.c
index 34e75d9343159697bfa28bd380ee11abce60e201..ad828db6de242f8ad5e15a7a3a5c1ad8245cde1b 100644 (file)
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -71,7 +71,7 @@ void userlist(void)
                goto DONE;
        }
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
        wprintf("<TR><TH>User Name</TH><TH>Number</TH><TH>Access Level</TH>");
        wprintf("<TH>Last Login</TH><TH>Total Logins</TH><TH>Total Posts</TH></TR>\n");
@@ -135,7 +135,7 @@ void showuser(void)
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        serv_printf("OIMG _userpic_|%s", who);

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index f9eabc4a195f70201cb2a7323bd3454136d91ab3..d9aca9dd209e6e418ef554646e01de025bcbed41 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -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 style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<TABLE border=0><TR>"

diff --git a/webcit/who.c b/webcit/who.c
index 512d68b55df8dfe10b7a599dbf3d20d2636f8c57..d57b18504b2fdab013da5bf753f2615ee2b56c76 100644 (file)
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -61,7 +61,7 @@ void whobbs(void)
        wprintf("</div>\n"
                "<div id=\"content\">\n");
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table border=0 cellspacing=0 width=100%% bgcolor=\"#FFFFFF\">"
                "<tr>\n");
        wprintf("<TH COLSPAN=4>Session ID</TH>\n");