From: cajus Date: Thu, 5 Nov 2009 11:21:36 +0000 (+0000) Subject: Updated settings X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5897d6e3e59ba04624d58fb9173659caab9a6a94;p=gosa.git Updated settings git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14756 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc index 0c3107aa2..8a86eb0cd 100644 --- a/gosa-core/plugins/admin/groups/class_groupManagement.inc +++ b/gosa-core/plugins/admin/groups/class_groupManagement.inc @@ -120,6 +120,14 @@ class groupManagement extends management "title" => _("Edit phone properties") ), + "gotoMenuGroup" => + array( + "image" => "plugins/groups/images/menu.png", + "plugin" => "groupApplication", + "alt" => _("Menu"), + "title" => _("Edit start menu properties") + ), + "gotoEnvironment" => array( "image" => "plugins/groups/images/environment.png", diff --git a/gosa-core/plugins/admin/groups/group-filter.tpl b/gosa-core/plugins/admin/groups/group-filter.tpl index c7ecdbd65..c115cd06c 100644 --- a/gosa-core/plugins/admin/groups/group-filter.tpl +++ b/gosa-core/plugins/admin/groups/group-filter.tpl @@ -8,8 +8,6 @@
-
- {$PRIMARY} 
{$SAMBA} 
{$MAIL} 
diff --git a/gosa-core/plugins/admin/groups/group-filter.xml b/gosa-core/plugins/admin/groups/group-filter.xml index 98e296fc4..0b49bfa32 100644 --- a/gosa-core/plugins/admin/groups/group-filter.xml +++ b/gosa-core/plugins/admin/groups/group-filter.xml @@ -9,7 +9,7 @@ - LDAP + GroupLDAP (&(objectClass=posixGroup)$NAME(|$PRIMARY$MAIL$SAMBA)) dn objectClass @@ -22,7 +22,7 @@ checkbox PRIMARY - + true (!(objectClass=gosaObject)) @@ -50,11 +50,11 @@ 60 - (|(cn=*$*)(sn=*$*)(givenName=*$*)) + (|(cn=*$*)(description=*$*)) true LDAP - (&(objectClass=posixGroup)(|(cn=*$NAME*))) + (&(objectClass=posixGroup)(|(cn=*$NAME*)(description=*$NAME*))) cn 0.5 3 diff --git a/gosa-core/plugins/admin/groups/group-list.xml b/gosa-core/plugins/admin/groups/group-list.xml index e24d4c203..a50f5130b 100644 --- a/gosa-core/plugins/admin/groups/group-list.xml +++ b/gosa-core/plugins/admin/groups/group-list.xml @@ -22,7 +22,7 @@ - |16px||250px|100px|170px;r| + |16px||250px|120px|150px;r| %{filter:objectType(dn,objectClass)}