X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Fsystems%2Fadmin%2Fsystems%2Fsystem-list.xml;h=b865fc32f4843b8aca7df6622cc5b904717fa165;hb=fe8b93913ffc908364248c246e51f765053bf129;hp=0e55276e5c3dd5ca4da48327c2ff39d3f921bbde;hpb=844a7f32685550e0596aec11ec20697541a13a3a;p=gosa.git

diff --git a/gosa-plugins/systems/admin/systems/system-list.xml b/gosa-plugins/systems/admin/systems/system-list.xml
index 0e55276e5..b865fc32f 100644
--- a/gosa-plugins/systems/admin/systems/system-list.xml
+++ b/gosa-plugins/systems/admin/systems/system-list.xml
@@ -7,7 +7,6 @@
     <baseMode>true</baseMode>
     <multiSelect>true</multiSelect>
     <template>system-list.tpl</template>
-    <module>server</module>
     <label>List of systems</label>
     <defaultSortColumn>1</defaultSortColumn>
 
@@ -24,7 +23,7 @@
       <objectClass>FAKE_OC_NewWorkstation</objectClass>
       <category>workstation</category>
       <class>workgeneric</class>
-      <image>plugins/systems/images/select_new_workstation.png</image>
+      <image>plugins/systems/images/select_workstation.png[new]</image>
     </objectType>
 
     <objectType>
@@ -32,23 +31,23 @@
       <objectClass>goServer__IS_LOCKED</objectClass>
       <category>server</category>
       <class>servgeneric</class>
-      <image>plugins/systems/images/server_locked.png</image>
+      <image>plugins/systems/images/select_server.png[locked]</image>
     </objectType>
 
     <objectType>
       <label>Locked workstation</label>
-      <objectClass>gotoWorkstation</objectClass>
+      <objectClass>gotoWorkstation__IS_LOCKED</objectClass>
       <category>workstation</category>
       <class>workgeneric</class>
-      <image>plugins/systems/images/workstation_locked.png</image>
+      <image>plugins/systems/images/select_workstation.png[locked]</image>
     </objectType>
 
     <objectType>
       <label>Locked terminal</label>
-      <objectClass>gotoTerminal</objectClass>
+      <objectClass>gotoTerminal__IS_LOCKED</objectClass>
       <category>terminal</category>
       <class>termgeneric</class>
-      <image>plugins/systems/images/terminal_locked.png</image>
+      <image>plugins/systems/images/select_terminal.png[locked]</image>
     </objectType>
 
 
@@ -57,15 +56,15 @@
       <objectClass>FAKE_OC_NewTerminal</objectClass>
       <category>terminal</category>
       <class>termgeneric</class>
-      <image>plugins/systems/images/select_new_terminal.png</image>
+      <image>plugins/systems/images/select_terminal.png[new]</image>
     </objectType>
 
     <objectType>
       <label>New unknown device</label>
-      <objectClass>FAKE_OC_NewUnknownDevice</objectClass>
+      <objectClass>FAKE_OC_ArpNewDevice</objectClass>
       <category>terminal</category>
       <class>termgeneric</class>
-      <image>plugins/systems/images/select_newsystem.png</image>
+      <image>images/lists/element.png[new]</image>
     </objectType>
 
     <objectType>
@@ -73,7 +72,7 @@
       <objectClass>FAKE_OC_NewDevice</objectClass>
       <category>terminal</category>
       <class>termgeneric</class>
-      <image>plugins/systems/images/select_newsystem.png</image>
+      <image>images/lists/element.png[new]</image>
     </objectType>
 
     <objectType>
@@ -134,7 +133,7 @@
 
     <objectType>
       <label>Phone</label>
-      <objectClass>goPhoneHardware</objectClass>
+      <objectClass>goFonHardware</objectClass>
       <category>phone</category>
       <class>phoneGeneric</class>
       <image>plugins/systems/images/select_phone.png</image>
@@ -151,7 +150,7 @@
   </definition>
 
   <table>
-    <layout>|20px;c||250px|170px;r|</layout>
+    <layout>|20px;c|||80px|170px;r|</layout>
 
     <department>
       <value>%{filter:objectType(dn,objectClass)}</value>
@@ -182,6 +181,14 @@
       <export>true</export>
     </column>
 
+    <column>
+      <label>Release</label>
+      <sortAttribute>description</sortAttribute>
+      <sortType>string</sortType>
+      <value>%{filter:systemRelease(row,dn,"%s",objectClass,FAIclass)}</value>
+      <export>true</export>
+    </column>
+
     <column>
       <label>Actions</label>
       <value>%{filter:actions(dn,row,objectClass)}</value>
@@ -193,61 +200,61 @@
 
     <action>
      <type>sub</type>
-     <image>images/lists/new.png</image>
+     <image>images/lists/element.png[new]</image>
      <label>Create</label>
 
      <action>
-      <name>new_server</name>
+      <name>new_goServer</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_server.png</image>
+      <image>plugins/systems/images/select_server.png[new]</image>
       <label>Server</label>
       <depends>servgeneric</depends>
      </action>
 
      <action>
-      <name>new_workstation</name>
+      <name>new_gotoWorkstation</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_workstation.png</image>
+      <image>plugins/systems/images/select_workstation.png[new]</image>
       <label>Workstation</label>
       <depends>workgeneric</depends>
      </action>
 
      <action>
-      <name>new_terminal</name>
+      <name>new_gotoTerminal</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_terminal.png</image>
+      <image>plugins/systems/images/select_terminal.png[new]</image>
       <label>Terminal</label>
       <depends>termgeneric</depends>
      </action>
 
      <action>
-      <name>new_printer</name>
+      <name>new_gotoPrinter</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_printer.png</image>
+      <image>plugins/systems/images/select_printer.png[new]</image>
       <label>Network printer</label>
       <depends>printgeneric</depends>
      </action>
 
      <action>
-      <name>new_phone</name>
+      <name>new_goFonHardware</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_phone.png</image>
+      <image>plugins/systems/images/select_phone.png[new]</image>
       <label>Phone</label>
       <depends>phoneGeneric</depends>
      </action>
 
      <action>
-      <name>new_component</name>
+      <name>new_ieee802Device</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_component.png</image>
+      <image>plugins/systems/images/select_component.png[new]</image>
       <label>Network device</label>
       <depends>componentGeneric</depends>
      </action>
 
      <action>
-      <name>new_opsi_client</name>
+      <name>new_FAKE_OC_OpsiHost</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_winstation.png</image>
+      <image>plugins/systems/images/select_winstation.png[new]</image>
       <label>Opsi client</label>
       <depends>opsi</depends>
      </action>
@@ -391,7 +398,7 @@
     </action>
 
     <action>
-      <name>DaemonEvent_activate</name>
+      <name>activateMultiple</name>
       <depends>DaemonEvent_activate</depends>
       <type>entry</type>
       <image>images/lists/unlocked.png</image>
@@ -425,6 +432,15 @@
 
   <actiontriggers snapshot="true" copypaste="true">
 
+    <action>
+      <name>setPassword</name>
+      <type>entry</type>
+      <objectclass>FAKE_OC_PWD_changeAble</objectclass>
+      <image>images/lists/key.png</image>
+      <label>Change password</label>
+    </action>
+
+
     <action>
       <name>createISO</name>
       <type>entry</type>
@@ -456,8 +472,8 @@
       <name>remove</name>
       <type>entry</type>
       <image>images/lists/trash.png</image>
-      <acl>roles/role[d]</acl>
-      <label>Remove role</label>
+      <acl>%acl[d]</acl>
+      <label>Remove system</label>
     </action>
 
   </actiontriggers>