fixed style

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

diff --git a/include/class_divlist.inc b/include/class_divlist.inc
index 497b40645b629892b1008d19211edfac08584a3b..91fe65e16eed4e136252e0477d14ee717e726cbb 100644 (file)
--- a/include/class_divlist.inc
+++ b/include/class_divlist.inc
@@ -99,9 +99,9 @@ class divlist {
     // but do this only if we are really using scrolltables.
     if($this->i_entriesPerPage == 0) {
       if($this->_numEntries()>=20) {
-        $s_return .= "\n<td class='listheader' id='scrollbar'>&nbsp;</td>";
+        $s_return .= "\n<td class='listheader' style='width:13px;border-right:0px;'>&nbsp;</td>";
       }
-      $s_return .= "\n</table></td></tr>";
+      $s_return .= "\n</table></td>";
     }
 
        $s_return .= "\n</tr>";
@@ -118,10 +118,11 @@ class divlist {
                $s_key          = "";
                $s_return       = "";
    
-    // We need to construct a "body"-table that is width-of-scrollbar thinner than the "head"-table. I assume 18px as max.
+    // We need to construct a "body"-table that is width-of-scrollbar thinner than the "head"-table.
     $s_return .= "\n<tr><td class='scrollbody'><div style='align:left;width:600px;height:480px;overflow:auto;'>";
+
     // Only reduce width if we need a scrollbar (>19 Entries)
-    if($this->_numEntries()>=20) {
+    if($this->_numEntries()>19) {
       $s_return .= "<table style='height:100%;width:581px;' cellspacing='0'>";
                } else {
       $s_return .= "<table style='height:100%;width:600px;' cellspacing='0'>";
@@ -141,141 +142,142 @@ class divlist {
 
     /* If divlist is empty, append a single white entry */
     if(count($this->a_entries)==0){
-      $str = "<tr>";
-      for($i = 0 ; $i < count($this->a_header[0]); $i++){
-        $str.="<td class='list1' style='height:100%';>&nbsp;</td>";
-      }
-      $str .="</tr>";
+      $str = $s_return."<tr>";
+      //for($i = 0 ; $i < count($this->a_header[0]); $i++){
+        $str.="<td class='list1' style='height:100%;border-right:0px;'>&nbsp;</td>";
+      //}
+      $str.="</tr></table></div></td></tr>";
       return($str);
-    }
- 
-    if ($this->i_entriesPerPage > 0) {
-               while($start > $this->_numentries()){
-                       $start = $start - $this->i_entriesPerPage;
-               }       
-  
-               $stop  = $start + $this->i_entriesPerPage;
-  
-               $appendempty = ($this->_numentries() -$start);
+    } else {
+    
+      if ($this->i_entriesPerPage > 0) {
+               while($start > $this->_numentries()){
+                       $start = $start - $this->i_entriesPerPage;
+               }       
+    
+               $stop  = $start + $this->i_entriesPerPage;
+    
+               $appendempty = ($this->_numentries() -$start);
+    
+               for($i = $start ; $i < $stop;$i++){
+                       
+                       if(isset($this->a_entries[$i])){
+                                                       
+                               $s_value = $this->a_entries[$i];
+                               
+                               
+                               if($i_alternate) $i_alternate=0; else $i_alternate=1;
+                               
+                               $s_return .= "\n<tr>";
+                               
+                               $cnt = 0;                                       
+                                       
+                               foreach($s_value as $s_key2 => $s_value2 ){                             
+    
+                                       $this->cols = count($s_value) ;                                         
+                                       $cnt++;                                 
+    
+                                       if(!isset($s_value2['class'])){
+                                               $class = "list".$i_alternate; 
+                                       }else{
+                                               $class = $s_value2['class'];
+                                       }
+    
+                                       if(!isset($s_value2['attach'])){
+                                               $style = "";
+                                       }else{
+                                               $style = " ".$s_value2['attach']." "    ;
+                                       }
+    
+                                       $s_return .= "\n<td ".$style." class='".$class."'>";
+                                       $s_return .= $s_value2['string'];
+                                       $s_return .= "\n</td>";
+                               }
+                               if($cnt == 0 ){
+                                       $s_return.="\n<td>&nbsp;</td>";
+                               }
   
-               for($i = $start ; $i < $stop;$i++){
-                       
-                       if(isset($this->a_entries[$i])){
-                                                       
-                               $s_value = $this->a_entries[$i];
-                               
-                               
-                               if($i_alternate) $i_alternate=0; else $i_alternate=1;
-                               
-                               $s_return .= "\n<tr>";
-                               
-                               $cnt = 0;                                       
-                                       
-                               foreach($s_value as $s_key2 => $s_value2 ){                             
+                               $s_return .= "\n</tr>";
+                       }       
+               }
+    
+               if(!(($stop)<$this->_numentries())){
+                       $nums = $stop - $this->_numentries();// - $stop;
+                       for($i = 0 ; $i < $nums ; $i ++ ){
+                               $s_return.="<tr>";
+                               $cnt=0;
+                               for($a = 0 ; $a < (count($this->a_header[0])) ; $a ++ ) {
+                                       if($a ==(count($this->a_header[0])-1)){
+                                               $s_return.="\n<td class='list1' style='border:0px;' height='26'>&nbsp;</td>";
+                                       } else {
+                                               $s_return.="\n<td class='list1' height='26'>&nbsp;</td>";
+                                       }
+                               }
+                               $s_return.="\n</tr>";
+                       }       
+               }
+    
+               if($this->b_displayPageNums){
+                       $s_return .= "<tr><td colspan='".$this->cols."' align='center'>".range_selector($this->_numentries(),$start,$this->i_entriesPerPage)."</td></tr>";
+               }
+      } else {
+        // $this->i_entriesPerPage <= 0
+        // We should display all entries on one page
   
-                                       $this->cols = count($s_value) ;                                         
-                                       $cnt++;                                 
+        $i = $this->_numEntries();
+           foreach($this->a_entries as $s_key => $s_value){
+                         $i--;
   
-                                       if(!isset($s_value2['class'])){
-                                               $class = "list".$i_alternate; 
-                                       }else{
-                                               $class = $s_value2['class'];
-                                       }
+          if($i_alternate!=0){ 
+            $i_alternate=0; 
+          } else {
+            $i_alternate=1;
+          }
+                 
+          $s_return .= "\n<tr>";
+                                 
+                   $cnt = 0;                                   
+                                         
+                         foreach($s_value as $s_key2 => $s_value2 ){                           
   
-                                       if(!isset($s_value2['attach'])){
-                                               $style = "";
-                                       }else{
-                                               $style = " ".$s_value2['attach']." "    ;
-                                       }
+                                 $this->cols = count($s_value) ;                                               
+                                 $cnt++;                                       
   
-                                       $s_return .= "\n<td ".$style." class='".$class."'>";
-                                       $s_return .= $s_value2['string'];
-                                       $s_return .= "\n</td>";
-                               }
-                               if($cnt == 0 ){
-                                       $s_return.="\n<td>&nbsp;</td>";
-                               }
-
-                               $s_return .= "\n</tr>";
-                       }       
-               }
+                                 if(!isset($s_value2['class'])){
+                                         $class = "list".$i_alternate; 
+                                 } else {
+                                         $class = $s_value2['class'];
+                                 }
   
-               if(!(($stop)<$this->_numentries())){
-                       $nums = $stop - $this->_numentries();// - $stop;
-                       for($i = 0 ; $i < $nums ; $i ++ ){
-                               $s_return.="<tr>";
-                               $cnt=0;
-                               for($a = 0 ; $a < (count($this->a_header[0])) ; $a ++ ) {
-                                       if($a ==(count($this->a_header[0])-1)){
-                                               $s_return.="\n<td class='list1' style='border:0px;' height='26'>&nbsp;</td>";
-                                       } else {
-                                               $s_return.="\n<td class='list1' height='26'>&nbsp;</td>";
-                                       }
-                               }
-                               $s_return.="\n</tr>";
-                       }       
-               }
+                                 if(!isset($s_value2['attach'])){
+                                         $style = "";
+                                 } else {
+                                         $style = " ".$s_value2['attach']." "  ;
+                                 }
+            
+            $s_return .= "\n<td ".$style." class='".$class."'>";
+                                 $s_return .= $s_value2['string'];
+                                 $s_return .= "</td>";
+                         }
+                         $s_return .= "\n</tr>";
+                 }
+      }
   
-               if($this->b_displayPageNums){
-                       $s_return .= "<tr><td colspan='".$this->cols."' align='center'>".range_selector($this->_numentries(),$start,$this->i_entriesPerPage)."</td></tr>";
-               }
-    } else {
-      // $this->i_entriesPerPage <= 0
-      // We should display all entries on one page
-
-      $i = $this->_numEntries();
-           foreach($this->a_entries as $s_key => $s_value){
-                         $i--;
-
-        if($i_alternate!=0){ 
-          $i_alternate=0; 
-        } else {
-          $i_alternate=1;
-        }
-                 
-        $s_return .= "\n<tr>";
-                                 
-                   $cnt = 0;                                   
-                                         
-                         foreach($s_value as $s_key2 => $s_value2 ){                           
-
-                                 $this->cols = count($s_value) ;                                               
-                                 $cnt++;                                       
-
-                                 if(!isset($s_value2['class'])){
-                                         $class = "list".$i_alternate; 
-                                 } else {
-                                         $class = $s_value2['class'];
-                                 }
-
-                                 if(!isset($s_value2['attach'])){
-                                         $style = "";
-                                 } else {
-                                         $style = " ".$s_value2['attach']." "  ;
-                                 }
-          
-          $s_return .= "\n<td ".$style." class='".$class."'>";
-                                 $s_return .= $s_value2['string'];
-                                 $s_return .= "</td>";
-                         }
-                         $s_return .= "\n</tr>";
-                 }
-    }
-
-    // if fewer than 19 Entries (list not full), print row to fill empty space
-    if($this->_numEntries()<19){
-      $fill= "";
-      for ($i= 1; $i <= $this->cols; $i++){
-        if ($i == $this->cols){
-         $fill.= "<td class='list1' id='fill' style='border-right:0px';>&nbsp;</td>";
-        } else {
-         $fill.= "<td class='list1' id='fill'>&nbsp;</td>";
+      // if fewer than 19 Entries (list not full), print row to fill empty space
+      if($this->_numEntries()<19){
+        $fill= "";
+        for ($i= 1; $i <= $this->cols; $i++){
+          if ($i == $this->cols){
+           $fill.= "<td class='list1' style='height:100%;border-right:0px';>&nbsp;</td>";
+          } else {
+           $fill.= "<td class='list1' style='height:100%;'>&nbsp;</td>";
+          }
         }
+        $s_return.="\n<tr>$fill</tr>";
       }
-      $s_return.="\n<tr>$fill</tr>";
+      $s_return .= "\n</table></div></td></tr>";
+      return $s_return;
     }
-    $s_return .= "\n</table></div></td></tr>";
-    return $s_return;
   }
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:

diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index 8924f4382169ffce8f537c61ada935d60ce37cf4..4655059131e70263d6ba07fa0abfea2652b76c28 100644 (file)
--- a/plugins/admin/applications/class_applicationManagement.inc
+++ b/plugins/admin/applications/class_applicationManagement.inc
@@ -355,7 +355,7 @@ class applicationManagement extends plugin
         $divlist->SetHeader(array(
               array("string" => " ", "attach" => "style='text-align:center;width:20px;'"),
               array("string" => _("Application name")." / "._("Department"), "attach" => "style=''"),
-              array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'")
+              array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'")
               ));
 
 
@@ -378,7 +378,7 @@ class applicationManagement extends plugin
 
           $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), "attach" => "style=''");
-          $field3 = array("string" => "&nbsp;", "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+          $field3 = array("string" => "&nbsp;", "attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
           $divlist->AddEntry(array($field1,$field2,$field3));
         }
@@ -393,7 +393,7 @@ class applicationManagement extends plugin
           }
           $field1 = array("string" => sprintf($applimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
           $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title);
-          $field3 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+          $field3 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
           $divlist->AddEntry(array($field1,$field2,$field3));
         }

diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index dbaece848b9a08f8ade3d3221a1a59569de1cc35..fa2aa3bda03ec4d7b6f0edf6dc877d5a12890242 100644 (file)
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -299,7 +299,7 @@ class departmentManagement extends plugin
                        $divlist->SetHeader(array(
                                                array("string" => " ", "attach" => "style='text-align:center;width:20px;'"),
                                                array("string"=>_("Department name"), "attach" => "style=''"),
-                                               array("string" =>_("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'")));
+                                               array("string" =>_("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'")));
 
                        foreach($this->departments as $key => $val) {
                                if(!isset($this->config->departments[trim($key)])){
@@ -317,7 +317,7 @@ class departmentManagement extends plugin
                                $title = $this->config->departments[$key];
                                $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" => "style='' title='".$title."'");
-                               $field2 = array("string" => preg_replace("/%KEY%/", base64_encode($key), $actions), "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+                               $field2 = array("string" => preg_replace("/%KEY%/", base64_encode($key), $actions), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
                                $divlist->AddEntry( array($field0,$field1,$field2));
 

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 3f87f0826167b70625024101ffb6cf09d7b6f295..9d11242dc68952db729452bc3f9876000de32431 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -474,7 +474,7 @@ class faiManagement extends plugin
                                        array("string" => " ", "attach" => "style='text-align:center;width:20px;'"),
                                        array("string" => _("Name of FAI class"), "attach" => "style=''"),
                                        array("string" => _("Class type"), "attach" => "style='width:200px;'"),
-                                       array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'")));
+                                       array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'")));
 
 
                $action  = "<input type='image' src='images/edit.png'   alt='"._("edit")."'   name='entry_edit_%KEY%' title='"._("Edit class")."'>";
@@ -501,7 +501,7 @@ class faiManagement extends plugin
                        $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" => "style='' title='".$title."'");
                        $field2 = array("string" => "&nbsp;", "attach" => "style='width:200px;'");
-                       $field3 = array("string" => "&nbsp;", "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+                       $field3 = array("string" => "&nbsp;", "attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
                        $divlist->AddEntry( array($field0,$field1,$field2,$field3));
 
@@ -580,7 +580,7 @@ class faiManagement extends plugin
                                        $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" => "style=''");
                                        $field3 = array("string" => $info, "attach" => "style='width:200px;'");
-                                       $field4 = array("string" => preg_replace("/%KEY%/",$key,$action) , "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+                                       $field4 = array("string" => preg_replace("/%KEY%/",$key,$action) , "attach" => "style='width:60px;border-right:0px;text-align:right;'");
                                        $divlist->AddEntry(array($field1,$field2,$field3,$field4));
 
                        }

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 277d1fa79d768fb91abd48dd702eae6c04208fb9..0c593b70ac12455e83b36363175d9528aa70bef4 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -387,7 +387,7 @@ class groupManagement extends plugin
           array("string" => " ", "attach" => "style='text-align:center;width:20px;'"),
           array("string" => _("Groupname")." / "._("Department"), "attach" => "style=''"),
           array("string" => _("Properties"), "attach" => "style='width:136px;'"),
-          array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'")
+          array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'")
           ));
 
     $divlist->SetSummary(_("This table displays all groups, in the selected tree."));
@@ -411,7 +411,7 @@ class groupManagement extends plugin
       $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), "attach" => "style=''");
       $field3 = array("string" => "&nbsp;", "attach" => "style='width:136px;'");
-      $field4 = array("string" => "&nbsp;", "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+      $field4 = array("string" => "&nbsp;", "attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
       $divlist->AddEntry(array($field1,$field2,$field3,$field4));
     }
@@ -439,7 +439,7 @@ class groupManagement extends plugin
       $field1 = array("string" => sprintf($userimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
       $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title);
       $field3 = array("string" => $posix."&nbsp;".$enviro."&nbsp;".$mail."&nbsp;".$samba."&nbsp;".$appl."&nbsp;".$phone, "attach" => "style='width:136px;'");  
-      $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+      $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
       
       $divlist->AddEntry(array($field1,$field2,$field3,$field4));    
     }

diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 971c99c6fe846f1a63c9166c0a6766d66965c74c..68c8a370be0a93c11245c6628171fe29a8c6415c 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -391,7 +391,7 @@ name='dep_root' alt='"._("Root")."'> ".
           array("string" => " ", "attach" => "style='text-align:center;width:20px;'"),
           array("string" => _("Name of object groups")." / "._("Departments"), "attach" => "style=''"),
           array("string" => _("Properties"), "attach" => "style='width:136px;'"),
-          array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'")
+          array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'")
           ));
 
 
@@ -417,7 +417,7 @@ name='dep_root' alt='"._("Root")."'> ".
       $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), "attach" => "style=''");
       $field3 = array("string" => "&nbsp;", "attach" => "style='width:136px;'");
