From f41ceeb8db6c94afc237c2c84f75d095db2940ba Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 16 Mar 2010 14:15:21 +0000 Subject: [PATCH] updated filter git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16640 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../fai/classSelect/selectClass-filter.tpl | 29 ---- .../fai/classSelect/selectClass-filter.xml | 55 ++------ .../fai/classSelect/selectClass-list.tpl | 58 ++++---- gosa-plugins/fai/admin/fai/fai-filter.tpl | 75 ----------- gosa-plugins/fai/admin/fai/fai-filter.xml | 127 +++++------------- gosa-plugins/fai/admin/fai/fai-list.tpl | 50 +++---- .../packageSelect/selectPackage-filter.tpl | 34 ----- .../packageSelect/selectPackage-filter.xml | 28 ++-- .../fai/packageSelect/selectPackage-list.tpl | 49 +++---- 9 files changed, 131 insertions(+), 374 deletions(-) delete mode 100644 gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.tpl delete mode 100644 gosa-plugins/fai/admin/fai/fai-filter.tpl delete mode 100644 gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.tpl diff --git a/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.tpl b/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.tpl deleted file mode 100644 index 3d47da615..000000000 --- a/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.tpl +++ /dev/null @@ -1,29 +0,0 @@ -
-

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

-
- -
- - - - - - -
- - - {$NAME} -
- - - - - -
- {$APPLY} -
-
diff --git a/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.xml b/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.xml index a6b02bebe..27d4ef7db 100644 --- a/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.xml +++ b/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.xml @@ -3,58 +3,31 @@ users - true + default + auto + dn + objectClass + cn + sn + uid + givenName + description + userPassword + default + FAIClass - $NAME - dn - objectClass - cn - sn - uid - givenName - description - userPassword + (cn=$) - auto - - - - textfield - NAME - 20 - 60 - - - *$ - true - FAIClass - $NAME cn 0.5 3 - - - - checkbox - USER - true - (&(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate))) - - - - - checkbox - GROUP - true - - (objectClass=posixGroup) - + diff --git a/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl b/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl index 90a61bbad..089c2099c 100644 --- a/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl +++ b/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl @@ -1,34 +1,32 @@ - - - - - -
-
-

 {$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/fai/admin/fai/fai-filter.tpl b/gosa-plugins/fai/admin/fai/fai-filter.tpl deleted file mode 100644 index a3b196306..000000000 --- a/gosa-plugins/fai/admin/fai/fai-filter.tpl +++ /dev/null @@ -1,75 +0,0 @@ -
-

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

-
- -
- -
- -
-  {$RELEASE}
-
- -
- -
- -{if $allow_create} - - {t}Create release{/t} -
- - {t}Create read-only release{/t} -{else} - {t}Release{/t} - {t}Create release{/t} -
- {t}Freeze{/t} - {t}Create read-only release{/t} -{/if} - -{if $fai_release != $fai_base && $allow_remove} -
- - {t}Delete current release{/t} -{/if} - -
- -
- -{$PROFILE} {t}Show profiles{/t} -
{$TEMPLATE} {t}Show templates{/t} -
{$SCRIPT} {t}Show scripts{/t} -
{$HOOK} {t}Show hooks{/t} -
{$VARIABLE} {t}Show variables{/t} -
{$PACKAGE} {t}Show packages{/t} -
{$PARTITION} {t}Show partitions{/t} -{if $opsi_available} -
{$NETBOOT} {t}Show netboot products{/t} -
{$LOCALBOOT} {t}Show localboot products{/t} -{/if} - - - - - - -
- - - {$NAME} -
- - - - - -
- {$APPLY} -
-
diff --git a/gosa-plugins/fai/admin/fai/fai-filter.xml b/gosa-plugins/fai/admin/fai/fai-filter.xml index df0a16c20..5285a15a2 100644 --- a/gosa-plugins/fai/admin/fai/fai-filter.xml +++ b/gosa-plugins/fai/admin/fai/fai-filter.xml @@ -3,20 +3,43 @@ fai - true + default + auto + dn + objectClass + cn + description + default + FAI - (&(|$PROFILE$HOOK$TEMPLATE$SCRIPT$VARIABLE$PACKAGE$PARTITION$NETBOOT$LOCALBOOT)$NAME) - dn - objectClass - cn - description + (& + (| + (objectClass=FAIprofile) + (objectClass=FAIhook) + (objectClass=FAItemplate) + (objectClass=FAIscript) + (objectClass=FAIvariable) + (objectClass=FAIpackageList) + (objectClass=FAIpartitionTable) + ) + (cn=$) + ) + - auto + + OPSIPACKAGE + cn=$ + + + cn + 0.5 + 3 + @@ -27,94 +50,4 @@ Loading... - - checkbox - NETBOOT - true - - (&(objectClass=FAIclass)(FAIstate=__NETBOOT__)) - - - - checkbox - LOCALBOOT - true - - (&(objectClass=FAIclass)(FAIstate=__LOCALBOOT__)) - - - - checkbox - PROFILE - true - - (objectClass=FAIprofile) - - - - checkbox - TEMPLATE - true - - (objectClass=FAItemplate) - - - - checkbox - SCRIPT - true - - (objectClass=FAIscript) - - - - checkbox - HOOK - true - - (objectClass=FAIhook) - - - - checkbox - VARIABLE - true - - (objectClass=FAIvariable) - - - - checkbox - PACKAGE - true - - (objectClass=FAIpackageList) - - - - checkbox - PARTITION - true - - (objectClass=FAIpartitionTable) - - - - textfield - NAME - 20 - 60 - - - (cn=*$*) - false - - FAI - (|(&(objectClass=FAIclass)(cn=*$NAME*))(&(objectClass=FAIclass)(|(FAIstate=__NETBOOT__)(FAIstate=__LOCALBOOT__)))) - cn - 0.5 - 3 - - - diff --git a/gosa-plugins/fai/admin/fai/fai-list.tpl b/gosa-plugins/fai/admin/fai/fai-list.tpl index 2782676f0..8e4e43f4b 100644 --- a/gosa-plugins/fai/admin/fai/fai-list.tpl +++ b/gosa-plugins/fai/admin/fai/fai-list.tpl @@ -1,26 +1,28 @@ - - - - - -
-
-

 {$HEADLINE} {$SIZELIMIT}

-
- -
-
- - -
{$ROOT} {$BACK} {$HOME} {$RELOAD} {$SEPARATOR}  {$ACTIONS}
-
-
- -
-
- {$LIST} - 		- {$FILTER} -
+ + +
+ +
+

{$HEADLINE} {$SIZELIMIT}

+
+ + + + + + + + + + +
{$ROOT}{$BACK}{$HOME}{$RELOAD}{t}Base{/t} {$BASE}{$ACTIONS}{$FILTER}
+
+
+ + {$LIST} +
+ +
+ diff --git a/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.tpl b/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.tpl deleted file mode 100644 index 06041bad6..000000000 --- a/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-

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

-
- -
- -
- -
- {t}A maximum of 200 entries will be shown here.{/t} -
- - - - - -
- - - {$NAME} -
- - - - - -
- {$APPLY} -
-
diff --git a/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.xml b/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.xml index febabf285..059ca5cf4 100644 --- a/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.xml +++ b/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.xml @@ -3,37 +3,25 @@ groups - true + default + auto + SECTION + VERSION + PACKAGE + default + FAIPackages $NAME - SECTION - VERSION - PACKAGE - auto - - - - textfield - NAME - 20 - 60 - - - *$ - true - FAIPackages - $NAME PACKAGE 0.5 3 - - + diff --git a/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-list.tpl b/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-list.tpl index 1c95a3cfc..fa469ca9c 100644 --- a/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-list.tpl +++ b/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-list.tpl @@ -1,27 +1,28 @@ - - - - - -
-
-

 {$HEADLINE} {$SIZELIMIT}

-
- -
-
- - -
{$ROOT} {$BACK} {$HOME} {$RELOAD} {$SEPARATOR}  {$SEPARATOR}  {$ACTIONS}
-
-
- -
-
- {$LIST} - 		- {$FILTER} -
+ + +
+ +
+

{$HEADLINE} {$SIZELIMIT}

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