From: janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 20 Dec 2006 10:22:47 +0000 (+0000)
Subject: Applied changes from 2.5.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=632a7b0b85e39dec8fa651316b46f3fea69828c6;p=gosa.git

Applied changes from 2.5.


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5450 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/html/include/focus.js b/html/include/focus.js
index 1a1fb7748..4a112e0fb 100644
--- a/html/include/focus.js
+++ b/html/include/focus.js
@@ -296,15 +296,25 @@ function adjust_height(e) {
 			if((inner_height-230)-suggested>0) {
 				suggested= inner_height-230;
 			}
-	
-		} else if(px_height >= 450) {
-				suggested= px_height-230;
+		
+		// IE uses other height specifications
+		} else if (browserType == "ie") {
+			suggested= document.all.menucell.offsetHeight;
+			offset= absTop(d_scrollbody);
+			suggested-= offset;
+			if((inner_height-230)-suggested>0) {
+				suggested= inner_height-230;
+			}
 		}
 		document.getElementById("d_scrollbody").style.height=suggested+"px";
 	}
 	return true;
 }
 
+function absTop(e) {
+	return (e.offsetParent)?e.offsetTop+absTop(e.offsetParent) : e.offsetTop;
+}
+
 // Automatic resize (width) of divlists
 function adjust_width(e) {
 	if (!e) e=window.event;
diff --git a/include/class_divlist.inc b/include/class_divlist.inc
index a3ecfb8d5..cd12a5ebd 100644
--- a/include/class_divlist.inc
+++ b/include/class_divlist.inc
@@ -196,7 +196,7 @@ class divlist {
     							
     				$s_value = $this->a_entries[$i];
     				
-    				
+    		    // Alternation of background color		
     				if($i_alternate) $i_alternate=0; else $i_alternate=1;
     				
     				$s_return .= "\n<tr>";
@@ -295,7 +295,7 @@ class divlist {
   
       // if fewer than 22 Entries (list not full), print row to fill empty space
       //FIXME: Why 22? Isn't the size dynamic
-#      if($this->_numEntries()<=22){
+      if($this->_numEntries()<=22){
         $fill= "";
         for ($i= 1; $i <= $this->cols; $i++){
           if ($i == $this->cols){
@@ -303,9 +303,9 @@ class divlist {
           } else {
            $fill.= "<td class='list1nohighlight' style='height:100%;'>&nbsp;</td>";
           }
-       }
+        }
         $s_return.="\n<tr>$fill";
-#      }
+      }
       if($this->i_entriesPerPage == 0) {
         $s_return .= "\n</table></div></td>";
       }