-      $field4 = array("string" => "&nbsp;", "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+      $field4 = array("string" => "&nbsp;", "attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
       $divlist->AddEntry(array($field1,$field2,$field3,$field4));
     }
@@ -441,7 +441,7 @@ name='dep_root' alt='"._("Root")."'>&nbsp;".
       $field1 = array("string" => "<img src='images/list_ogroup.png' alt='"._("Object group")."' ".$title.">", "attach" => "style='text-align:center;width:20px;'");
       $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title);
       $field3 = array("string" => $this->convert_list($val)."&nbsp;".$mail, "attach" => "style='width:136px;'");
-      $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+      $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
       $divlist->AddEntry(array($field1,$field2,$field3,$field4));
     }

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 6dee85647a5d803bf68270f9b32616bef4af0368..61078cb996902c70b7312d5df3a1b74b57af49ac 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -587,7 +587,7 @@ class systems extends plugin
     $divlist->SetHeader(array(
           array("string" => " ", "attach" => "style='text-align:center;width:20px;'"),
           array("string" => _("System")." / "._("Department"), "attach" => "style=''"),
-          array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'" )));
+          array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'" )));
 
     $divlist->SetSummary(_("This table displays all systems, in the selected tree."));
     $divlist->SetEntriesPerPage(0);
@@ -611,7 +611,7 @@ class systems extends plugin
 
       $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), "attach" => "style=''");
