From: hickert Date: Tue, 16 Mar 2010 07:17:38 +0000 (+0000) Subject: Updated group filter. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fd1fa1e0e2558db4730b83cac88b86393e3bbb53;p=gosa.git Updated group filter. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16560 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/plugins/admin/groups/group-filter.tpl b/gosa-core/plugins/admin/groups/group-filter.tpl deleted file mode 100644 index e9ea7e1d0..000000000 --- a/gosa-core/plugins/admin/groups/group-filter.tpl +++ /dev/null @@ -1,37 +0,0 @@ -
-

- [F]{t}Filter{/t} -

-
- -
- -
- - {$PRIMARY} 
- {$SAMBA} 
- {$MAIL} 
- - {$SCOPE} - - - - - - -
- - - {$NAME} -
- - - - - -
- {$APPLY} -
-
diff --git a/gosa-core/plugins/admin/groups/group-filter.xml b/gosa-core/plugins/admin/groups/group-filter.xml index 0b49bfa32..5b0c68908 100644 --- a/gosa-core/plugins/admin/groups/group-filter.xml +++ b/gosa-core/plugins/admin/groups/group-filter.xml @@ -3,62 +3,41 @@ groups - true + auto + default + dn + objectClass + cn + description + default + GroupLDAP (&(objectClass=posixGroup)$NAME(|$PRIMARY$MAIL$SAMBA)) - dn - objectClass - cn - description - auto + + cn + 0.5 + 3 + - - checkbox - PRIMARY - true - - (!(objectClass=gosaObject)) - - - - checkbox - MAIL - true - - (objectClass=gosaMailAccount) - - - - checkbox - SAMBA - true - - (objectClass=sambaGroupMapping) - - - - textfield - NAME - 20 - 60 - - - (|(cn=*$*)(description=*$*)) - true + + default2 + + + GroupLDAP + (&(objectClass=posixGroup)$NAME(|$PRIMARY$MAIL$SAMBA)) + - LDAP - (&(objectClass=posixGroup)(|(cn=*$NAME*)(description=*$NAME*))) cn 0.5 3 - + diff --git a/gosa-core/plugins/admin/groups/group-list.tpl b/gosa-core/plugins/admin/groups/group-list.tpl index cf107dd6e..8e4e43f4b 100644 --- a/gosa-core/plugins/admin/groups/group-list.tpl +++ b/gosa-core/plugins/admin/groups/group-list.tpl @@ -1,28 +1,28 @@ - - - - -
-
-

 {$HEADLINE} {$SIZELIMIT}

-
- -
-
- - -
{$ROOT} {$BACK} {$HOME} {$RELOAD} {$SEPARATOR} {t}Base{/t} {$BASE} {$SEPARATOR}  {$ACTIONS}
-
-
- -
-
- {$LIST} -
- {$FILTER} -
+
+ +
+

{$HEADLINE} {$SIZELIMIT}

+
+ + + + + + + + + + +
{$ROOT}{$BACK}{$HOME}{$RELOAD}{t}Base{/t} {$BASE}{$ACTIONS}{$FILTER}
+
+
+ + {$LIST} +
+ +
+ diff --git a/gosa-core/plugins/admin/groups/group-list.xml b/gosa-core/plugins/admin/groups/group-list.xml index 22b02b28f..641741dfe 100644 --- a/gosa-core/plugins/admin/groups/group-list.xml +++ b/gosa-core/plugins/admin/groups/group-list.xml @@ -69,13 +69,13 @@ sub - images/lists/new.png + plugins/groups/images/groups.png[new] new entry - plugins/groups/images/new.png + plugins/groups/images/groups.png