fixed styles

added konqueror to old-behavior workaround

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

diff --git a/include/class_divlist.inc b/include/class_divlist.inc
index f6bc8f9e99c93b4413e02dc0c054d2e753517ca0..1df4ac48176c53ee03ded5583421eac2c393d20e 100644 (file)
--- a/include/class_divlist.inc
+++ b/include/class_divlist.inc
@@ -54,7 +54,7 @@ class divlist {
       // TODO: Find a more convenient way to use the same functionality in both
       // MSIE and non-MSIE browsers. ATM we need to manually set entriesPerPage to
       // a non-zero value, because MSIE won't scroll the tbody properly.
-      if(strpos($_SERVER['HTTP_USER_AGENT'],'MSIE') == 0){
+      if((strpos($_SERVER['HTTP_USER_AGENT'],'MSIE') == 0) && (strpos($_SERVER['HTTP_USER_AGENT'],'KHTML') == 0)){
         $s_return.= "<thead>".$this->_generateHeader()."</thead>";
         // Define an alternate style for IE (not used ATM)
         // $s_return.= "<!--[if IE]><style type='text/css'>tbody.scrollcontent {overflow-y:scroll;max-height:480px;}</style><![endif]-->";

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index e3a8e5675fc233ffbe83950fbbe4d47d67cd2f1d..970995784fe3792a11910635d0d8b0bc6f05b498 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -492,10 +492,10 @@ class faiManagement extends plugin
 
 
                        $title = $this->config->departments[$key];
-                       $field0 = array("string" => "<img src='images/".$non_empty."folder.png' title='"._("department")."' alt='department'>",                     "attach"=>"style='width:20px;'");
+                       $field0 = array("string" => "<img src='images/".$non_empty."folder.png' title='"._("department")."' alt='department'>",                     "attach"=>"style='text-align:center;width:20px;'");
                        $field1 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "title='".$title."'");
                        $field2 = array("string" => "");
-                       $field3 = array("string" => "","attach"=>"style='text-align:right;border-right:none;'");
+                       $field3 = array("string" => "","attach"=>"style='width:48px;text-align:right;border-right:none;'");
 
                        $divlist->AddEntry( array($field0,$field1,$field2,$field3));
 
@@ -571,10 +571,10 @@ class faiManagement extends plugin
                                                $desc= "";
                                        }
 
-                                       $field1 = array("string" => $img , "attach" => "style='height:26px;width=20px;'");
+                                       $field1 = array("string" => $img , "attach" => "style='text-align:center;width=20px;'");
                                        $field2 = array("string" => preg_replace(array("/%KEY%/","/%NAME%/"),array($key,$value['cn'].$desc),$editlink) , "attach" => "");
                                        $field3 = array("string" => $info, "attach" => "");
-                                       $field4 = array("string" => preg_replace("/%KEY%/",$key,$action) , "attach"=>"style='text-align:right;border:none'");
+                                       $field4 = array("string" => preg_replace("/%KEY%/",$key,$action) , "attach"=>"style='width:48px;text-align:right;border:none'");
                                        $divlist->AddEntry(array($field1,$field2,$field3,$field4));
 
                        }

diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc
index 675ea036bf39abfbad84a0f0a5c05f46f1bbf389..c36d32a3a0e910115ccc9804cb499c52548cfe00 100644 (file)
--- a/plugins/gofax/blocklists/class_blocklistManagement.inc
+++ b/plugins/gofax/blocklists/class_blocklistManagement.inc
@@ -329,9 +329,9 @@ class blocklist extends plugin
           }
         }
 
-        $field1 = array("string" => "<img src='images/".$non_empty."folder.png' alt='department'>");
+        $field1 = array("string" => "<img src='images/".$non_empty."folder.png' alt='department'>","attach"=>"style='text-align:center;width:20px;'");
         $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val));
-        $field3 = array("string" => "&nbsp;", "attach" => "style='border:none'");
+        $field3 = array("string" => "&nbsp;", "attach" => "style='border:none;width:48px;'");
         $divlist->AddEntry(array($field1,$field2,$field3));
       }
 
@@ -342,9 +342,9 @@ class blocklist extends plugin
       foreach($this->blocklists as $key => $val){
         // Generate Array to Add
         $display= "[".$val["cn"][0]."]";
-        $field1 = array("string" => sprintf($blockimg,$val['dn']),"attach"=>"style='width:20px;align:middle;'");
+        $field1 = array("string" => sprintf($blockimg,$val['dn']),"attach"=>"style='width:20px;text-align:center;'");
         $field2 = array("string" => sprintf($editlink,$key,$display),"attach"=>"title='".$val['dn']."'");
-        $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action),"attach" => "style='border:none; text-align:right;width:40px'");
+        $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action),"attach" => "style='border:none; text-align:right;width:48px'");
         $divlist->AddEntry( array($field1,$field2,$field3));
       }