diff --git a/gosa-core/plugins/admin/users/user-list.xml b/gosa-core/plugins/admin/users/user-list.xml
index d6edc95584f2facf12e53eefe740dc247f677d17..3a8f0749c772ef2f864e9a1ff114600336f87cf3 100644 (file)
</definition>
<table>
</definition>
<table>
- <layout>|20px||200px|100px|200px;r|</layout>
+ <layout>|20px;c||||150px|185px;r|</layout>
<department>
<value>%{filter:objectType(dn,objectClass)}</value>
<department>
<value>%{filter:objectType(dn,objectClass)}</value>
</column>
<column>
</column>
<column>
- <label>Given name</label>
- <sortAttribute>givenName</sortAttribute>
+ <label>Surname</label>
+ <sortAttribute>sn</sortAttribute>
<sortType>string</sortType>
<sortType>string</sortType>
- <value>%{filter:link(row,dn,"%s",givenName)}</value>
+ <value>%{filter:link(row,dn,"%s",sn)}</value>
<export>true</export>
</column>
<column>
<export>true</export>
</column>
<column>
- <label>Surname</label>
- <sortAttribute>sn</sortAttribute>
+ <label>Given name</label>
+ <sortAttribute>givenName</sortAttribute>
<sortType>string</sortType>
<sortType>string</sortType>
- <value>%{filter:link(row,dn,"%s",sn)}</value>
+ <value>%{filter:link(row,dn,"%s",givenName)}</value>
<export>true</export>
</column>
<column>
<export>true</export>
</column>
<column>
- <label>ID</label>
+ <label>Login</label>
<sortAttribute>uid</sortAttribute>
<sortType>string</sortType>
<value>%{filter:link(row,dn,"%s",uid)}</value>
<export>true</export>
</column>
<sortAttribute>uid</sortAttribute>
<sortType>string</sortType>
<value>%{filter:link(row,dn,"%s",uid)}</value>
<export>true</export>
</column>
+ <column>
+ <label>Properties</label>
+ <value>%{filter:filterProperties(row,objectClass)}</value>
+ </column>
+
<column>
<label>Actions</label>
<value>%{filter:actions(dn,row,objectClass)}</value>
<column>
<label>Actions</label>
<value>%{filter:actions(dn,row,objectClass)}</value>
<action>
<type>sub</type>
<action>
<type>sub</type>
- <image>images/lists/new.png</image>
+ <image>images/lists/element.png[new]</image>
<label>Create</label>
<action>
<name>new</name>
<type>entry</type>
<label>Create</label>
<action>
<name>new</name>
<type>entry</type>
- <image>plugins/users/images/list_new_user.png</image>
+ <image>plugins/users/images/select_user.png[new]</image>
<label>User</label>
</action>
<action>
<name>new_template</name>
<type>entry</type>
<label>User</label>
</action>
<action>
<name>new_template</name>
<type>entry</type>
- <image>plugins/users/images/select_template.png</image>
+ <image>plugins/users/images/select_template.png[new]</image>
<label>Template</label>
</action>
</action>
<label>Template</label>
</action>
</action>
<label>Remove</label>
</action>
<label>Remove</label>
</action>
+ <action>
+ <name>password</name>
+ <type>entry</type>
+ <image>plugins/users/images/list_password.png</image>
+ <label>Change password</label>
+ </action>
+
<action>
<type>separator</type>
</action>
<action>
<type>separator</type>
</action>
<name>lockUsers</name>
<type>entry</type>
<image>images/lists/locked.png</image>
<name>lockUsers</name>
<type>entry</type>
<image>images/lists/locked.png</image>
- <acl>uniBonnAccount/password[w]</acl>
+ <acl>users/password[w]</acl>
<label>Lock users</label>
</action>
<label>Lock users</label>
</action>
<name>unlockUsers</name>
<type>entry</type>
<image>images/lists/unlocked.png</image>
<name>unlockUsers</name>
<type>entry</type>
<image>images/lists/unlocked.png</image>
- <acl>uniBonnAccount/password[w]</acl>
+ <acl>users/password[w]</acl>
<label>Unlock users</label>
</action>
<action>
<name>sendMessage</name>
<type>entry</type>
<label>Unlock users</label>
</action>
<action>
<name>sendMessage</name>
<type>entry</type>
+ <depends>DaemonEvent_notify</depends>
<image>plugins/goto/images/notify.png</image>
<label>Send message</label>
</action>
<image>plugins/goto/images/notify.png</image>
<label>Send message</label>
</action>
<type>entry</type>
<objectclass>!gosaUserTemplate</objectclass>
<image>%{filter:lockImage(userPassword)}</image>
<type>entry</type>
<objectclass>!gosaUserTemplate</objectclass>
<image>%{filter:lockImage(userPassword)}</image>
- <acl>uniBonnAccount/password[w]</acl>
+ <acl>users/password[w]</acl>
<label>%{filter:lockLabel(userPassword)}</label>
</action>
<label>%{filter:lockLabel(userPassword)}</label>
</action>