Added workaround for webkit / konqueror

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

diff --git a/gosa-core/html/include/focus.js b/gosa-core/html/include/focus.js
index 173c7ba1757460969d79e116e6861bc1786206f9..8ffe8f20e954b96e5ea1e2feafa035ecde0ad2ac 100644 (file)
--- a/gosa-core/html/include/focus.js
+++ b/gosa-core/html/include/focus.js
@@ -368,7 +368,12 @@ function adjust_height(e) {
                }
 
                if (!document.getElementById("list_workaround")) {
-                 document.getElementById("d_scrollbody").style.height=suggested+20+"px";
+                 document.getElementById("d_scrollbody").style.height=suggested+"px";
+                } else {
+                  current_height= parseInt(document.defaultView.getComputedStyle(document.getElementById("t_nscrollbody"),"").getPropertyValue('height'));
+                  if (current_height < menu_height) {
+                   document.getElementById("d_scrollbody").style.height=suggested+20+"px";
+                  }
                 }
                if (document.getElementById("t_nscrollbody")) {
                        document.getElementById("t_nscrollbody").style.height=(suggested-22)+"px";

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index aac1efd2ea9cee9eb4f0e680831967b87211f9a5..f93313b53d6a0bbb2403cf310fbf8a25b1167888 100644 (file)
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -423,13 +423,13 @@ class listing {
 
     // Close list
     $result.= "</table>";
+    $result.= $switch?"<input type='hidden' id='list_workaround'>":"";
 
     $smarty= get_smarty();
     $smarty->assign("usePrototype", "true");
     $smarty->assign("FILTER", $this->filter->render());
     $smarty->assign("SIZELIMIT", print_sizelimit_warning());
     $smarty->assign("LIST", $result);
-    $smarty->assign("list_workaround", $switch?"<input type='hidden' id='list_workaround'>":"");
 
     // Assign navigation elements
     $nav= $this->renderNavigation();