diff --git a/gosa-core/plugins/admin/users/user-list.xml b/gosa-core/plugins/admin/users/user-list.xml
index c6b48996e13a4408705225b36d6aa54537550426..7b7a3964e6d9bea1cc21d67745e2e17e35f1de1e 100644 (file)
<defaultSortColumn>1</defaultSortColumn>
<objectType>
<defaultSortColumn>1</defaultSortColumn>
<objectType>
- <label>Users</label>
- <objectClass>gosaAccount</objectClass>
- <objectClass>!gosaUserTemplate</objectClass>
+ <label>Template</label>
+ <objectClass>gosaUserTemplate</objectClass>
<category>users</category>
<class>user</class>
<category>users</category>
<class>user</class>
- <image>plugins/users/images/select_user.png</image>
+ <image>plugins/users/images/select_template.png</image>
</objectType>
<objectType>
</objectType>
<objectType>
- <label>Templates</label>
- <objectClass>gosaUserTemplate</objectClass>
+ <label>User</label>
+ <objectClass>gosaAccount</objectClass>
<category>users</category>
<class>user</class>
<category>users</category>
<class>user</class>
- <image>plugins/users/images/select_template.png</image>
+ <image>plugins/users/images/select_user.png</image>
</objectType>
</definition>
<table>
</objectType>
</definition>
<table>
- <layout>|20px||145px|165px;r|</layout>
+ <layout>|20px;c||||150px|185px;r|</layout>
<department>
<value>%{filter:objectType(dn,objectClass)}</value>
<department>
<value>%{filter:objectType(dn,objectClass)}</value>
<department>
<value>%{filter:departmentLink(row,dn,description)}</value>
<department>
<value>%{filter:departmentLink(row,dn,description)}</value>
+ <span>3</span>
</department>
<column>
</department>
<column>
</column>
<column>
</column>
<column>
- <label>Name / Department</label>
+ <label>Surname</label>
<sortAttribute>sn</sortAttribute>
<sortType>string</sortType>
<sortAttribute>sn</sortAttribute>
<sortType>string</sortType>
- <value>%{filter:link(row,dn,"%s, %s [%s]",sn,givenName,uid)}</value>
+ <value>%{filter:link(row,dn,"%s",sn)}</value>
+ <export>true</export>
+ </column>
+
+ <column>
+ <label>Given name</label>
+ <sortAttribute>givenName</sortAttribute>
+ <sortType>string</sortType>
+ <value>%{filter:link(row,dn,"%s",givenName)}</value>
+ <export>true</export>
+ </column>
+
+ <column>
+ <label>Login</label>
+ <sortAttribute>uid</sortAttribute>
+ <sortType>string</sortType>
+ <value>%{filter:link(row,dn,"%s",uid)}</value>
<export>true</export>
</column>
<column>
<label>Properties</label>
<export>true</export>
</column>
<column>
<label>Properties</label>
- <value>%{filter:accountProperties(dn,row,objectClass)}</value>
+ <value>%{filter:filterProperties(row,objectClass)}</value>
</column>
<column>
</column>
<column>
</table>
<actionmenu>
</table>
<actionmenu>
- <action>
- <type>sub</type>
- <image>images/lists/new.png</image>
- <label>Create</label>
- <action>
- <name>create_user</name>
- <type>entry</type>
- <image>plugins/users/images/list_new_user.png</image>
- <acl>users/user[c]</acl>
- <label>User</label>
- </action>
+ <action>
+ <type>sub</type>
+ <image>images/lists/element.png[new]</image>
+ <label>Create</label>
- <action>
- <name>create_template</name>
- <type>entry</type>
- <image>images/lists/new.png</image>
- <acl>users/user[c]</acl>
- <label>Template</label>
- </action>
+ <action>
+ <name>new</name>
+ <type>entry</type>
+ <image>plugins/users/images/select_user.png[new]</image>
+ <label>User</label>
+ </action>
+ <action>
+ <name>new_template</name>
+ <type>entry</type>
+ <image>plugins/users/images/select_template.png[new]</image>
+ <label>Template</label>
+ </action>
</action>
<action>
</action>
<action>
<label>Edit</label>
</action>
<label>Edit</label>
</action>
+ <action>
+ <name>remove</name>
+ <type>entry</type>
+ <image>images/lists/trash.png</image>
+ <label>Remove</label>
+ </action>
+
<action>
<name>password</name>
<type>entry</type>
<action>
<name>password</name>
<type>entry</type>
</action>
<action>
</action>
<action>
- <name>remove</name>
- <type>entry</type>
- <image>images/lists/trash.png</image>
- <label>Remove</label>
+ <type>separator</type>
</action>
<action>
</action>
<action>
- <name>templatize</name>
+ <name>lockUsers</name>
<type>entry</type>
<type>entry</type>
- <image>plugins/users/images/wizard.png</image>
- <label>Apply template</label>
+ <image>images/lists/locked.png</image>
+ <acl>uniBonnAccount/password[w]</acl>
+ <label>Lock users</label>
</action>
<action>
</action>
<action>
- <type>separator</type>
+ <name>unlockUsers</name>
+ <type>entry</type>
+ <image>images/lists/unlocked.png</image>
+ <acl>uniBonnAccount/password[w]</acl>
+ <label>Unlock users</label>
</action>
<action>
</action>
<action>
- <type>daemon</type>
+ <name>sendMessage</name>
+ <type>entry</type>
+ <depends>DaemonEvent_notify</depends>
+ <image>plugins/goto/images/notify.png</image>
+ <label>Send message</label>
</action>
<action>
</action>
<action>
</action>
<action>
</action>
<action>
- <type>copypaste</type>
+ <name>templatize</name>
+ <type>entry</type>
+ <image>plugins/users/images/wizard.png</image>
+ <label>Apply template</label>
</action>
<action>
</action>
<action>
</action>
<action>
</action>
<action>
- <type>snapshot</type>
+ <type>exporter</type>
</action>
<action>
</action>
<action>
</action>
<action>
</action>
<action>
- <type>exporter</type>
+ <type>copypaste</type>
+ </action>
+
+ <action>
+ <type>snapshot</type>
</action>
</action>
+
</actionmenu>
<actiontriggers snapshot="true" copypaste="true">
</actionmenu>
<actiontriggers snapshot="true" copypaste="true">
+
<action>
<action>
- <name>templatize</name>
+ <name>newfromtpl</name>
<type>entry</type>
<type>entry</type>
- <objectclass>!gosaUserTemplate</objectclass>
- <image>plugins/users/images/wizard.png</image>
- <label>Apply template</label>
+ <image>images/lists/new.png</image>
+ <objectclass>gosaUserTemplate</objectclass>
+ <label>New user from template</label>
</action>
<action>
</action>
<action>
+ <name>cp</name>
+ <objectclass>!gosaUserTemplate</objectclass>
<type>copypaste</type>
</action>
<type>copypaste</type>
</action>
<action>
<name>lock</name>
<type>entry</type>
<action>
<name>lock</name>
<type>entry</type>
- <objectclass>gosaAccount</objectclass>
+ <objectclass>!gosaUserTemplate</objectclass>
<image>%{filter:lockImage(userPassword)}</image>
<image>%{filter:lockImage(userPassword)}</image>
- <acl>users/password[w]</acl>
+ <acl>uniBonnAccount/password[w]</acl>
<label>%{filter:lockLabel(userPassword)}</label>
</action>
<action>
<name>password</name>
<type>entry</type>
<label>%{filter:lockLabel(userPassword)}</label>
</action>
<action>
<name>password</name>
<type>entry</type>
- <objectclass>gosaAccount</objectclass>
+ <objectclass>!gosaUserTemplate</objectclass>
<image>plugins/users/images/list_password.png</image>
<image>plugins/users/images/list_password.png</image>
- <acl>users/password[w]</acl>
<label>Change password</label>
</action>
<action>
<label>Change password</label>
</action>
<action>
+ <name>snapshot</name>
<type>snapshot</type>
<type>snapshot</type>
+ <objectclass>!gosaUserTemplate</objectclass>
</action>
<action>
<name>remove</name>
<type>entry</type>
</action>
<action>
<name>remove</name>
<type>entry</type>
- <objectclass>gosaAccount</objectclass>
<image>images/lists/trash.png</image>
<image>images/lists/trash.png</image>
+ <objectclass>gosaAccount</objectclass>
<acl>users/user[d]</acl>
<label>Remove user</label>
</action>
<acl>users/user[d]</acl>
<label>Remove user</label>
</action>