X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fusers%2Fuser-list.xml;h=3a8f0749c772ef2f864e9a1ff114600336f87cf3;hb=376d6ebd796cce7bc35527c37cc65228ee1b5137;hp=c6b48996e13a4408705225b36d6aa54537550426;hpb=af32fcc4fc01169d2c49684bd1bfb1cdb8eea09e;p=gosa.git

diff --git a/gosa-core/plugins/admin/users/user-list.xml b/gosa-core/plugins/admin/users/user-list.xml
index c6b48996e..3a8f0749c 100644
--- a/gosa-core/plugins/admin/users/user-list.xml
+++ b/gosa-core/plugins/admin/users/user-list.xml
@@ -12,26 +12,25 @@
     <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>
-      <image>plugins/users/images/select_user.png</image>
+      <image>plugins/users/images/select_template.png</image>
     </objectType>
 
     <objectType>
-      <label>Templates</label>
-      <objectClass>gosaUserTemplate</objectClass>
+      <label>User</label>
+      <objectClass>gosaAccount</objectClass>
       <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>
-    <layout>|20px||145px|165px;r|</layout>
+    <layout>|20px;c||||150px|185px;r|</layout>
 
     <department>
       <value>%{filter:objectType(dn,objectClass)}</value>
@@ -39,6 +38,7 @@
 
     <department>
       <value>%{filter:departmentLink(row,dn,description)}</value>
+      <span>3</span>
     </department>
 
     <column>
@@ -46,16 +46,32 @@
     </column>
 
     <column>
-      <label>Name / Department</label>
+      <label>Surname</label>
       <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>
-      <value>%{filter:accountProperties(dn,row,objectClass)}</value>
+      <value>%{filter:filterProperties(row,objectClass)}</value>
     </column>
 
     <column>
@@ -66,27 +82,25 @@
   </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>
@@ -100,6 +114,13 @@
       <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>
@@ -108,25 +129,31 @@
     </action>
 
     <action>
-      <name>remove</name>
-      <type>entry</type>
-      <image>images/lists/trash.png</image>
-      <label>Remove</label>
+      <type>separator</type>
     </action>
 
     <action>
-      <name>templatize</name>
+      <name>lockUsers</name>
       <type>entry</type>
-      <image>plugins/users/images/wizard.png</image>
-      <label>Apply template</label>
+      <image>images/lists/locked.png</image>
+      <acl>users/password[w]</acl>
+      <label>Lock users</label>
     </action>
 
     <action>
-      <type>separator</type>
+      <name>unlockUsers</name>
+      <type>entry</type>
+      <image>images/lists/unlocked.png</image>
+      <acl>users/password[w]</acl>
+      <label>Unlock users</label>
     </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>
@@ -134,7 +161,10 @@
     </action>
 
     <action>
-      <type>copypaste</type>
+      <name>templatize</name>
+      <type>entry</type>
+      <image>plugins/users/images/wizard.png</image>
+      <label>Apply template</label>
     </action>
 
     <action>
@@ -142,7 +172,7 @@
     </action>
 
     <action>
-      <type>snapshot</type>
+      <type>exporter</type>
     </action>
 
     <action>
@@ -150,20 +180,28 @@
     </action>
 
     <action>
-      <type>exporter</type>
+      <type>copypaste</type>
+    </action>
+
+    <action>
+      <type>snapshot</type>
     </action>
+
   </actionmenu>
 
   <actiontriggers snapshot="true" copypaste="true">
+
     <action>
-      <name>templatize</name>
+      <name>newfromtpl</name>
       <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>
+      <name>cp</name>
+      <objectclass>!gosaUserTemplate</objectclass>
       <type>copypaste</type>
     </action>
 
@@ -178,7 +216,7 @@
     <action>
       <name>lock</name>
       <type>entry</type>
-      <objectclass>gosaAccount</objectclass>
+      <objectclass>!gosaUserTemplate</objectclass>
       <image>%{filter:lockImage(userPassword)}</image>
       <acl>users/password[w]</acl>
       <label>%{filter:lockLabel(userPassword)}</label>
@@ -187,21 +225,22 @@
     <action>
       <name>password</name>
       <type>entry</type>
-      <objectclass>gosaAccount</objectclass>
+      <objectclass>!gosaUserTemplate</objectclass>
       <image>plugins/users/images/list_password.png</image>
-      <acl>users/password[w]</acl>
       <label>Change password</label>
     </action>
 
     <action>
+      <name>snapshot</name>
       <type>snapshot</type>
+      <objectclass>!gosaUserTemplate</objectclass>
     </action>
 
     <action>
       <name>remove</name>
       <type>entry</type>
-      <objectclass>gosaAccount</objectclass>
       <image>images/lists/trash.png</image>
+      <objectclass>gosaAccount</objectclass>
       <acl>users/user[d]</acl>
       <label>Remove user</label>
     </action>