From: janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 1 Aug 2006 09:20:09 +0000 (+0000)
Subject: ACL toggling now works even with IE (small bug: when switching to relative positionin... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0e28209ef4096662e03da00134ba7ce0c5fff531;p=gosa.git

ACL toggling now works even with IE (small bug: when switching to relative positioning, the top cell will break on small resolutions).


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

diff --git a/html/include/focus.js b/html/include/focus.js
index a41a6ff05..cc6bc15df 100644
--- a/html/include/focus.js
+++ b/html/include/focus.js
@@ -214,6 +214,20 @@ function divtoggle(element) {
 				cell.style.height=document.defaultView.getComputedStyle(document.poppedLayer,"").getPropertyValue('height');
 			}
 		}
+	} else if (browserType == "ie") {
+    document.poppedLayer = document.getElementById(element);
+		cell= document.getElementById(cellname);
+	  if (document.poppedLayer.style.visibility == "visible") {
+		  hide (element);
+			cell.style.height="0px";
+			document.poppedLayer.style.height="0px";
+			document.poppedLayer.style.position="absolute";
+		} else {
+		  show (element);
+			cell.style.height="";
+			document.poppedLayer.style.height="";
+			document.poppedLayer.style.position="relative";
+		}
 	}
 }
 
diff --git a/include/class_acl.inc b/include/class_acl.inc
index c2ad1d09e..072fdf546 100644
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -487,8 +487,14 @@ class acl extends plugin
       $currentAcl= $this->aclContents[$key];
 
       /* Object header */
-      if($_SESSION['js'] && (isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT']))) {
+      if($_SESSION['js']) {
+        if(isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT'])) {
           $display.= "<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2><tr><td style='background-color:#C8C8C8;height:1.8em;' colspan=".($cols-1)."><b>"._("Object").": $name</b></td><td align='right' style='background-color:#C8C8C8;height:1.8em;'><input type='button' onclick='divtoggle(\"$name\");' value='"._("Show/Hide Advanced Settings")."' /></td></tr>";
+        } else if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/ie/i",$_SERVER['HTTP_USER_AGENT'])) {
+          $display.= "<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2><tr><td style='background-color:#C8C8C8;height:1.8em;' colspan=".($cols-1)."><b>"._("Object").": $name</b></td><td align='right' style='background-color:#C8C8C8;height:1.8em;'><input type='button' onclick='divtoggle(\"$name\");' value='"._("Show/Hide Advanced Settings")."' /></td></tr>";
+        } else {
+          $display.= "<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2><tr><td style='background-color:#C8C8C8;height:1.8em;' colspan=$cols><b>"._("Object").": $name</b></td></tr>";
+        }
       } else {
           $display.= "<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2><tr><td style='background-color:#C8C8C8;height:1.8em;' colspan=$cols><b>"._("Object").": $name</b></td></tr>";
       }
@@ -522,7 +528,9 @@ class acl extends plugin
       asort($splist);
       if($_SESSION['js']) {
         if(isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT'])) {
-          $display.= "<tr id='tr_$name' style='vertical-align:top;height:1px;'><td colspan=".$cols."><div id='$name' style='overflow:hidden;visibility:hidden;height:0px;vertical-align:top;width:100%;'><table style='width:100%;'>";
+          $display.= "<tr id='tr_$name' style='vertical-align:top;height:0px;'><td colspan=".$cols."><div id='$name' style='overflow:hidden;visibility:hidden;height:0px;vertical-align:top;width:100%;'><table style='width:100%;'>";
+        } else if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/ie/i",$_SERVER['HTTP_USER_AGENT'])) {
+          $display.= "<tr id='tr_$name' style='vertical-align:top;height:0px;'><td colspan=".$cols."><div id='$name' style='position:absolute;overflow:hidden;visibility:hidden;height:0px;vertical-align:top;width:100%;'><table style='width:100%;'>";
         }
       }
       foreach($splist as $attr => $dsc){
@@ -562,7 +570,7 @@ class acl extends plugin
       }
 
       if($_SESSION['js']) {
-        if(isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT'])) {
+        if(isset($_SERVER['HTTP_USER_AGENT']) && (preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT'])) || (preg_match("/ie/i",$_SERVER['HTTP_USER_AGENT']))) {
           $display.= "</table></div></td></tr>";
         }
       }