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 1a1fb7748de9704d9129fa72e7ad0e1e838862c3..4a112e0fb7c8d3d908bfa9318a6de4fde4630940 100644 (file)
--- 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 a3ecfb8d5ed2f5f7ef04e1afe34b04e43a008166..cd12a5ebdf206bce265b25f4900e6dc206bd33eb 100644 (file)
--- 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>";
       }