From 5911441e8460700302accbdc64249b2207324415 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 8 Aug 2007 11:19:29 +0000 Subject: [PATCH] Updated list summary, using images instead of object names git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@7000 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../applications/class_divListApplication.inc | 8 +- .../departments/class_divListDepartment.inc | 5 +- plugins/admin/fai/class_divListFai.inc | 56 ++++++------- plugins/admin/groups/class_divListGroup.inc | 16 ++-- .../mimetypes/class_divListMimeTypes.inc | 14 +++- plugins/admin/ogroups/class_divListOGroup.inc | 16 ++-- plugins/admin/systems/class_divListSystem.inc | 78 +++++++++---------- plugins/admin/users/class_divListUsers.inc | 23 +++--- .../blocklists/class_divListBlocklists.inc | 16 ++-- .../conference/class_divListConferences.inc | 15 ++-- plugins/gofon/macro/class_divListMacros.inc | 16 ++-- 11 files changed, 144 insertions(+), 119 deletions(-) diff --git a/plugins/admin/applications/class_divListApplication.inc b/plugins/admin/applications/class_divListApplication.inc index 55edfc77f..2d93cfc71 100755 --- a/plugins/admin/applications/class_divListApplication.inc +++ b/plugins/admin/applications/class_divListApplication.inc @@ -195,10 +195,10 @@ class divListApplication extends MultiSelectWindow $num_app_str = _("Number of listed applications"); $num_dep_str = _("Number of listed departments"); - $str = " ".$num_app_str." #".$num_apps; - $str.= " ".$num_dep_str." #".$num_deps; + $str = "".$num_app_str." ".$num_apps."    "; + $str.= "".$num_dep_str." ".$num_deps."    "; $this->set_List_Bottom_Info($str); } diff --git a/plugins/admin/departments/class_divListDepartment.inc b/plugins/admin/departments/class_divListDepartment.inc index ea209b428..e1f6cb612 100755 --- a/plugins/admin/departments/class_divListDepartment.inc +++ b/plugins/admin/departments/class_divListDepartment.inc @@ -125,8 +125,9 @@ class divListDepartment extends MultiSelectWindow /* Create summary string for list footer */ $num_deps=count($list); - $str = $num_deps." "; - $num_deps != 1 ? $str.=_("Departments") : $str .= _("Department"); + $num_dep_str = _("Number of listed departments"); + $str = "".$num_dep_str." ".$num_deps."    "; $this->set_List_Bottom_Info($str); } diff --git a/plugins/admin/fai/class_divListFai.inc b/plugins/admin/fai/class_divListFai.inc index 78c3cf05c..e8e9cafd9 100644 --- a/plugins/admin/fai/class_divListFai.inc +++ b/plugins/admin/fai/class_divListFai.inc @@ -259,38 +259,32 @@ class divListFai extends MultiSelectWindow $num_deps = count($this->Added_Departments); } - /* Profile */ - $str = $cnts['FAIprofile']." "; - $cnts['FAIprofile'] != 1 ? $str.=_("Profiles").", " : $str .= _("Profile").", "; - - /* Scripts */ - $str.= $cnts['FAIpartitionTable']." "; - $cnts['FAIpartitionTable'] != 1 ? $str.=_("Partitions").", " : $str .= _("Partition").", "; - - /* Scripts */ - $str.= $cnts['FAIscript']." "; - $cnts['FAIscript'] != 1 ? $str.=_("Scripts").", " : $str .= _("Script").", "; - - /* Hooks */ - $str.= $cnts['FAIhook']." "; - $cnts['FAIhook'] != 1 ? $str.=_("Hooks").", " : $str .= _("Hook").", "; - - /* Variables */ - $str.= $cnts['FAIvariable']." "; - $cnts['FAIvariable'] != 1 ? $str.=_("Variables").", " : $str .= _("Variable").", "; - - /* Templates */ - $str.= $cnts['FAItemplate']." "; - $cnts['FAItemplate'] != 1 ? $str.=_("Templates").", " : $str .= _("Template").", "; - - /* Packages */ - $str.= $cnts['FAIpackageList']." "; - $cnts['FAIpackageList'] != 1 ? $str.=_("Package lists").", ": $str .= _("Package list").", "; - - $str.= $num_deps." "; - $num_deps != 1 ? $str.=_("Departments") : $str .= _("Department"); + $profile_str = _("Number of listed profiles"); + $partition_str = _("Number of listed partitions"); + $script_str = _("Number of listed scripts"); + $hook_str = _("Number of listed hooks"); + $variable_str = _("Number of listed variables"); + $template_str = _("Number of listed templates"); + $package_str = _("Number of listed packages"); + $dep_str = _("Number of listed departments"); + + $str = "".$profile_str." ".$cnts['FAIprofile']."    "; + $str.= "".$partition_str." ".$cnts['FAIpartitionTable']."    "; + $str.= "".$script_str." ".$cnts['FAIscript']."    "; + $str.= "".$hook_str." ".$cnts['FAIhook']."    "; + $str.= "".$variable_str." ".$cnts['FAIvariable']."    "; + $str.= "".$template_str." ".$cnts['FAItemplate']."    "; + $str.= "".$package_str." ".$cnts['FAIpackageList']."    "; + $str.= "".$dep_str." ".$num_deps."    "; $this->set_List_Bottom_Info($str); - } function Save() diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc index a9a269480..ccce7cc9b 100644 --- a/plugins/admin/groups/class_divListGroup.inc +++ b/plugins/admin/groups/class_divListGroup.inc @@ -207,12 +207,18 @@ class divListGroup extends MultiSelectWindow if(!$this->SubSearch){ $num_deps = count($this->Added_Departments); } - $num_groups = count($groups); - $str = $num_groups." "; - $num_groups != 1 ? $str.=_("Groups").", " : $str .= _("Group").", "; - $str.= $num_deps." "; - $num_deps != 1 ? $str.=_("Departments") : $str .= _("Department"); + $num_grps = count($groups); + + $num_grp_str = _("Number of listed groups"); + $num_dep_str = _("Number of listed departments"); + + $str = "".$num_grp_str." ".$num_grps."    "; + $str.= "".$num_dep_str." ".$num_deps."    "; + $this->set_List_Bottom_Info($str); + } function Save() diff --git a/plugins/admin/mimetypes/class_divListMimeTypes.inc b/plugins/admin/mimetypes/class_divListMimeTypes.inc index 949343ef5..3a037d02d 100755 --- a/plugins/admin/mimetypes/class_divListMimeTypes.inc +++ b/plugins/admin/mimetypes/class_divListMimeTypes.inc @@ -189,16 +189,22 @@ class divListMimeTypes extends MultiSelectWindow $this->AddElement(array($field1,$field2,$field3)); } + /* Create summary string for list footer */ $num_deps=0; if(!$this->SubSearch){ $num_deps = count($this->Added_Departments); } $num_objs = count($list); - $str = $num_objs." "; - $num_objs != 1 ? $str.=_("Mimetypes").", " : $str .= _("Mimetype").", "; - $str.= $num_deps." "; - $num_deps != 1 ? $str.=_("Departments") : $str .= _("Department"); + + $num_obj_str = _("Number of listed mimetypes"); + $num_dep_str = _("Number of listed departments"); + + $str = "".$num_obj_str." ".$num_objs."    "; + $str.= "".$num_dep_str." ".$num_deps."    "; + $this->set_List_Bottom_Info($str); } diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc index d19804b91..c288e6137 100755 --- a/plugins/admin/ogroups/class_divListOGroup.inc +++ b/plugins/admin/ogroups/class_divListOGroup.inc @@ -171,17 +171,23 @@ class divListOGroup extends MultiSelectWindow $this->AddElement(array($field1,$field2,$field3,$field4)); } - + + /* Create summary string for list footer */ $num_deps=0; if(!$this->SubSearch){ $num_deps = count($this->Added_Departments); } $num_objs = count($list); - $str = $num_objs." "; - $num_objs != 1 ? $str.=_("Object groups").", " : $str .= _("Object group").", "; - $str.= $num_deps." "; - $num_deps != 1 ? $str.=_("Departments") : $str .= _("Department"); + + $num_obj_str = _("Number of listed object groups"); + $num_dep_str = _("Number of listed departments"); + + $str = "".$num_obj_str." ".$num_objs."    "; + $str.= "".$num_dep_str." ".$num_deps."    "; + $this->set_List_Bottom_Info($str); } diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc index 33be96ad1..f65a79c4d 100644 --- a/plugins/admin/systems/class_divListSystem.inc +++ b/plugins/admin/systems/class_divListSystem.inc @@ -209,50 +209,42 @@ class divListSystem extends MultiSelectWindow } - /* Create summary string for list footer */ - $num_deps=0; - if(!$this->SubSearch){ - $num_deps = count($this->Added_Departments); - } - - $str =""; - - /* Servers */ - $str.= $cnts['server']." "; - $cnts['server'] != 1 ? $str.=_("Servers").", " : $str .= _("Server").", "; - - /* Workstations */ - $str.= $cnts['workstation']." "; - $cnts['workstation'] != 1 ? $str.=_("Workstations").", ": $str .= _("Workstation").", "; - - /* Terminals */ - $str.= $cnts['terminal']." "; - $cnts['terminal'] != 1 ? $str.=_("Terminals").", " : $str .= _("Terminal").", "; - - /* Phones */ - $str.= $cnts['phone']." "; - $cnts['phone'] != 1 ? $str.=_("Phones").", " : $str .= _("Phone").", "; - - /* Printer */ - $str.= $cnts['printer']." "; - $cnts['printer'] != 1 ? $str.=_("Printers").", " : $str .= _("Printer").", "; - - /* Components */ - $str.= $cnts['component']." "; - $cnts['component'] != 1 ? $str.=_("Components").", " : $str .= _("Component").", "; - - /* New devices */ - $str.= $cnts['NewDevice']." "; - $cnts['NewDevice'] != 1 ? $str.=_("New devices").", " : $str .= _("New device").", "; - - /* Windows workstations */ - $str.= $cnts['winstation']." "; - $cnts['winstation'] != 1 ? $str.=_("Windows workstations").", " : $str .= _("Windows workstation").", "; - - $str.= $num_deps." "; - $num_deps != 1 ? $str.=_("Departments") : $str .= _("Department"); - $this->set_List_Bottom_Info($str); + /* Create summary string for list footer */ + $num_deps=0; + if(!$this->SubSearch){ + $num_deps = count($this->Added_Departments); + } + $num_ser_str = _("Number of listed servers"); + $num_ws_str = _("Number of listed workstations"); + $num_ter_str = _("Number of listed terminals"); + $num_pho_str = _("Number of listed phones"); + $num_prt_str = _("Number of listed printers"); + $num_com_str = _("Number of listed network components"); + $num_new_str = _("Number of listed new devices"); + $num_wws_str = _("Number of listed windows workstations"); + $num_dep_str = _("Number of listed departments"); + + $str = "".$num_ser_str." ".$cnts['server']."    "; + $str.= "".$num_ws_str." ".$cnts['workstation']."    "; + $str.= "".$num_ter_str." ".$cnts['terminal']."    "; + $str.= "".$num_pho_str." ".$cnts['phone']."    "; + $str.= "".$num_prt_str." ".$cnts['printer']."    "; + $str.= "".$num_com_str." ".$cnts['component']."    "; + $str.= "".$num_new_str." ".$cnts['NewDevice']."    "; + $str.= "".$num_wws_str." ".$cnts['winstation']."    "; + $str.= "".$num_dep_str." ".$num_deps."    "; + + $this->set_List_Bottom_Info($str); } function Save() diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc index 0a250af9b..2314a077a 100644 --- a/plugins/admin/users/class_divListUsers.inc +++ b/plugins/admin/users/class_divListUsers.inc @@ -266,18 +266,23 @@ class divListUsers extends MultiSelectWindow $users[strtolower( $val['sn']['0'].$val['uid']['0'])]=$add; } } - - /* Create summary string for list footer */ + + + /* Create summary string for list footer */ $num_deps=0; - if(!$this->SubSearch){ + if(!$this->SubSearch){ $num_deps = count($this->Added_Departments); } - $str = $num_users." "; - $num_users != 1 ? $str.=_("Users").", " : $str .= _("User").", "; - $str.= $num_templates." "; - $num_templates != 1 ? $str.=_("Templates").", " : $str .= _("Template").", "; - $str.= $num_deps." "; - $num_deps != 1 ? $str.=_("Departments") : $str .= _("Department"); + $num_users = count($list); + + $num_user_str = _("Number of listed users"); + $num_dep_str = _("Number of listed departments"); + + $str = "".$num_user_str." ".$num_users."    "; + $str.= "".$num_dep_str." ".$num_deps."    "; + $this->set_List_Bottom_Info($str); } diff --git a/plugins/gofax/blocklists/class_divListBlocklists.inc b/plugins/gofax/blocklists/class_divListBlocklists.inc index 431f2fbe8..8b85db867 100755 --- a/plugins/gofax/blocklists/class_divListBlocklists.inc +++ b/plugins/gofax/blocklists/class_divListBlocklists.inc @@ -114,12 +114,18 @@ class divListBlocklist extends MultiSelectWindow if(!$this->SubSearch){ $num_deps = count($this->Added_Departments); } - $num_lists = count($list); - $str = $num_lists." "; - $num_lists != 1 ? $str.=_("Blocklists").", " : $str .= _("Blocklist").", "; - $str.= $num_deps." "; - $num_deps != 1 ? $str.=_("Departments") : $str .= _("Department"); + $num_objs = count($list); + + $num_obj_str = _("Number of listed blocklists"); + $num_dep_str = _("Number of listed departments"); + + $str = "".$num_obj_str." ".$num_objs."    "; + $str.= "".$num_dep_str." ".$num_deps."    "; + $this->set_List_Bottom_Info($str); + } function Save() diff --git a/plugins/gofon/conference/class_divListConferences.inc b/plugins/gofon/conference/class_divListConferences.inc index f7fa107ee..51e9f0efe 100755 --- a/plugins/gofon/conference/class_divListConferences.inc +++ b/plugins/gofon/conference/class_divListConferences.inc @@ -161,11 +161,16 @@ class divListConference extends MultiSelectWindow if(!$this->SubSearch){ $num_deps = count($this->Added_Departments); } - $num_lists = count($list); - $str = $num_lists." "; - $num_lists != 1 ? $str.=_("Conferences").", " : $str .= _("Conference").", "; - $str.= $num_deps." "; - $num_deps != 1 ? $str.=_("Departments") : $str .= _("Department"); + $num_objs = count($list); + + $num_obj_str = _("Number of listed conferences"); + $num_dep_str = _("Number of listed departments"); + + $str = "".$num_obj_str." ".$num_objs."    "; + $str.= "".$num_dep_str." ".$num_deps."    "; + $this->set_List_Bottom_Info($str); } diff --git a/plugins/gofon/macro/class_divListMacros.inc b/plugins/gofon/macro/class_divListMacros.inc index c2d50f6c4..12b709d5d 100755 --- a/plugins/gofon/macro/class_divListMacros.inc +++ b/plugins/gofon/macro/class_divListMacros.inc @@ -133,13 +133,17 @@ class divListMacro extends MultiSelectWindow if(!$this->SubSearch){ $num_deps = count($this->Added_Departments); } - $num_lists = count($list); - $str = $num_lists." "; - $num_lists != 1 ? $str.=_("Macros").", " : $str .= _("Macro").", "; - $str.= $num_deps." "; - $num_deps != 1 ? $str.=_("Departments") : $str .= _("Department"); - $this->set_List_Bottom_Info($str); + $num_objs = count($list); + + $num_obj_str = _("Number of listed macros"); + $num_dep_str = _("Number of listed departments"); + $str = "".$num_obj_str." ".$num_objs."    "; + $str.= "".$num_dep_str." ".$num_deps."    "; + + $this->set_List_Bottom_Info($str); } function Save() -- 2.30.2