-      $field3 = array("string" => "&nbsp;", "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+      $field3 = array("string" => "&nbsp;", "attach" => "style='width:60px;border-right:0px;text-align:right;'");
       $divlist->AddEntry(array($field1,$field2,$field3));
     }
 
@@ -670,7 +670,7 @@ class systems extends plugin
 
       $field1 = array("string" => sprintf($img['img'],$val['dn']), "attach" => "style='text-align:center;width:20px;'");
       $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='".$val['dn']."'");
-      $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action), "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+      $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
       $divlist->AddEntry( array($field1,$field2,$field3));
     }
 

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 6a91294e96a1beafe22a41417f881c8e3ddd87bd..623d7f3bb90ec66bcea75c9efc871b4c3c6ef9ad 100644 (file)
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -688,7 +688,7 @@ class userManagement extends plugin
           array("string" => " ", "attach" => "style='text-align:center;width:20px;'"),
           array("string" => _("Username")." / "._("Department"), "attach" => "style=''"),
           array("string" => _("Properties"), "attach" => "style='width:152px;'"),
-          array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'")));
+          array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'")));
 
 
     $divlist->SetSummary(_("This table displays all users, in the selected tree."));
@@ -715,7 +715,7 @@ class userManagement extends plugin
       $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), "attach" => "style=''");
       $field3 = array("string" => "&nbsp;", "attach" => "style='width:152px;'");
