From bf70914688502c7abee5f0625158d6a47b37de96 Mon Sep 17 00:00:00 2001 From: janw Date: Sat, 19 Nov 2005 11:40:08 +0000 Subject: [PATCH] fixed style git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1983 594d385d-05f5-0310-b6e9-bd551577e9d8 --- include/class_divlist.inc | 258 +++++++++--------- .../class_applicationManagement.inc | 6 +- .../class_departmentManagement.inc | 4 +- plugins/admin/fai/class_faiManagement.inc | 6 +- .../admin/groups/class_groupManagement.inc | 6 +- .../admin/ogroups/class_ogroupManagement.inc | 6 +- .../admin/systems/class_systemManagement.inc | 6 +- plugins/admin/users/class_userManagement.inc | 6 +- .../blocklists/class_blocklistManagement.inc | 6 +- .../class_phoneConferenceManagment.inc | 6 +- .../macro/class_gofonMacroManagement.inc | 6 +- 11 files changed, 159 insertions(+), 157 deletions(-) diff --git a/include/class_divlist.inc b/include/class_divlist.inc index 497b40645..91fe65e16 100644 --- 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 "; + $s_return .= "\n "; } - $s_return .= "\n"; + $s_return .= "\n"; } $s_return .= "\n"; @@ -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
"; + // Only reduce width if we need a scrollbar (>19 Entries) - if($this->_numEntries()>=20) { + if($this->_numEntries()>19) { $s_return .= ""; } else { $s_return .= "
"; @@ -141,141 +142,142 @@ class divlist { /* If divlist is empty, append a single white entry */ if(count($this->a_entries)==0){ - $str = ""; - for($i = 0 ; $i < count($this->a_header[0]); $i++){ - $str.=""; - } - $str .=""; + $str = $s_return.""; + //for($i = 0 ; $i < count($this->a_header[0]); $i++){ + $str.=""; + //} + $str.="
 
 
"; 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"; + + $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"; + $s_return .= $s_value2['string']; + $s_return .= "\n"; + } + if($cnt == 0 ){ + $s_return.="\n "; + } - 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"; - - $cnt = 0; - - foreach($s_value as $s_key2 => $s_value2 ){ + $s_return .= "\n"; + } + } + + if(!(($stop)<$this->_numentries())){ + $nums = $stop - $this->_numentries();// - $stop; + for($i = 0 ; $i < $nums ; $i ++ ){ + $s_return.=""; + $cnt=0; + for($a = 0 ; $a < (count($this->a_header[0])) ; $a ++ ) { + if($a ==(count($this->a_header[0])-1)){ + $s_return.="\n "; + } else { + $s_return.="\n "; + } + } + $s_return.="\n"; + } + } + + if($this->b_displayPageNums){ + $s_return .= "".range_selector($this->_numentries(),$start,$this->i_entriesPerPage).""; + } + } 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"; + + $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"; - $s_return .= $s_value2['string']; - $s_return .= "\n"; - } - if($cnt == 0 ){ - $s_return.="\n "; - } - - $s_return .= "\n"; - } - } + 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.=""; - $cnt=0; - for($a = 0 ; $a < (count($this->a_header[0])) ; $a ++ ) { - if($a ==(count($this->a_header[0])-1)){ - $s_return.="\n "; - } else { - $s_return.="\n "; - } - } - $s_return.="\n"; - } - } + if(!isset($s_value2['attach'])){ + $style = ""; + } else { + $style = " ".$s_value2['attach']." " ; + } + + $s_return .= "\n"; + $s_return .= $s_value2['string']; + $s_return .= ""; + } + $s_return .= "\n"; + } + } - if($this->b_displayPageNums){ - $s_return .= "".range_selector($this->_numentries(),$start,$this->i_entriesPerPage).""; - } - } 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"; - - $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"; - $s_return .= $s_value2['string']; - $s_return .= ""; - } - $s_return .= "\n"; - } - } - - // 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.= " "; - } else { - $fill.= " "; + // 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.= " "; + } else { + $fill.= " "; + } } + $s_return.="\n$fill"; } - $s_return.="\n$fill"; + $s_return .= "\n"; + return $s_return; } - $s_return .= "\n"; - 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 8924f4382..465505913 100644 --- 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" => "department", "attach" => "style='text-align:center;width:20px;'"); $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); - $field3 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); + $field3 = array("string" => " ", "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 dbaece848..fa2aa3bda 100644 --- 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" => "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 3f87f0826..9d11242dc 100644 --- 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 = ""; @@ -501,7 +501,7 @@ class faiManagement extends plugin $field0 = array("string" => "department", "attach" => "style='text-align:center;width:20px;'"); $field1 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style='' title='".$title."'"); $field2 = array("string" => " ", "attach" => "style='width:200px;'"); - $field3 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); + $field3 = array("string" => " ", "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 277d1fa79..0c593b70a 100644 --- 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" => "department", "attach" => "style='text-align:center;width:20px;'"); $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); $field3 = array("string" => " ", "attach" => "style='width:136px;'"); - $field4 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); + $field4 = array("string" => " ", "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." ".$enviro." ".$mail." ".$samba." ".$appl." ".$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 971c99c6f..68c8a370b 100644 --- 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" => ""._("Department")."", "attach" => "style='text-align:center;width:20px;'"); $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); $field3 = array("string" => " ", "attach" => "style='width:136px;'"); - $field4 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); + $field4 = array("string" => " ", "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")."'> ". $field1 = array("string" => ""._("Object group")."", "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)." ".$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 6dee85647..61078cb99 100644 --- 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" => "department", "attach" => "style='text-align:center;width:20px;'"); $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); - $field3 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); + $field3 = array("string" => " ", "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 6a91294e9..623d7f3bb 100644 --- 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" => "department", "attach" => "style='text-align:center;width:20px;'"); $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); $field3 = array("string" => " ", "attach" => "style='width:152px;'"); - $field4 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); + $field4 = array("string" => " ", "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." ".$posix." ".$enviro." ".$maila." ".$fonac." ".$faxac." ".$samba." ".$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 b154c6807..6786efdc6 100644 --- 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" => "department", "attach" => "style='text-align:center;width:20px;'"); $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); - $field3 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); + $field3 = array("string" => " ", "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 3e5814a84..e36036a5d 100644 --- 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 b0a3713fb..22a2a0235 100755 --- 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" => "department", "attach" => "style='text-align:center;width:20px;'"); $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); $field3 = array("string" => " ", "attach" => "style='width:50px;'"); - $field4 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); + $field4 = array("string" => " ", "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)); } -- 2.30.2