From 6159f31ff5cc22ebf51d3d15b285eadd03914714 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 16 Mar 2010 14:15:16 +0000 Subject: [PATCH] updated filter git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16638 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../goto/addons/goto/deploy-filter.tpl | 0 .../goto/addons/goto/deploy-filter.xml | 20 +-- .../goto/events/eventTargetSystems-filter.tpl | 59 --------- .../goto/events/eventTargetSystems-filter.xml | 120 +++--------------- .../goto/events/eventTargetSystems-list.tpl | 50 ++++---- .../goto/events/eventTargetUser-filter.tpl | 37 ------ .../goto/events/eventTargetUser-filter.xml | 49 ++----- .../goto/events/eventTargetUser-list.tpl | 50 ++++---- .../goto/addons/goto/events/target_list.tpl | 6 +- 9 files changed, 97 insertions(+), 294 deletions(-) delete mode 100644 gosa-plugins/goto/addons/goto/deploy-filter.tpl delete mode 100644 gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.tpl delete mode 100644 gosa-plugins/goto/addons/goto/events/eventTargetUser-filter.tpl diff --git a/gosa-plugins/goto/addons/goto/deploy-filter.tpl b/gosa-plugins/goto/addons/goto/deploy-filter.tpl deleted file mode 100644 index e69de29bb..000000000 diff --git a/gosa-plugins/goto/addons/goto/deploy-filter.xml b/gosa-plugins/goto/addons/goto/deploy-filter.xml index f3952d5b9..e43c402b5 100644 --- a/gosa-plugins/goto/addons/goto/deploy-filter.xml +++ b/gosa-plugins/goto/addons/goto/deploy-filter.xml @@ -3,22 +3,24 @@ users - true + default + auto + dn + objectClass + givenName + sn + uid + userPassword + default + GotoEvents - (&(objectClass=gosaAccount)$TEMPLATES$NAME(|$FUNCTIONAL$SAMBA$POSIX$MAIL)) - dn - objectClass - givenName - sn - uid - userPassword + (&(objectClass=gosaAccount)(cn=$)) - auto diff --git a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.tpl b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.tpl deleted file mode 100644 index ea981c458..000000000 --- a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.tpl +++ /dev/null @@ -1,59 +0,0 @@ -
-

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

-
- -
- -
- - {$SERVER} 
- {$WORKSTATION} 
- {$TERMINAL} 
- {$BYIP} 
- -
- {$SCOPE} - - - - - - - - - - - - - - -
- - - {$NAME} -
- - - {$IPSTART} -
- - - {$IPSTOP} -
- - - - - -
- {$APPLY} -
-
diff --git a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.xml b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.xml index 9ccd976da..87a748a79 100644 --- a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.xml +++ b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.xml @@ -3,116 +3,36 @@ server - true + default + auto + cn + description + dn + objectClass + default + - SystemByIp - (&(|$SERVER $WORKSTATION $TERMINAL $OGROUP) $NAME) $IPSTART $IPSTOP $BYIP - dn - objectClass - cn - description - macAddress - ipHostNumber - - auto - - - - textfield - NAME - 20 - 60 - - - (cn=*$*) - true - - SystemByIp - (cn=*$NAME*) - cn - 0.5 - 3 - - - - - textfield - IPSTART - 20 - 60 - 0.0.0.0 - - __IPSTART__=*$*__ - true - LDAP - __IPSTART__=*$IPSTART*__ - cn - 0.5 - 3 - - - - - textfield - IPSTOP - 20 - 60 - 255.255.255.255 - - __IPSTOP__=*$*__ - true + (& + (| + (objectClass=goServer) + (objectClass=gotoWorkstation) + (objectClass=gotoTerminal) + (objectClass=gosaGroupOfNames) + ) + (cn=$) + ) + + - LDAP - __IPSTOP__=*$IPSTOP*__ cn 0.5 3 - - - - checkbox - OGROUP - true - (objectClass=gosaGroupOfNames) - - - - - checkbox - SERVER - true - (objectClass=goServer) - - - - - checkbox - WORKSTATION - true - - (objectClass=gotoWorkstation) - - - - checkbox - TERMINAL - true - - (objectClass=gotoTerminal) - - - - checkbox - BYIP - - __FilterByIP__ - - + diff --git a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-list.tpl b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-list.tpl index 586a18d5d..8e4e43f4b 100644 --- a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-list.tpl +++ b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-list.tpl @@ -1,26 +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-plugins/goto/addons/goto/events/eventTargetUser-filter.tpl b/gosa-plugins/goto/addons/goto/events/eventTargetUser-filter.tpl deleted file mode 100644 index b7baa1f64..000000000 --- a/gosa-plugins/goto/addons/goto/events/eventTargetUser-filter.tpl +++ /dev/null @@ -1,37 +0,0 @@ -
-

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

-
- -
- -
- - {$GROUP} 
- {$USER} 
- -
- {$SCOPE} - - - - - - -
- - - {$NAME} -
- - - - - -
- {$APPLY} -
-
diff --git a/gosa-plugins/goto/addons/goto/events/eventTargetUser-filter.xml b/gosa-plugins/goto/addons/goto/events/eventTargetUser-filter.xml index 9267e2144..a07b4c820 100644 --- a/gosa-plugins/goto/addons/goto/events/eventTargetUser-filter.xml +++ b/gosa-plugins/goto/addons/goto/events/eventTargetUser-filter.xml @@ -3,55 +3,28 @@ server - true + default + auto + dn + objectClass + cn + uid + description + default + LDAP - (&(|$USER $GROUP) $NAME) - dn - objectClass - cn - uid - description + (&(|(objectClass=gosaAccount)(objectClass=posixGroup))(cn=$)) - auto - - - - textfield - NAME - 20 - 60 - - - (cn=*$*) - true - LDAP - (cn=*$NAME*) cn 0.5 3 - - - - checkbox - GROUP - true - (objectClass=posixGroup) - - - - - checkbox - USER - true - (objectClass=gosaAccount) - - + diff --git a/gosa-plugins/goto/addons/goto/events/eventTargetUser-list.tpl b/gosa-plugins/goto/addons/goto/events/eventTargetUser-list.tpl index 586a18d5d..8e4e43f4b 100644 --- a/gosa-plugins/goto/addons/goto/events/eventTargetUser-list.tpl +++ b/gosa-plugins/goto/addons/goto/events/eventTargetUser-list.tpl @@ -1,26 +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-plugins/goto/addons/goto/events/target_list.tpl b/gosa-plugins/goto/addons/goto/events/target_list.tpl index a7cd795f3..39b349cee 100644 --- a/gosa-plugins/goto/addons/goto/events/target_list.tpl +++ b/gosa-plugins/goto/addons/goto/events/target_list.tpl @@ -1,7 +1,7 @@ {$divlist}
-
-   - +
+ +
-- 2.30.2