Removed passwordHook

[gosa.git] / gosa-core / plugins / admin / acl / acl-list.xml

diff --git a/gosa-core/plugins/admin/acl/acl-list.xml b/gosa-core/plugins/admin/acl/acl-list.xml
index 1f3de253649737e0a8e8b5437c1bb37ef4950e86..09d9fcbebb3c0c180c702843b5a747766e17b796 100644 (file)
--- a/gosa-core/plugins/admin/acl/acl-list.xml
+++ b/gosa-core/plugins/admin/acl/acl-list.xml
@@ -8,29 +8,29 @@
     <multiSelect>true</multiSelect>
     <template>acl-list.tpl</template>
     <module>acl</module>
-    <label>List of acls</label>
+    <label>List of ACLs</label>
     <defaultSortColumn>1</defaultSortColumn>
 
     <objectType>
-      <label>Acl</label>
+      <label>ACL</label>
       <objectClass>gosaAcl</objectClass>
       <category>acl</category>
       <class>acl</class>
-      <image>plugins/users/images/select_template.png</image>
+      <image>images/lists/locked.png</image>
     </objectType>
 
     <objectType>
       <label>Role</label>
-      <objectClass>gosaAclRole</objectClass>
+      <objectClass>gosaRole</objectClass>
       <category>acl</category>
       <class>acl</class>
-      <image>plugins/users/images/select_user.png</image>
+      <image>plugins/acl/images/role.png</image>
     </objectType>
 
   </definition>
 
   <table>
-    <layout>|16px||150px|170px;r|</layout>
+    <layout>|20px;c|200px||100px;r|</layout>
 
     <department>
       <value>%{filter:objectType(dn,objectClass)}</value>
@@ -47,9 +47,9 @@
 
     <column>
       <label>Name</label>
-      <sortAttribute>cn</sortAttribute>
+      <sortAttribute>dn</sortAttribute>
       <sortType>string</sortType>
-      <value>%{filter:link(row,dn,"%s",cn)}</value>
+      <value>%{filter:filterLabel(row,dn,ou,cn,pid,base)}</value>
       <export>true</export>
     </column>
 
@@ -72,22 +72,16 @@
 
     <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>
-      <image>plugins/users/images/list_new_user.png</image>
-      <label>Acl</label>
-     </action>
-
-     <action>
-      <name>new_role</name>
-      <type>entry</type>
-      <image>plugins/users/images/select_template.png</image>
+      <image>plugins/acl/images/role.png</image>
       <label>Role</label>
      </action>
+
     </action>
 
     <action>