diff --git a/gosa-plugins/systems/admin/systems/system-list.xml b/gosa-plugins/systems/admin/systems/system-list.xml
index a7cca5c4d2b665c29b434af89ab52acc03f4251c..1fdb07a634c0c863b8984cc108f4da9cad3909be 100644 (file)
<label>List of systems</label>
<defaultSortColumn>1</defaultSortColumn>
+ <objectType>
+ <label>Device</label>
+ <objectClass>registeredDevice</objectClass>
+ <category>Device</category>
+ <class>Device</class>
+ <image>images/lists/edit.png</image>
+ </objectType>
+
<objectType>
<label>Opsi host</label>
<objectClass>FAKE_OC_OpsiHost</objectClass>
<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>
<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>
<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>
<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>
<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_ArpNewDevice</objectClass>
- <category>terminal</category>
- <class>termgeneric</class>
- <image>plugins/systems/images/select_newsystem.png</image>
+ <category>incoming</category>
+ <class>ArpNewDevice</class>
+ <image>images/lists/element.png[new]</image>
</objectType>
<objectType>
<label>New device</label>
<objectClass>FAKE_OC_NewDevice</objectClass>
- <category>terminal</category>
- <class>termgeneric</class>
- <image>plugins/systems/images/select_newsystem.png</image>
+ <category>incoming</category>
+ <class>systemManagement</class>
+ <image>images/lists/element.png[new]</image>
</objectType>
<objectType>
</objectType>
<objectType>
- <label>Winstation</label>
+ <label>Windows workstation</label>
<objectClass>FAKE_OC_winstation</objectClass>
<category>winworkstation</category>
<class>wingeneric</class>
<label>Printer</label>
<objectClass>gotoPrinter</objectClass>
<category>printer</category>
- <class>printGeneric</class>
+ <class>printgeneric</class>
<image>plugins/systems/images/select_printer.png</image>
</objectType>
</definition>
<table>
- <layout>|20px;c||250px||170px;r|</layout>
+ <layout>|20px;c|||80px|170px;r|</layout>
<department>
<value>%{filter:objectType(dn,objectClass)}</value>
<label>Name</label>
<sortAttribute>cn</sortAttribute>
<sortType>string</sortType>
- <value>%{filter:link(row,dn,"%s",cn)}</value>
+ <value>%{filter:filterLink(row,dn,"%s",cn,pid)}</value>
<export>true</export>
</column>
<label>Description</label>
<sortAttribute>description</sortAttribute>
<sortType>string</sortType>
- <value>%{filter:link(row,dn,"%s",description)}</value>
+ <value>%{filter:filterSystemDescription(row,dn,pid,state,description)}</value>
<export>true</export>
</column>
<action>
<type>sub</type>
- <image>images/lists/new.png</image>
+ <image>images/lists/element.png[new]</image>
<label>Create</label>
+ <action>
+ <name>new_device</name>
+ <type>entry</type>
+ <image>images/lists/edit.png</image>
+ <label>Device</label>
+ <depends>Device</depends>
+ </action>
+
<action>
<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_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_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_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_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_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_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>