From: hickert Date: Tue, 16 Mar 2010 13:17:42 +0000 (+0000) Subject: Updated trust select X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=371007fd5ca262e47d0f358f2fb13dc552969a13;p=gosa.git Updated trust select git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16631 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/plugins/personal/posix/trustSelect/class_trustSelect.inc b/gosa-core/plugins/personal/posix/trustSelect/class_trustSelect.inc index 03828f892..f64881f6d 100644 --- a/gosa-core/plugins/personal/posix/trustSelect/class_trustSelect.inc +++ b/gosa-core/plugins/personal/posix/trustSelect/class_trustSelect.inc @@ -33,13 +33,13 @@ class trustSelect extends management $this->storagePoints = array(get_ou("workstationRDN"),get_ou("terminalRDN"),get_ou("serverRDN"),); - // Build filter - if (session::global_is_set(get_class($this)."_filter")){ - $filter= session::global_get(get_class($this)."_filter"); - } else { +# // Build filter + # if (session::global_is_set(get_class($this)."_filter")){ + # $filter= session::global_get(get_class($this)."_filter"); + # } else { $filter = new filter(get_template_path("trust-filter.xml", true, dirname(__FILE__))); $filter->setObjectStorage($this->storagePoints); - } + #} $this->setFilter($filter); // Build headpage diff --git a/gosa-core/plugins/personal/posix/trustSelect/trust-filter.tpl b/gosa-core/plugins/personal/posix/trustSelect/trust-filter.tpl deleted file mode 100644 index 6197369bc..000000000 --- a/gosa-core/plugins/personal/posix/trustSelect/trust-filter.tpl +++ /dev/null @@ -1,37 +0,0 @@ -
-

- {image path="images/launch.png" align="right"}{t}Filter{/t} - -

-
- -
- -
- - {$SERVER} {t}Show servers{/t}
- {$WORKSTATION} {t}Show workstations{/t}
- {$TERMINAL} {t}Show terminals{/t}
- -
- - {$SCOPE} - - - - - - - - - -
- - - {$NAME} -
- {$APPLY} -
-
diff --git a/gosa-core/plugins/personal/posix/trustSelect/trust-filter.xml b/gosa-core/plugins/personal/posix/trustSelect/trust-filter.xml index b30118e63..1b32632e7 100644 --- a/gosa-core/plugins/personal/posix/trustSelect/trust-filter.xml +++ b/gosa-core/plugins/personal/posix/trustSelect/trust-filter.xml @@ -1,64 +1,29 @@ - -groups - -true - + + groups + true + default + auto + dn + objectClass + cn + description + - - -LDAPBlacklist -(&(|$SERVER $WORKSTATION $TERMINAL)$NAME) -dn -objectClass -cn -description - -auto - - - -textfield -NAME -20 -60 - - -(cn=*$*) -false - -LDAPBlacklist -(cn=*$NAME*) -cn -0.5 -3 - - - - -checkbox -SERVER -true - -(objectClass=goServer) - - - -checkbox -WORKSTATION -true - -(objectClass=gotoWorkstation) - - - -checkbox -TERMINAL -true - -(objectClass=gotoTerminal) - + + default + + + LDAPBlacklist + (&(|(objectClasS=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal))(cn=$)) + + + cn + 0.5 + 3 + + diff --git a/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl b/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl index d5d7b459c..9345f7ebc 100644 --- a/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl +++ b/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl @@ -1,36 +1,35 @@ - - - - - -
-
-

 {$HEADLINE} {$SIZELIMIT}

-
- -
-
- - - - -
{$ROOT} {$BACK} {$HOME} {$RELOAD} {$SEPARATOR} {t}Base{/t} {$BASE} {$SEPARATOR} {image path="images/rocket.png"} - {$ACTIONS}
-
-
- -
+ + +
+ +
+

{$HEADLINE} {$SIZELIMIT}

+
+ + + + + + + + + + +
{$ROOT}{$BACK}{$HOME}{$RELOAD}{t}Base{/t} {$BASE}{$ACTIONS}{$FILTER}
- {$LIST} -
- {$FILTER} -
+ + + {$LIST} + + +
+ +
- - + +
diff --git a/gosa-core/plugins/personal/posix/trustSelect/trust-list.xml b/gosa-core/plugins/personal/posix/trustSelect/trust-list.xml index a46c30fb9..4c3f8724d 100644 --- a/gosa-core/plugins/personal/posix/trustSelect/trust-list.xml +++ b/gosa-core/plugins/personal/posix/trustSelect/trust-list.xml @@ -1,79 +1,64 @@ - - -true -false -true -true - - -1 - - - -goServer -server -servgeneric -plugins/systems/images/select_server.png - - - - -gotoWorkstation -workstation -workgeneric -plugins/systems/images/select_workstation.png - - - - -gotoTerminal -terminal -termgeneric -plugins/systems/images/select_terminal.png - - - - - - |20px;c||| - - - %{filter:objectType(dn,objectClass)} - - - - %{filter:departmentLink(row,dn,description)} - 1 - - - - %{filter:objectType(dn,objectClass)} - - - - - cn - string - %{cn} - true - - - - - description - string - %{description} - true - - -
- - + + true + false + true + true + + + 1 + + + goServer + server + servgeneric + plugins/systems/images/select_server.png + + + + gotoWorkstation + workstation + workgeneric + plugins/systems/images/select_workstation.png + + + + gotoTerminal + terminal + termgeneric + plugins/systems/images/select_terminal.png + + + + |20px;c||| + + %{filter:objectType(dn,objectClass)} + + + %{filter:departmentLink(row,dn,description)} + 1 + + + %{filter:objectType(dn,objectClass)} + + + + cn + string + %{cn} + true + + + + description + string + %{description} + true + +
+ - - + -