From f6f51307f975c67d86448d5b456f9650dc36d773 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sat, 19 Feb 2005 05:22:00 +0000 Subject: [PATCH] * Replaced all the "centered 99% tables" with 100% width tables wrapped inside a div with margin-right:1px to remove the horizontal scrollbar in Gecko without creating whitespace. IE6's problem is much more serious and will require dropping a nuclear bomb on Redmond to fix. --- webcit/ChangeLog | 7 ++++++- webcit/auth.c | 10 ++++++---- webcit/calendar.c | 5 +++-- webcit/calendar_view.c | 19 ++++++++++--------- webcit/event.c | 5 +++-- webcit/floors.c | 5 +++-- webcit/graphics.c | 5 +++-- webcit/iconbar.c | 7 ++++--- webcit/inetconf.c | 5 +++-- webcit/mainmenu.c | 15 +++++++++------ webcit/messages.c | 42 ++++++++++++++++++++++++++---------------- webcit/paging.c | 5 +++-- webcit/roomops.c | 16 ++++++++++------ webcit/siteconfig.c | 5 +++-- webcit/summary.c | 6 +++--- webcit/useredit.c | 6 +++--- webcit/userlist.c | 10 ++++++---- webcit/vcard_edit.c | 5 +++-- webcit/who.c | 9 +++++---- 19 files changed, 112 insertions(+), 75 deletions(-) diff --git a/webcit/ChangeLog b/webcit/ChangeLog index 4e9345705..8ca6db249 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,4 +1,10 @@ $Log$ +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 + in Gecko without creating whitespace. IE6's problem is much more + serious and will require dropping a nuclear bomb on Redmond to fix. + Revision 602.4 2005/02/18 05:09:52 ajc * Moved the room access control screen into a tab on the edit room menu @@ -2387,4 +2393,3 @@ Sun Dec 6 19:50:55 EST 1998 Art Cancro 1998-12-03 Nathan Bryant * webserver.c: warning fix - diff --git a/webcit/auth.c b/webcit/auth.c index 79f56ead5..1f2a62d1b 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -249,7 +249,8 @@ void validate(void) return; } - wprintf("
\n"); + wprintf("
" + "
\n"); wprintf("
"); strcpy(user, &buf[4]); @@ -295,7 +296,7 @@ void validate(void) wprintf("
\n"); wprintf("
\n"); - wprintf("
\n"); + wprintf("
\n"); wDumpContent(1); } @@ -358,7 +359,8 @@ void display_changepw(void) strcpy(WC->ImportantMessage, ""); } - wprintf("
\n"); + wprintf("
" + "
\n"); wprintf("

"); serv_puts("MESG changepw"); @@ -381,7 +383,7 @@ void display_changepw(void) " " "\n"); wprintf("
\n"); - wprintf("
\n"); + wprintf("
\n"); wDumpContent(1); } diff --git a/webcit/calendar.c b/webcit/calendar.c index 370275860..5dfa23453 100644 --- a/webcit/calendar.c +++ b/webcit/calendar.c @@ -529,7 +529,8 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { "\n
\n" ); - wprintf("
"); + wprintf("
" + "
"); wprintf("
\n"); wprintf("\n", @@ -588,7 +589,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) { wprintf("
\n"); - wprintf("
\n"); + wprintf("
\n"); wDumpContent(1); if (created_new_vtodo) { diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c index da14cde2c..0428d382b 100644 --- a/webcit/calendar_view.c +++ b/webcit/calendar_view.c @@ -155,8 +155,8 @@ void calendar_month_view(int year, int month, int day) { } /* Outer table (to get the background color) */ - wprintf("
" - "" + "
\n"); wprintf("\n"); @@ -229,7 +229,7 @@ void calendar_month_view(int year, int month, int day) { wprintf("
" /* end of inner table */ "
" /* end of outer table */ - "
\n"); + "\n"); } @@ -252,7 +252,7 @@ void calendar_day_view_display_events(int year, int month, int all_day_event = 0; if (WC->num_cal == 0) { - wprintf("


\n"); + // FIXME wprintf("


\n"); return; } @@ -335,8 +335,8 @@ void calendar_day_view(int year, int month, int day) { /* Outer table (to get the background color) */ - wprintf("
" - "" + "
\n"); /* Inner table (the real one) */ @@ -434,7 +434,7 @@ void calendar_day_view(int year, int month, int day) { wprintf("
" /* end of inner table */ - "
" /* end of outer table */ + "" /* end of outer table */ ); @@ -614,7 +614,8 @@ void do_tasks_view(void) { char buf[SIZ]; icalproperty *p; - wprintf("
\n\n" + wprintf("
" + "
\n\n" "\n" "\n" ); @@ -656,7 +657,7 @@ void do_tasks_view(void) { wprintf(">%s\n", buf); } - wprintf("
Name of taskDate due
\n"); + wprintf("\n"); /* Free the list */ free_calendar_buffer(); diff --git a/webcit/event.c b/webcit/event.c index 832bac7a4..1de559ffb 100644 --- a/webcit/event.c +++ b/webcit/event.c @@ -92,7 +92,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum) "\n
\n" ); - wprintf("
\n"); + wprintf("
" + "
\n"); /************************************************************ * Uncomment this to see the UID in calendar events for debugging @@ -401,7 +402,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum) "\n" ); - wprintf("
\n"); + wprintf("
\n"); wDumpContent(1); if (created_new_vevent) { diff --git a/webcit/floors.c b/webcit/floors.c index 31cd1c810..e2dbcd131 100644 --- a/webcit/floors.c +++ b/webcit/floors.c @@ -68,7 +68,8 @@ void display_floorconfig(char *prepend_html) return; } - wprintf("
\n" + wprintf("
" + "
\n" "" "" "\n" @@ -117,7 +118,7 @@ void display_floorconfig(char *prepend_html) "" "\n"); - wprintf("
Floor numberFloor nameNumber of rooms
 
\n"); + wprintf("\n"); wDumpContent(1); } diff --git a/webcit/graphics.c b/webcit/graphics.c index 5243e0114..fdcf30ce8 100644 --- a/webcit/graphics.c +++ b/webcit/graphics.c @@ -46,7 +46,8 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl) "\n
\n" ); - wprintf("
\n"); + wprintf("
" + "
\n"); wprintf("
\n"); @@ -71,7 +72,7 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl) wprintf("\n"); wprintf("\n"); wprintf("
\n"); - wprintf("
\n"); + wprintf("
\n"); wDumpContent(1); } diff --git a/webcit/iconbar.c b/webcit/iconbar.c index 277bc75a5..c5601f257 100644 --- a/webcit/iconbar.c +++ b/webcit/iconbar.c @@ -97,7 +97,7 @@ void do_iconbar(void) { if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf( "
  • " "" "\"CITADEL\"" "CITADEL" @@ -367,7 +367,8 @@ void display_customize_iconbar(void) { "
    \n
    \n" ); - wprintf("
    "); + wprintf("
    " + "
    "); wprintf("
    \n"); @@ -565,7 +566,7 @@ void display_customize_iconbar(void) { "
    \n" ); - wprintf("
    \n"); + wprintf("
    \n"); wDumpContent(2); } diff --git a/webcit/inetconf.c b/webcit/inetconf.c index ff2c31432..091592f2f 100644 --- a/webcit/inetconf.c +++ b/webcit/inetconf.c @@ -113,7 +113,8 @@ void display_inetconf(void) wprintf("\n"); wprintf("\n
    \n"); - wprintf("
    \n"); + wprintf("
    " + "
    \n"); for (which=0; which"); @@ -148,7 +149,7 @@ void display_inetconf(void) "
    \n"); do_template("endbox"); } - wprintf("
    \n"); + wprintf("
    \n"); wDumpContent(1); for (i=0; i" + wprintf("
    " + "
    " "
    \n"); svprintf("BOXTITLE", WCS_STRING, "Basic commands"); @@ -184,7 +185,7 @@ void display_main_menu(void) do_template("endbox"); - wprintf("
    • "); + wprintf(""); wDumpContent(2); } @@ -202,7 +203,8 @@ void display_aide_menu(void) "\n
    \n" ); - wprintf("
    "); + wprintf("
    " + "
    "); svprintf("BOXTITLE", WCS_STRING, "Global Configuration"); do_template("beginbox"); @@ -248,7 +250,7 @@ void display_aide_menu(void) do_template("endbox"); - wprintf("
    "); + wprintf("
    "); wDumpContent(2); } @@ -269,7 +271,8 @@ void display_generic(void) "\n
    \n" ); - wprintf("
    \n"); + wprintf("
    " + "
    \n"); wprintf("
    "); wprintf("This screen allows you to enter Citadel server commands which are\n"); @@ -291,7 +294,7 @@ void display_generic(void) wprintf("
    \n"); wprintf("
    \n"); - wprintf("
    \n"); + wprintf("
    \n"); wDumpContent(1); } diff --git a/webcit/messages.c b/webcit/messages.c index b3e55205c..123c89460 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -375,7 +375,8 @@ void read_message(long msgnum) { } /* begin everythingamundo table */ - wprintf("
    \n"); + wprintf("
    \n"); /* begin message header table */ @@ -648,7 +649,8 @@ ENDBODY: wprintf("
    \n"); /* end everythingamundo table */ - wprintf("

    \n"); + wprintf("\n"); + wprintf("\n"); } @@ -1144,9 +1146,9 @@ void readloop(char *oper) wprintf("
    \n"); if (is_summary) { - wprintf( - "
    \n" + wprintf("
    " + "
    \n" "" "" "" @@ -1223,7 +1225,7 @@ void readloop(char *oper) } if (is_summary) { - wprintf("
    SubjectSender
    \n"); + wprintf("\n"); } /* Bump these because although we're thinking in zero base, the user @@ -1236,8 +1238,8 @@ void readloop(char *oper) if (num_displayed == 1) { if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_notes) && (!is_singlecard)) { - wprintf("
    " - "
    " + wprintf("
    " + "\n" "
    " "Reading #%d of %d messages.", lowest_displayed, nummsgs); @@ -1274,6 +1276,7 @@ void readloop(char *oper) oper, WC->msgarr[0]); + wprintf("
    \n"); } } @@ -1622,7 +1625,8 @@ void display_enter(void) "\n"); /* begin richedit box */ - wprintf("
    \n"); + wprintf("
    \n"); wprintf("\n" @@ -1646,18 +1650,23 @@ void display_enter(void) wprintf("
    \n"); /* Enumerate any attachments which are already in place... */ + wprintf(" Attachments: "); + wprintf(""); /* Now offer the ability to attach additional files... */ wprintf("   " "Attach file: \n  " + "SIZE=16 TYPE=\"file\">\n  " "\n"); wprintf("
    \n"); /* end attachments section */ @@ -1708,10 +1717,11 @@ void confirm_move_msg(void) output_headers(1, 1, 1, 0, 0, 0, 0); - wprintf("
    "); + wprintf("
    " + "
    "); wprintf("Confirm move of message\n"); - wprintf("
    \n"); + wprintf("
    \n"); wprintf("
    "); diff --git a/webcit/paging.c b/webcit/paging.c index 757921b4c..2717d1747 100644 --- a/webcit/paging.c +++ b/webcit/paging.c @@ -44,7 +44,8 @@ void display_page(void) "
    \n
    \n" ); - wprintf("
    \n"); + wprintf("
    " + "
    \n"); wprintf("Send an instant message to: "); escputs(recp); @@ -73,7 +74,7 @@ void display_page(void) wprintf("
    \n"); wprintf("\n"); - wprintf("
    \n"); + wprintf("
    \n"); wDumpContent(1); } diff --git a/webcit/roomops.c b/webcit/roomops.c index ae1de7791..62b0fbb12 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -826,7 +826,9 @@ void display_editroom(void) output_headers(1, 1, 1, 0, 0, 0, 0); /* print the tabbed dialog */ - wprintf("
    " + wprintf("
    " + "
    " + "
    " "" "\n"); @@ -926,11 +928,12 @@ void display_editroom(void) wprintf("\n"); - wprintf("
      
    \n"); + wprintf("
    \n"); /* end tabbed dialog */ /* begin content of whatever tab is open now */ - wprintf("\n" + wprintf("
    " + "
    \n" "
    \n"); if (!strcmp(tab, "admin")) { @@ -1401,7 +1404,7 @@ void display_editroom(void) } /* end content of whatever tab is open now */ - wprintf("
    \n"); + wprintf("\n"); wDumpContent(1); } @@ -1714,7 +1717,8 @@ void display_entroom(void) "\n
    \n" ); - wprintf("
    \n"); + wprintf("
    " + "
    \n"); wprintf("
    \n"); @@ -1773,7 +1777,7 @@ void display_entroom(void) if (buf[0] == '1') { fmout(NULL, "CENTER"); } - wprintf("
    \n"); + wprintf("
    \n"); wDumpContent(1); } diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c index 36704dde8..3174b9d93 100644 --- a/webcit/siteconfig.c +++ b/webcit/siteconfig.c @@ -51,7 +51,8 @@ void display_siteconfig(void) "\n
    \n" ); - wprintf("
    "); + wprintf("
    " + "
    "); whichmenu = bstr("whichmenu"); @@ -663,7 +664,7 @@ void display_siteconfig(void) wprintf(" "); wprintf("\n"); wprintf("\n"); - wprintf("
    \n"); + wprintf("
    \n"); wDumpContent(1); } diff --git a/webcit/summary.c b/webcit/summary.c index 128dd835f..114902bab 100644 --- a/webcit/summary.c +++ b/webcit/summary.c @@ -249,7 +249,8 @@ void summary(void) { * not people I consider worthwhile, I still want them to use WebCit. */ - wprintf("
    "); + wprintf("
    " + "
    "); /* * Column One @@ -276,7 +277,6 @@ void summary(void) { /* * End of columns */ - wprintf("
    \n"); - + wprintf("\n"); wDumpContent(1); } diff --git a/webcit/useredit.c b/webcit/useredit.c index a1927f0d0..5439ff0f9 100644 --- a/webcit/useredit.c +++ b/webcit/useredit.c @@ -291,7 +291,8 @@ void display_edituser(char *supplied_username, int is_new) { wprintf("\n"); wprintf("\n
    \n"); - wprintf("
    \n"); + wprintf("
    " + "
    \n"); wprintf("
    \n" "
    \n"); wprintf("\n"); - wprintf("
    \n"); - + wprintf("
    \n"); wDumpContent(1); } diff --git a/webcit/userlist.c b/webcit/userlist.c index 4578f0481..34e75d934 100644 --- a/webcit/userlist.c +++ b/webcit/userlist.c @@ -71,7 +71,8 @@ void userlist(void) goto DONE; } - wprintf("
    \n"); + wprintf("
    " + ""); wprintf("\n"); @@ -110,7 +111,7 @@ void userlist(void) extract_long(buf, 4), extract_long(buf, 5)); } - wprintf("
    \n"); wprintf("
    User NameNumberAccess LevelLast LoginTotal LoginsTotal Posts
    \n"); + wprintf("
    \n"); DONE: wDumpContent(1); } @@ -134,7 +135,8 @@ void showuser(void) "\n
    \n" ); - wprintf("
    \n"); + wprintf("
    " + "
    \n"); serv_printf("OIMG _userpic_|%s", who); serv_gets(buf); @@ -167,6 +169,6 @@ void showuser(void) escputs(who); wprintf("\n"); - wprintf("
    \n"); + wprintf("
    \n"); wDumpContent(1); } diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c index d28bd47c2..f9eabc4a1 100644 --- a/webcit/vcard_edit.c +++ b/webcit/vcard_edit.c @@ -187,7 +187,8 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) { ); wprintf("
    \n"); - wprintf("
    \n"); + wprintf("
    " + "
    \n"); wprintf("" "" @@ -276,7 +277,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) { "\n" ); - wprintf("
    Prefix
    \n"); + wprintf("
    \n"); wDumpContent(1); } diff --git a/webcit/who.c b/webcit/who.c index 40a988fb3..512d68b55 100644 --- a/webcit/who.c +++ b/webcit/who.c @@ -61,8 +61,8 @@ void whobbs(void) wprintf("\n" "
    \n"); - wprintf("
    " - "" + wprintf("
    " + "
    " "\n"); wprintf("\n"); wprintf("\n"); @@ -159,11 +159,12 @@ void whobbs(void) wprintf("\n"); } } - wprintf("
    Session IDUser Name
    \n" + wprintf("
    \n" + "
    " "Click on a name to read user info. Click on " "\"(p)\" to send " - "a page (instant message) to that user.
    \n"); + "a page (instant message) to that user.\n"); wDumpContent(1); } -- 2.30.2