some more fixes for IE and resize_headlines

3 files changed, 32 insertions, 9 deletions

diff --git a/tt-rss-ie.css b/tt-rss-ie.css
index 03412444e..ccefc889d 100644
--- a/tt-rss-ie.css
+++ b/tt-rss-ie.css
@@ -12,4 +12,14 @@ li.feedCatHolder {
 	display : none;
 }
 
+#headlinesInnerContainer {
+	position : normal;
+}
+
+div.headlines_normal {
+	overflow : auto;
+}
 
+div.headlines_cdm {
+	overflow : auto;
+}
diff --git a/tt-rss.css b/tt-rss.css
index 5709f1d7d..291a51bd2 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1289,7 +1289,7 @@ div.headlines_cdm {
 
 #content-frame {
 	position : absolute;
-	border-width : 1px 0px 1px 0px;
+	border-width : 1px 0px 0px 0px;
 	border-style : solid;
 	border-color : #88b0f0;
 	overflow : auto;
@@ -1299,7 +1299,7 @@ div.headlines_cdm {
 	right : 0px;
 	border-collapse : collapse;
 	width: expression((parseInt(document.documentElement.clientWidth)-260)+'px');
-	height: expression((parseInt(document.documentElement.clientHeight)-40-305-50)+'px');
+/*	height: expression((parseInt(document.documentElement.clientHeight)-40-305-50)+'px'); */
 }
 
 #footer, #prefFooter {
diff --git a/tt-rss.js b/tt-rss.js
index 89497e990..eec1fe1ae 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -388,17 +388,32 @@ function init() {
 
 function resize_headlines() {
 
-	if (is_msie()) return;
-
 	var h_frame = document.getElementById("headlines-frame");
 	var c_frame = document.getElementById("content-frame");
+	var f_frame = document.getElementById("footer");
+
+	if (!c_frame || !h_frame) return;
 
 	debug("resize_headlines");
 
-	if (c_frame && h_frame) {
+	if (!is_msie()) {
 		h_frame.style.height = 30 + "%";
 		c_frame.style.top = h_frame.offsetTop + h_frame.offsetHeight + 1 + "px";
 		h_frame.style.height = h_frame.offsetHeight + "px";
+	} else {
+		h_frame.style.height = document.documentElement.clientHeight * 0.3 + "px";
+		c_frame.style.top = h_frame.offsetTop + h_frame.offsetHeight + 1 + "px";
+
+		var c_bottom = document.documentElement.clientHeight;
+
+		if (f_frame) {
+			c_bottom = f_frame.offsetTop;
+		}
+
+		c_frame.style.height = c_bottom - (h_frame.offsetTop + 
+			h_frame.offsetHeight + 1) + "px";
+		h_frame.style.height = h_frame.offsetHeight + "px";
+
 	}
 }
 
@@ -410,10 +425,8 @@ function init_second_stage() {
 
 		delCookie("ttrss_vf_test");
 
-		if (!is_msie()) {
-			document.onresize = resize_headlines;
-			resize_headlines();
-		}
+//		document.onresize = resize_headlines;
+		resize_headlines();
 
 		var toolbar = document.forms["main_toolbar_form"];