-      $field4 = array("string" => "&nbsp;", "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+      $field4 = array("string" => "&nbsp;", "attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
 
       $divlist->AddEntry(array($field1,$field2,$field3,$field4));
@@ -868,7 +868,7 @@ class userManagement extends plugin
       $field1 = array("string" => sprintf($tpl,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
       $field2 = array("string" => sprintf($editlink,$key,$display).$ip_port, "attach" => "style='' title='".$val['dn']."'");
       $field3 = array("string" => $usrimg2."&nbsp;".$posix."&nbsp;".$enviro."&nbsp;".$maila."&nbsp;".$fonac."&nbsp;".$faxac."&nbsp;".$samba."&nbsp;".$s_img_create_from_template, "attach" => "style='width:152px;'");
-      $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action),"attach" => "style='width:52px;border-right:0px;text-align:right;'");
+      $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action),"attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
       $add = array($field1,$field2,$field3,$field4);
 

diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc
index b154c680763d075c7e20f6b8eda239b11da2bed3..6786efdc6dd8ae66a080fbe79b5af4a745b6ef14 100644 (file)
--- a/plugins/gofax/blocklists/class_blocklistManagement.inc
+++ b/plugins/gofax/blocklists/class_blocklistManagement.inc
@@ -308,7 +308,7 @@ class blocklist extends plugin
       $divlist->SetHeader(array(
             array("string" => " ", "attach" => "style='text-align:center;width:20px;'"),
             array("string" => _("Blocklist name")." / "._("Department"), "attach" => "style=''"),
-            array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'" )));
+            array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'" )));
 
 
       $divlist->SetSummary(_("This table displays faxblocklists for the selected tree."));
@@ -331,7 +331,7 @@ class blocklist extends plugin
 
         $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), "attach" => "style=''");
