Updated xml files to respect actions

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14045 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index af24103c40116f2f89559837fabd6253201af772..7649c6d4444185cb62b421f3896577435e8bf70b 100644 (file)
--- a/gosa-core/plugins/admin/users/user-filter.xml
+++ b/gosa-core/plugins/admin/users/user-filter.xml
@@ -17,6 +17,7 @@
       <attribute>sn</attribute>
       <attribute>uid</attribute>
       <attribute>modifyTimestamp</attribute>
+      <attribute>userPassword</attribute>
     </query>
     <query>
       <backend>LDAP</backend>
@@ -27,6 +28,7 @@
       <attribute>sn</attribute>
       <attribute>uid</attribute>
       <attribute>modifyTimestamp</attribute>
+      <attribute>userPassword</attribute>
     </query>
     <base>true</base>
     <scope>auto</scope>
@@ -97,8 +99,7 @@
     <default>*</default>
     <value>
       <key>*</key>
-      <set>All</set>
-      <set xml:lang="de">Alle</set>
+      <label>All</label>
     </value>
     <autocomplete>
       <backend>LDAP</backend>

diff --git a/gosa-core/plugins/admin/users/user-list.xml b/gosa-core/plugins/admin/users/user-list.xml
index b52543dfbed4fa1dbbd109abd2b9f03beff7b745..5b6f00d8ee5b267ec5263c01f2af3fc89210bfdc 100644 (file)
--- a/gosa-core/plugins/admin/users/user-list.xml
+++ b/gosa-core/plugins/admin/users/user-list.xml
@@ -7,8 +7,7 @@
     <multiSelect>true</multiSelect>
     <template>user-list.tpl</template>
     <module>users</module>
-    <headline>List of users</headline>
-    <headline xml:lang="de">Benutzerliste</headline>
+    <label>List of users</label>
 
     <objectType>
       <objectClass>gosaAccount</objectClass>
@@ -31,26 +30,144 @@
     </column>
 
     <column>
-      <header>Name / Department</header>
-      <header xml:lang="de">Name / Organisationseinheit</header>
+      <label>Name / Department</label>
       <sortable>true</sortable>
       <value>%{filter:link(row,pid,dn,"%s, %s [%s]",sn,givenName,uid)}</value>
     </column>
 
     <column>
-      <header>Properties</header>
-      <header xml:lang="de">Eigenschaften</header>
+      <label>Properties</label>
       <sortable>false</sortable>
       <value>%{filter:accountProperties(dn,row,objectClass)}</value>
     </column>
 
     <column>
-      <header>Actions</header>
-      <header xml:lang="de">Aktionen</header>
+      <label>Actions</label>
       <sortable>false</sortable>
       <value>%{filter:actions()}</value>
     </column>
 
   </table>
 
+  <actionmenu>
+    <action>
+      <type>sub</type>
+      <image>images/lists/new.png</timage>
+      <label>Create</label>
+
+      <action>
+        <name>create_user</name>
+        <type>entry</type>
+        <image>plugins/users/images/list_new_user.png</timage>
+        <acl>c</acl>
+        <label>User</label>
+      </action>
+
+      <action>
+        <name>create_template</name>
+        <type>entry</type>
+        <image>images/lists/new.png</timage>
+        <acl>c</acl>
+        <label>Template</label>
+      </action>
+
+    </action>
+
+    <action>
+      <type>separator</type>
+    </action>
+
+    <action>
+      <name>edit</name>
+      <type>entry</type>
+      <image>images/lists/edit.png</timage>
+      <acl>rw</acl>
+      <label>Edit</label>
+    </action>
+
+    <action>
+      <name>password</name>
+      <type>entry</type>
+      <image>plugins/users/images/list_password.png</timage>
+      <acl>users/password;w</acl>
+      <label>Change password</label>
+    </action>
+
+    <action>
+      <name>remove</name>
+      <type>entry</type>
+      <image>images/lists/trash.png</timage>
+      <acl>d</acl>
+      <label>Remove</label>
+    </action>
+
+    <action>
+      <name>templatize</name>
+      <type>entry</type>
+      <image>plugins/users/images/wizard.png</timage>
+      <acl>w</acl>
+      <label>Apply template</label>
+    </action>
+
+    <action>
+      <type>separator</type>
+    </action>
+
+    <action>
+      <type>copypaste</type>
+    </action>
+
+    <action>
+      <type>separator</type>
+    </action>
+
+    <action>
+      <type>snapshot</type>
+    </action>
+
+  </actionmenu>
+
+  <actiontriggers snapshot="true" copypaste="true">
+    <action>
+      <type>copypaste</type>
+    </action>
+
+    <action>
+      <name>edit</name>
+      <type>entry</type>
+      <image>images/lists/edit.png</timage>
+      <acl>w</acl>
+      <label>Edit user</label>
+    </action>
+
+    <action>
+      <name>lock</name>
+      <type>entry</type>
+      <image>%{filter:lockImage(userPassword)}</timage>
+      <acl>users/password;w</acl>
+      <label>%{filter:lockLabel(userPassword)}</label>
+    </action>
+
+    <action>
+      <name>password</name>
+      <type>entry</type>
+      <image>plugins/users/images/list_password.png</timage>
+      <acl>users/password;w</acl>
+      <label>Change password</label>
+    </action>
+
+    <action>
+      <type>snapshot</type>
+    </action>
+
+    <action>
+      <name>remove</name>
+      <type>entry</type>
+      <image>images/lists/trash.png</timage>
+      <acl>d</acl>
+      <label>Remove user</label>
+    </action>
+
+  </actiontriggers>
+
 </list>