From fbc32d158c7f6307d824a9b88f7180dd2d12aafe Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Tue, 25 May 2010 18:08:48 +0000
Subject: [PATCH] * Now attempting to fix the final few rendering problems in
 Internet Explorer.  Testing with IE 7.  I will also test with IE 8, Firefox,
 and WebKit (Chrome, Safari etc).  IE 6 will not be tested; in fact, I am
 *removing* all markup which indicates that it is only present to work around
 IE 6 bugs.

---
 webcit/bbsview_renderer.c    |  3 +++
 webcit/static/t/knrooms.html |  4 ++++
 webcit/static/wclib.js       | 27 ---------------------------
 webcit/static/webcit.css     |  6 +-----
 4 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/webcit/bbsview_renderer.c b/webcit/bbsview_renderer.c
index 8a02e35bf..aad71a415 100644
--- a/webcit/bbsview_renderer.c
+++ b/webcit/bbsview_renderer.c
@@ -169,6 +169,8 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat,
 	int start_index = 0;
 	int end_index = 0;
 
+	wc_printf("<div class=\"fix_scrollbar_bug\">");
+
 	if (Stat->nummsgs > 0) {
 		lprintf(9, "sorting %d messages\n", BBS->num_msgs);
 		qsort(BBS->msgs, (size_t)(BBS->num_msgs), sizeof(long), bbsview_sortfunc);
@@ -319,6 +321,7 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat,
 		}
 	}
 
+	wc_printf("</div>\n");
 	return(0);
 }
 
diff --git a/webcit/static/t/knrooms.html b/webcit/static/t/knrooms.html
index c5a687d0c..02d6661c0 100644
--- a/webcit/static/t/knrooms.html
+++ b/webcit/static/t/knrooms.html
@@ -26,19 +26,23 @@ OnChange="location.href=roomlistomatic.newview.options[selectedIndex].value">
 
 <??("COND:PREF", 2, "roomlistview", "folders")>
 <div id="content" class="service">
+<div class="fix_scrollbar_bug">
 <table BORDER=0 WIDTH=96%% CELLPADDING=5>
 <?ITERATE("LKRA", ="knrooms_rooms")>
 </table>
+</div>
 <??("X", 2)>
 
 <?!("COND:PREF", 3, "roomlistview", "folders")>
 <div id="content" class="service">
+<div class="fix_scrollbar_bug">
 <div class="box">
  <div class="boxlabel"><?_("Room Listing")></div>
   <div class="boxcontent">
    <div id="roomlist_knrooms"></div>
   </div>
 </div>
+</div>
 <?!("X", 3)>
 <script type="text/javascript">
 FillRooms(KNRoomsRoomList);
diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index 6d5f22820..961b995ca 100644
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -32,8 +32,6 @@ var ns6=document.getElementById&&!document.all;
 Event.observe(window, 'load', ToggleTaskDateOrNoDateActivate);
 Event.observe(window, 'load', taskViewActivate);
 Event.observe(window, 'load', fixbanner);
-Event.observe(window, 'load', resizeViewport);
-Event.observe(window, 'resize', resizeViewport);
 //document.observe("dom:loaded", setupPrefEngine);
 document.observe("dom:loaded", setupIconBar);
 function CtdlRandomString()  {
@@ -912,31 +910,6 @@ function fixOffsetBanner() {
     contentDiv.style.width = newContentWidth+"px";
   }
 }
-/** Attempt to stop overflowing in x-axis in IE6 */
-function resizeViewport() {
-  var documentWidth = 0;
-  var viewportWidth = document.viewport.getWidth();
-  var iconbar = $('iconbar');
-  var global = $('global');
-  if (iconbar == null || global == null || document.documentElement == null) {
-    return;
-  }
-  if (typeof window.offsetWidth != 'undefined') {
-    documentWidth = window.offsetWidth;
-  } else {
-    documentWidth = document.documentElement.offsetWidth;
-  }
-  if (documentWidth > viewportWidth) {
-    WCLog("resizeViewport");
-    document.documentElement.style.width = viewportWidth+"px";
-    document.documentElement.style.overflowX = "hidden";
-    //viewportWidth = 0.98 * viewportWidth;
-    var newIconBarSize = 0.16 * viewportWidth;
-    var newContentSize = viewportWidth - newIconBarSize;
-    iconbar.style.width = newIconBarSize+"px";
-    global.style.width = newContentSize+"px";
-  }
-}
 
 function RefreshSMTPqueueDisplay() {
 	new Ajax.Updater('smtpqueue_inner_div',
diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index ee0bce11a..ca36ec560 100644
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -690,7 +690,6 @@ body, #global {
 
 .fix_scrollbar_bug {
 	margin-right: 1px;		/* Gecko and other non-broken browsers */
-	width: expression('96%');	/* Only IE6 understands 'expression' - fixes weird scrollbarbug */
 }
 
 /* Boxes */
@@ -1169,10 +1168,7 @@ dt { clear: both; }
 .imsg {
 	text-align: center;
 }
-#summary_view > table { /* hide from IE6 */
-	width: 100%;
-	table-layout: fixed;
-}
+
 colgroup.entity {
 	text-align: center;
 }
-- 
2.30.2