X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fusers%2Fuser-list.xml;h=7b7a3964e6d9bea1cc21d67745e2e17e35f1de1e;hb=3f6e9871ce3d4e550302d08740d251dad9735396;hp=c7d5423a640aa8cc4e858d1455ba3bb717f39b30;hpb=930bba5f388a5a0dc8625625b36f7f2b2753c690;p=gosa.git

diff --git a/gosa-core/plugins/admin/users/user-list.xml b/gosa-core/plugins/admin/users/user-list.xml
index c7d5423a6..7b7a3964e 100644
--- a/gosa-core/plugins/admin/users/user-list.xml
+++ b/gosa-core/plugins/admin/users/user-list.xml
@@ -30,7 +30,7 @@
   </definition>
 
   <table>
-    <layout>|20px||260px|100px|120px|60px;c|140px;r|</layout>
+    <layout>|20px;c||||150px|185px;r|</layout>
 
     <department>
       <value>%{filter:objectType(dn,objectClass)}</value>
@@ -38,13 +38,21 @@
 
     <department>
       <value>%{filter:departmentLink(row,dn,description)}</value>
-      <span>5</span>
+      <span>3</span>
     </department>
 
     <column>
       <value>%{filter:objectType(dn,objectClass)}</value>
     </column>
 
+    <column>
+      <label>Surname</label>
+      <sortAttribute>sn</sortAttribute>
+      <sortType>string</sortType>
+      <value>%{filter:link(row,dn,"%s",sn)}</value>
+      <export>true</export>
+    </column>
+
     <column>
       <label>Given name</label>
       <sortAttribute>givenName</sortAttribute>
@@ -54,13 +62,18 @@
     </column>
 
     <column>
-      <label>Surname</label>
-      <sortAttribute>sn</sortAttribute>
+      <label>Login</label>
+      <sortAttribute>uid</sortAttribute>
       <sortType>string</sortType>
-      <value>%{filter:link(row,dn,"%s",sn)}</value>
+      <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>
@@ -71,17 +84,23 @@
   <actionmenu>
 
     <action>
+     <type>sub</type>
+     <image>images/lists/element.png[new]</image>
+     <label>Create</label>
+
+     <action>
       <name>new</name>
       <type>entry</type>
-      <image>plugins/users/images/list_new_user.png</image>
-      <label>New person</label>
-    </action>
+      <image>plugins/users/images/select_user.png[new]</image>
+      <label>User</label>
+     </action>
 
-    <action>
+     <action>
       <name>new_template</name>
       <type>entry</type>
-      <image>plugins/users/images/select_template.png</image>
-      <label>New template</label>
+      <image>plugins/users/images/select_template.png[new]</image>
+      <label>Template</label>
+     </action>
     </action>
 
     <action>
@@ -102,13 +121,39 @@
       <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>
-      <name>cp</name>
-      <type>copypaste</type>
+      <name>lockUsers</name>
+      <type>entry</type>
+      <image>images/lists/locked.png</image>
+      <acl>uniBonnAccount/password[w]</acl>
+      <label>Lock users</label>
+    </action>
+
+    <action>
+      <name>unlockUsers</name>
+      <type>entry</type>
+      <image>images/lists/unlocked.png</image>
+      <acl>uniBonnAccount/password[w]</acl>
+      <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>
 
     <action>
@@ -122,19 +167,73 @@
       <label>Apply template</label>
     </action>
 
+    <action>
+      <type>separator</type>
+    </action>
+
     <action>
       <type>exporter</type>
     </action>
+
+    <action>
+      <type>separator</type>
+    </action>
+
+    <action>
+      <type>copypaste</type>
+    </action>
+
+    <action>
+      <type>snapshot</type>
+    </action>
+
   </actionmenu>
 
   <actiontriggers snapshot="true" copypaste="true">
 
+    <action>
+      <name>newfromtpl</name>
+      <type>entry</type>
+      <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>
+
     <action>
       <name>edit</name>
       <type>entry</type>
       <objectclass>gosaAccount</objectclass>
       <image>images/lists/edit.png</image>
-      <label>Edit person</label>
+      <label>Edit user</label>
+    </action>
+
+    <action>
+      <name>lock</name>
+      <type>entry</type>
+      <objectclass>!gosaUserTemplate</objectclass>
+      <image>%{filter:lockImage(userPassword)}</image>
+      <acl>uniBonnAccount/password[w]</acl>
+      <label>%{filter:lockLabel(userPassword)}</label>
+    </action>
+
+    <action>
+      <name>password</name>
+      <type>entry</type>
+      <objectclass>!gosaUserTemplate</objectclass>
+      <image>plugins/users/images/list_password.png</image>
+      <label>Change password</label>
+    </action>
+
+    <action>
+      <name>snapshot</name>
+      <type>snapshot</type>
+      <objectclass>!gosaUserTemplate</objectclass>
     </action>
 
     <action>
@@ -143,13 +242,7 @@
       <image>images/lists/trash.png</image>
       <objectclass>gosaAccount</objectclass>
       <acl>users/user[d]</acl>
-      <label>Remove person</label>
-    </action>
-
-    <action>
-      <name>cp</name>
-      <type>copypaste</type>
-      <acl>users/user[w]</acl>
+      <label>Remove user</label>
     </action>
 
   </actiontriggers>