-        $field3 = array("string" => "&nbsp;", "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+        $field3 = array("string" => "&nbsp;", "attach" => "style='width:60px;border-right:0px;text-align:right;'");
         $divlist->AddEntry(array($field1,$field2,$field3));
       }
 
@@ -344,7 +344,7 @@ class blocklist extends plugin
         $display= "[".$val["cn"][0]."]";
         $field1 = array("string" => sprintf($blockimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
         $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='".$val['dn']."'");
-        $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+        $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
         $divlist->AddEntry( array($field1,$field2,$field3));
       }
 

diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index 3e5814a845b2dabf4a7d7d1058c3a69d4123fa79..e36036a5dc576384b0a8aa4ce749197967239c75 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceManagment.inc
+++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc
@@ -315,7 +315,7 @@ class phoneConferenceManagment extends plugin
           array("string" =>_("Name - Number"), "attach" => "style=''"),
           array("string" => _("Owner"), "attach" => "style='width:200px;'"),
           array("string" => _("PIN"), "attach" => "style='width:50px;'"),
-          array("string" =>_("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'")));
+          array("string" =>_("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'")));
 
     /* Insert departments in divlist*/
     foreach($this->departments as $key=> $val){
@@ -336,7 +336,7 @@ class phoneConferenceManagment extends plugin
       $a_field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
       $a_field3 = array("string" => " ", "attach" => "style='width:200px;'");
       $a_field4 = array("string" => " ", "attach" => "style='width:50px;'");
-      $a_field5 = array("string" => " ",  "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+      $a_field5 = array("string" => " ",  "attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
       /* Add entries */
       $divlist->AddEntry(array($a_field1,$a_field2,$a_field3,$a_field4,$a_field5));
@@ -382,7 +382,7 @@ class phoneConferenceManagment extends plugin
       $a_field4 = array("string"=> $pin, "attach" => "style='width:50px;'");
 
       if(($this->ui->dn==$conference['goFonConferenceOwner'][0])&&(chkacl($this->acl,"goFonConferenceOwner")=="")){
-        $a_field5 = array("string"=>preg_replace("/%KEY%/",$conferencekey,$actions), "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+        $a_field5 = array("string"=>preg_replace("/%KEY%/",$conferencekey,$actions), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
       }elseif(chkacl($this->acl,"goFonConferenceOwner")==""){
         $a_field5 = array("string"=>preg_replace("/%KEY%/",$conferencekey,$actions2), "attach" => "style='width:52px;border-right:0px;text-align:right;'");
       }else{

diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc
index b0a3713fbb06281b2c659433873b41859df1fe57..22a2a0235b10e52496f0667781beb96e801db5a0 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacroManagement.inc
+++ b/plugins/gofon/macro/class_gofonMacroManagement.inc
@@ -344,7 +344,7 @@ class gofonMacro extends plugin
                               array("string" => " ", "attach" => "style='text-align:center;width:20px;'"),
                               array("string" => _("Username")." / "._("Department"), "attach" => "style=''"),
                               array("string" => _("Visible"), "attach" => "style='width:50px;'"),
-                              array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'" )));
+                              array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'" )));
 
 
     $divlist->SetSummary(_("This table displays all phone macros, in the selected tree."));
@@ -370,7 +370,7 @@ class gofonMacro extends plugin
       $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), "attach" => "style=''");
       $field3 = array("string" => "&nbsp;", "attach" => "style='width:50px;'");
-      $field4 = array("string" => "&nbsp;", "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+      $field4 = array("string" => "&nbsp;", "attach" => "style='width:60px;border-right:0px;text-align:right;'");
       $divlist->AddEntry(array($field1,$field2,$field3,$field4));
     }
 
@@ -400,7 +400,7 @@ class gofonMacro extends plugin
       $field1 = array("string" => sprintf($macroimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
       $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='".$val['dn']."'");
       $field3 = array("string" => $pic1, "attach" => "style='width:50px;'");
-      $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:52px;border-right:0px;text-align:right;'");
+      $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
 
       $divlist->AddEntry(array($field1,$field2,$field3,$field4));
     }