From e315a2db90682734f0b90a9e1c305261847d58ed Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 26 Jun 2006 05:41:46 +0000 Subject: [PATCH] All management dialogs : Added dynamic width to action col git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3885 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../applications/class_divListApplication.inc | 16 ++++++++++++---- .../departments/class_divListDepartment.inc | 16 ++++++++++++++-- plugins/admin/fai/class_divListFai.inc | 16 ++++++++++++++-- plugins/admin/groups/class_divListGroup.inc | 17 ++++++++++++++--- plugins/admin/ogroups/class_divListOGroup.inc | 16 ++++++++++++++-- plugins/admin/systems/class_divListSystem.inc | 16 ++++++++++++++-- plugins/admin/users/class_divListUsers.inc | 16 ++++++++++++++-- .../blocklists/class_divListBlocklists.inc | 16 ++++++++++++++-- .../conference/class_divListConferences.inc | 19 +++++++++++++++---- plugins/gofon/macro/class_divListMacros.inc | 16 ++++++++++++++-- 10 files changed, 139 insertions(+), 25 deletions(-) diff --git a/plugins/admin/applications/class_divListApplication.inc b/plugins/admin/applications/class_divListApplication.inc index 525840bbf..52c69425e 100755 --- a/plugins/admin/applications/class_divListApplication.inc +++ b/plugins/admin/applications/class_divListApplication.inc @@ -42,9 +42,14 @@ class divListApplication extends MultiSelectWindow $this->EnableSaveButton (false); /* set Page header */ + $action_col_size = 70; + if($this->parent->snapshotEnabled()){ + $action_col_size += 38; + } + $this->AddHeader(array("string" => " ", "attach" => "style='text-align:center;width:20px;'")); $this->AddHeader(array("string" => _("Application name")." / "._("Department"), "attach" => "style=''")); - $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:110px;border-right:0px;text-align:right;'")); + $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'")); /* Add SubSearch checkbox */ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false); @@ -139,8 +144,11 @@ class divListApplication extends MultiSelectWindow $applimg = "A"; $empty = ""; - - + /* set Page header */ + $action_col_size = 70; + if($this->parent->snapshotEnabled()){ + $action_col_size += 38; + } /******************** Attach objects @@ -170,7 +178,7 @@ class divListApplication extends MultiSelectWindow } $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:110px;border-right:0px;text-align:right;'"); + $field3 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"); $this->AddElement(array($field1,$field2,$field3)); } } diff --git a/plugins/admin/departments/class_divListDepartment.inc b/plugins/admin/departments/class_divListDepartment.inc index cda30ee7f..f03145108 100755 --- a/plugins/admin/departments/class_divListDepartment.inc +++ b/plugins/admin/departments/class_divListDepartment.inc @@ -36,10 +36,16 @@ class divListDepartment extends MultiSelectWindow $this->EnableCloseButton(false); $this->EnableSaveButton (false); + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 50; + if($this->parent->snapshotEnabled()){ + $action_col_size += 20; + } + /* set Page header */ $this->AddHeader(array("string" => " ", "attach" => "style='text-align:center;width:20px;'")); $this->AddHeader(array("string"=>_("Department name"), "attach" => "style=''")); - $this->AddHeader(array("string" =>_("Actions"), "attach" => "style='width:80px;border-right:0px;text-align:right;'")); + $this->AddHeader(array("string" =>_("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'")); /* Add SubSearch checkbox */ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false); @@ -103,6 +109,12 @@ class divListDepartment extends MultiSelectWindow $linkopen = "%s"; + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 50; + if($this->parent->snapshotEnabled()){ + $action_col_size += 20; + } + foreach($list as $key => $val) { $cdn= convert_department_dn($val['dn']); @@ -133,7 +145,7 @@ class divListDepartment extends MultiSelectWindow $title = preg_replace('/ /', ' ', @LDAP::fix($this->config->departments[$key])); $field0 = array("string" => "department", "attach" => "style='text-align:center;width:20px;'"); $field1 = array("string" => sprintf($linkopen,base64_encode($cdn),$disp), "attach" => "style='' title='".$title."'"); - $field2 = array("string" => preg_replace("/%KEY%/", base64_encode($key), $actions), "attach" => "style='width:80px;border-right:0px;text-align: + $field2 = array("string" => preg_replace("/%KEY%/", base64_encode($key), $actions), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align: right;'"); $this->AddElement( array($field0,$field1,$field2)); diff --git a/plugins/admin/fai/class_divListFai.inc b/plugins/admin/fai/class_divListFai.inc index 7d910064d..b308def3c 100644 --- a/plugins/admin/fai/class_divListFai.inc +++ b/plugins/admin/fai/class_divListFai.inc @@ -53,11 +53,17 @@ class divListFai extends MultiSelectWindow $this->EnableCloseButton(false); $this->EnableSaveButton (false); + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 50; + if($this->parent->snapshotEnabled()){ + $action_col_size += 20; + } + /* set Page header */ $this->AddHeader(array("string" => " ", "attach" => "style='text-align:center;width:20px;'")); $this->AddHeader(array("string" => _("Name of FAI class"), "attach" => "style=''")); $this->AddHeader(array("string" => _("Class type"), "attach" => "style='width:200px;'")); - $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:90px;border-right:0px;text-align:right;'")); + $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'")); $this->AddCheckBox("ShowProfiles" , _("Display FAI profile objects") ,_("Show profiles") ,true); $this->AddCheckBox("ShowTemplates" , _("Display FAI template objects") ,_("Show templates") ,true); @@ -185,6 +191,12 @@ _("Submit")."'> ". $editlink ="%NAME%"; + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 50; + if($this->parent->snapshotEnabled()){ + $action_col_size += 20; + } + /******************** Attach objects ********************/ @@ -229,7 +241,7 @@ _("Submit")."'> ". $field1 = array("string" => $img , "attach" => "style='text-align:center;width:20px;'"); $field2 = array("string" => preg_replace(array("/%KEY%/","/%NAME%/","/%TITLE%/"),array($key,$value['cn'].$desc,preg_replace('/ /', ' ', @LDAP::fix($value['dn']))),$edi) , "attach" => "style=''"); $field3 = array("string" => $info, "attach" => "style='width:200px;'"); - $field4 = array("string" => preg_replace("/%KEY%/",$key,$acti) , "attach" => "style='width:90px;border-right:0px;text-align:right;'"); + $field4 = array("string" => preg_replace("/%KEY%/",$key,$acti) , "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"); $this->AddElement(array($field1,$field2,$field3,$field4)); } } diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc index 13e97e2ac..0e8ac98f1 100644 --- a/plugins/admin/groups/class_divListGroup.inc +++ b/plugins/admin/groups/class_divListGroup.inc @@ -44,11 +44,17 @@ class divListGroup extends MultiSelectWindow $this->EnableCloseButton(false); $this->EnableSaveButton (false); + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 70; + if($this->parent->snapshotEnabled()){ + $action_col_size += 38; + } + /* set Page header */ $this->AddHeader(array("string"=>" ","attach"=>"style='width:20px;'")); $this->AddHeader(array("string"=>_("Groupname / Department"))); $this->AddHeader(array("string"=>_("Properties"),"attach"=>"style='width:136px;'")); - $this->AddHeader(array("string"=>_("Actions"),"attach"=>"style='width:110px;border-right:0px;'")); + $this->AddHeader(array("string"=>_("Actions"),"attach"=>"style='width:".$action_col_size."px;border-right:0px;'")); /* Text ,Value ,Name ,Is selected */ $this->AddCheckBox("ShowPrimaryGroups", _("Select to see groups that are primary groups of users"), _("Show primary groups"), true); @@ -129,6 +135,12 @@ class divListGroup extends MultiSelectWindow $editlink = "%s"; $userimg = "User"; + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 70; + if($this->parent->snapshotEnabled()){ + $action_col_size += 38; + } + /* Assign extension images */ $posiximg = ""; @@ -146,7 +158,6 @@ class divListGroup extends MultiSelectWindow // Space $empty = ""; - // User and Template Images $editlink = "%s"; @@ -194,7 +205,7 @@ class divListGroup extends MultiSelectWindow $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" => preg_replace("/%KEY%/", $key, $posix." ".$enviro." ".$mail." ".$samba." ".$appl." ".$phone), "attach" => "style='width:136px;'"); - $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:110px;border-right:0px;text-align:right;'"); + $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"); $this->AddElement(array($field1,$field2,$field3,$field4)); } diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc index eda23fd01..073286cbf 100755 --- a/plugins/admin/ogroups/class_divListOGroup.inc +++ b/plugins/admin/ogroups/class_divListOGroup.inc @@ -47,11 +47,17 @@ class divListOGroup extends MultiSelectWindow $this->EnableCloseButton(false); $this->EnableSaveButton (false); + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 70; + if($this->parent->snapshotEnabled()){ + $action_col_size += 38; + } + /* set Page header */ $this->AddHeader(array("string" => " ", "attach" => "style='text-align:center;width:20px;'")); $this->AddHeader(array("string" => _("Name of object groups")." / "._("Departments"), "attach" => "style=''")); $this->AddHeader(array("string" => _("Properties"), "attach" => "style='width:136px;'")); - $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:130px;border-right:0px;text-align:right;'")); + $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'")); /* Text ,Value ,Name ,Is selected */ $this->AddCheckBox("UserGroups" , _("Select to see groups containing users") , _("Show groups containing users"), true); @@ -141,6 +147,12 @@ class divListOGroup extends MultiSelectWindow $mailimg = "M"; $empty = ""; + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 70; + if($this->parent->snapshotEnabled()){ + $action_col_size += 38; + } + // Assigning ogroups foreach($list as $key => $val){ @@ -172,7 +184,7 @@ class divListOGroup extends MultiSelectWindow $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" => preg_replace("/%KEY/", $key, $this->parent->convert_list($val))." ".$mail, "attach" => "style='width:136px;'"); - $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:130px;border-right:0px;text-align:right;'"); + $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"); $this->AddElement(array($field1,$field2,$field3,$field4)); } diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc index 3cdd8cb9e..ef1d87d72 100644 --- a/plugins/admin/systems/class_divListSystem.inc +++ b/plugins/admin/systems/class_divListSystem.inc @@ -47,10 +47,16 @@ class divListSystem extends MultiSelectWindow $this->EnableCloseButton(false); $this->EnableSaveButton (false); + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 50; + if($this->parent->snapshotEnabled()){ + $action_col_size += 38; + } + /* set Page header */ $this->AddHeader(array("string"=>" ","attach"=>"style='width:20px;'")); $this->AddHeader(array("string"=>_("System / Department"))); - $this->AddHeader(array("string"=>_("Actions"),"attach"=>"style='width:90px;border-right:0px;'")); + $this->AddHeader(array("string"=>_("Actions"),"attach"=>"style='width:".$action_col_size."px;border-right:0px;'")); /* Text ,Value ,Name ,Is selected */ $this->AddCheckBox("ShowServers", _("Select to see servers"), _("Show servers"), true); @@ -141,6 +147,12 @@ class divListSystem extends MultiSelectWindow $empty =" "; + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 50; + if($this->parent->snapshotEnabled()){ + $action_col_size += 38; + } + // User and Template Images $editlink = "%s"; @@ -192,7 +204,7 @@ class divListSystem extends MultiSelectWindow $img = $this->parent->convert_list($val); $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='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'"); - $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action), "attach" => "style='width:90px;border-right:0px;text-align:right;'"); + $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"); $this->AddElement( array($field1,$field2,$field3)); } diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc index d9e7d434e..d67c62bfb 100644 --- a/plugins/admin/users/class_divListUsers.inc +++ b/plugins/admin/users/class_divListUsers.inc @@ -45,11 +45,17 @@ class divListUsers extends MultiSelectWindow $this->EnableCloseButton(false); $this->EnableSaveButton (false); + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 88; + if($this->parent->snapshotEnabled()){ + $action_col_size += 38; + } + /* set Page header */ $this->AddHeader(array("string"=>" ", "attach"=>"style='width:20px;'")); $this->AddHeader(array("string"=>_("Username")." / "._("Department"))); $this->AddHeader(array("string"=>_("Properties"), "attach" => "style='width:152px;'")); - $this->AddHeader(array("string"=>_("Actions"), "attach" => "style='width:132px;border-right:0px;text-align:right;'")); + $this->AddHeader(array("string"=>_("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'")); $this->AddCheckBox("ShowTemplates" ,_("Select to see template pseudo users") ,_("Show templates") , false); $this->AddCheckBox("ShowFunctionalUsers",_("Select to see users that have only a GOsa object"),_("Show functional users") , true); @@ -140,6 +146,12 @@ class divListUsers extends MultiSelectWindow $tplimg = "Template"; $editlink = "%s"; + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 88; + if($this->parent->snapshotEnabled()){ + $action_col_size += 38; + } + /* Possilbe objectClass image combinations */ $possibleAccounts = array( "posixAccount" => array("VAR"=>"posix" ,"IMG"=>"posiximg"), @@ -290,7 +302,7 @@ class divListUsers extends MultiSelectWindow $field2 = array("string" => sprintf($editlink,$key,$display).$ip_port, "attach" => "style='' title='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'"); $field3 = array("string" => $UseImg, "attach" => "style='width:152px;'"); $field4 = array("string" => $s_img_create_from_template.preg_replace("/%KEY%/", "$key", $action), - "attach" => "style='width:132px;border-right:0px; text-align:right;'"); + "attach" => "style='width:".$action_col_size."px;border-right:0px; text-align:right;'"); /* Add to list */ $add = array($field1,$field2,$field3,$field4); $this->AddElement($add); diff --git a/plugins/gofax/blocklists/class_divListBlocklists.inc b/plugins/gofax/blocklists/class_divListBlocklists.inc index e2591a2e1..e99ca587b 100755 --- a/plugins/gofax/blocklists/class_divListBlocklists.inc +++ b/plugins/gofax/blocklists/class_divListBlocklists.inc @@ -41,10 +41,16 @@ class divListBlocklist extends MultiSelectWindow $this->EnableCloseButton(false); $this->EnableSaveButton (false); + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 50; + if($this->parent->snapshotEnabled()){ + $action_col_size += 20; + } + /* set Page header */ $this->AddHeader(array("string" => " ", "attach" => "style='text-align:center;width:20px;'")); $this->AddHeader(array("string" => _("Blocklist name")." / "._("Department"), "attach" => "style=''")); - $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:90px;border-right:0px;text-align:right;'" )); + $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'" )); /* Add Checkboxes / SubSearch checkbox */ $this->AddCheckBox("ShowSendBocklists" , _("Select to see send blocklists"), _("Show send blocklists"),true); @@ -112,6 +118,12 @@ class divListBlocklist extends MultiSelectWindow $blockimg = "User"; $editlink = "%s"; + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 50; + if($this->parent->snapshotEnabled()){ + $action_col_size += 20; + } + /* Append to list */ foreach($list as $key => $val){ @@ -123,7 +135,7 @@ class divListBlocklist extends MultiSelectWindow $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='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'"); - $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:90px;border-right:0px;text-align:right;'"); + $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"); $this->AddElement( array($field1,$field2,$field3)); } } diff --git a/plugins/gofon/conference/class_divListConferences.inc b/plugins/gofon/conference/class_divListConferences.inc index 910eb64ae..7276357fb 100755 --- a/plugins/gofon/conference/class_divListConferences.inc +++ b/plugins/gofon/conference/class_divListConferences.inc @@ -41,12 +41,18 @@ class divListConference extends MultiSelectWindow $this->EnableCloseButton(false); $this->EnableSaveButton (false); + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 50; + if($this->parent->snapshotEnabled()){ + $action_col_size += 20; + } + /* set Page header */ $this->AddHeader(array("string" => " ", "attach" => "style='text-align:center;width:20px;'")); $this->AddHeader(array("string" =>_("Name - Number"), "attach" => "style=''")); $this->AddHeader(array("string" => _("Owner"), "attach" => "style='width:200px;'")); $this->AddHeader(array("string" => _("PIN"), "attach" => "style='width:50px;'")); - $this->AddHeader(array("string" =>_("Actions"), "attach" => "style='width:90px;border-right:0px;text-align:right;'")); + $this->AddHeader(array("string" =>_("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'")); /* Add Checkboxes / SubSearch checkbox */ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false); @@ -110,9 +116,14 @@ class divListConference extends MultiSelectWindow $userimg = "User"; $editlink = "%s"; - - /* Insert conferneces*/ + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 50; + if($this->parent->snapshotEnabled()){ + $action_col_size += 20; + } + + /* Insert conferneces*/ foreach($list as $conferencekey => $conference ){ $action = $this->GetSnapShotActions($conference['dn']); @@ -157,7 +168,7 @@ class divListConference extends MultiSelectWindow $a_field4 = array("string"=> $pin, "attach" => $title." style='width:50px;'"); if(($this->parent->ui->dn==$conference['goFonConferenceOwner'][0])&&(chkacl($this->parent->acl,"goFonConferenceOwner")=="")){ - $a_field5 = array("string"=>preg_replace("/%KEY%/",$conferencekey,$action.$actions), "attach" => $title."style='width:90px;border-right:0px;text-align:right;'"); + $a_field5 = array("string"=>preg_replace("/%KEY%/",$conferencekey,$action.$actions), "attach" => $title."style='width:".$action_col_size."px;border-right:0px;text-align:right;'"); }elseif(chkacl($this->parent->acl,"goFonConferenceOwner")==""){ $a_field5 = array("string"=>preg_replace("/%KEY%/",$conferencekey,$action.$actions2), "attach" => $title."style='width:52px;border-right:0px;text-align:right;'"); }else{ diff --git a/plugins/gofon/macro/class_divListMacros.inc b/plugins/gofon/macro/class_divListMacros.inc index 918c91399..73e3c0a50 100755 --- a/plugins/gofon/macro/class_divListMacros.inc +++ b/plugins/gofon/macro/class_divListMacros.inc @@ -41,11 +41,17 @@ class divListMacro extends MultiSelectWindow $this->EnableCloseButton(false); $this->EnableSaveButton (false); + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 50; + if($this->parent->snapshotEnabled()){ + $action_col_size += 20; + } + /* set Page header */ $this->AddHeader(array("string" => " ", "attach" => "style='text-align:center;width:20px;'")); $this->AddHeader(array("string" => _("macro name")." / "._("Department"), "attach" => "style=''")); $this->AddHeader(array("string" => _("Visible"), "attach" => "style='width:50px;'")); - $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:90px;border-right:0px;text-align:right;'" )); + $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'" )); /* Add Checkboxes / SubSearch checkbox */ $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false); @@ -117,6 +123,12 @@ class divListMacro extends MultiSelectWindow $invisible = ""._("no").""; $editlink = "%s"; + /* Dynamic action col, depending on snapshot icons */ + $action_col_size = 50; + if($this->parent->snapshotEnabled()){ + $action_col_size += 20; + } + foreach($list as $key => $val){ $action = $this->GetSnapShotActions($val['dn']); @@ -136,7 +148,7 @@ class divListMacro extends MultiSelectWindow $field1 = array("string" => sprintf($macroimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'"); $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'"); $field3 = array("string" => $pic1, "attach" => "style='width:50px;'"); - $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:90px;border-right:0px;text-align:right;'"); + $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"); $this->AddElement(array($field1,$field2,$field3,$field4)); } -- 2.30.2