Updated the Device template

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

diff --git a/gosa-plugins/goto/admin/systems/goto/devices/Device.tpl b/gosa-plugins/goto/admin/systems/goto/devices/Device.tpl
index 8a45bf8bd9535ccd2af80b0f66ad225f9835ae1c..3a99b999f2d20a4b7f193901aa87ee594d9d1c49 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/devices/Device.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/devices/Device.tpl
@@ -1,9 +1,10 @@
-<h3>{t}Registered device{/t}</h3>
 
 
 <table width="100%">
     <tr>
         <td style='width:50%;'>
+
+            <h3>{t}Device{/t}</h3>
             <table>
                 <tr>
                     <td><LABEL for='name'>{t}Name{/t}</LABEL></td>
@@ -13,6 +14,9 @@
                     <td><LABEL for='description'>{t}Description{/t}</LABEL></td>
                     <td> <input type="text" name="description" value="{$description}"></td>
                 </tr>
+            </table>
+            <hr>
+            <table>
                 <tr>
                     <td><LABEL for='ou'>{t}Organizational unit{/t}</LABEL></td>
                     <td> <input type="text" name="ou" value="{$ou}"></td>
@@ -25,13 +29,26 @@
                     <td><LABEL for='l'>{t}Location{/t}</LABEL></td>
                     <td> <input type="text" name="l" value="{$l}"></td>
                 </tr>
+                <tr>
+                    <td><LABEL for='serialNumber'>{t}Serial number{/t}</LABEL></td>
+                    <td> <input type="text" name="serialNumber" value="{$serialNumber}"></td>
+                </tr>
+                <tr>
+                    <td><LABEL for='seeAlso'>{t}See also{/t}</LABEL></td>
+                    <td> <input type="text" name="seeAlso" value="{$seeAlso}"></td>
+                </tr>
+                <tr>
+                    <td><LABEL for='owner'>{t}Owner{/t}</LABEL></td>
+                    <td> <input type="text" name="owner" value="{$owner}"></td>
+                </tr>
             </table>
         </td>
-        <td class='left-border'>
+        <td class='left-border' style='padding-left:5px;'>
+            <h3>{t}Registered device{/t}</h3>
             <table>
                 <tr>
-                    <td><LABEL for='serialNumber'>{t}Serial number{/t}</LABEL></td>
-                    <td> <input type="text" name="serialNumber" value="{$serialNumber}"></td>
+                    <td><LABEL for='manager'>{t}Manager{/t}</LABEL></td>
+                    <td> <input type="text" name="manager" value="{$manager}"></td>
                 </tr>
                 <tr>
                     <td><LABEL for='deviceUUID'>{t}Device UUID{/t}</LABEL></td>
@@ -42,36 +59,19 @@
                     <td> <input type="text" name="deviceStatus" value="{$deviceStatus}"></td>
                 </tr>
             </table>
+
             <hr>
+            <h3>{t}Network settings{/t}</h3>
             <table>
                 <tr>
-                    <td><LABEL for='seeAlso'>{t}See also{/t}</LABEL></td>
-                    <td> <input type="text" name="seeAlso" value="{$seeAlso}"></td>
+                    <td><LABEL for='ipHostNumber'>{t}IP-address{/t}</LABEL></td>
+                    <td> <input type="text" name="ipHostNumber" value="{$ipHostNumber}"></td>
                 </tr>
                 <tr>
-                    <td><LABEL for='owner'>{t}Owner{/t}</LABEL></td>
-                    <td> <input type="text" name="owner" value="{$owner}"></td>
-                </tr>
-                <tr>
-                    <td><LABEL for='manager'>{t}Manager{/t}</LABEL></td>
-                    <td> <input type="text" name="manager" value="{$manager}"></td>
+                    <td><LABEL for='macAddress'>{t}MAC-address{/t}</LABEL></td>
+                    <td> <input type="text" name="macAddress" value="{$macAddress}"></td>
                 </tr>
             </table>
         </td>
     </tr>
 </table>
-
-<hr>
-
-<h3>{t}Network settings{/t}</h3>
-
-<table>
-    <tr>
-        <td><LABEL for='ipHostNumber'>{t}IP-address{/t}</LABEL></td>
-        <td> <input type="text" name="ipHostNumber" value="{$ipHostNumber}"></td>
-    </tr>
-    <tr>
-        <td><LABEL for='macAddress'>{t}MAC-address{/t}</LABEL></td>
-        <td> <input type="text" name="macAddress" value="{$macAddress}"></td>
-    </tr>
-</table>

diff --git a/gosa-plugins/goto/admin/systems/goto/devices/class_Device.inc b/gosa-plugins/goto/admin/systems/goto/devices/class_Device.inc
index 4c2014102403e79f4e05ee32e8e8d40af2e715de..19be8bf876cdc977a1a7042045932356dbf5be1f 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/devices/class_Device.inc
+++ b/gosa-plugins/goto/admin/systems/goto/devices/class_Device.inc
@@ -6,11 +6,11 @@ class Device extends plugin
 
     public $objectclasses = array('top','device');
     public $attributes = array("cn","serialNumber","seeAlso","owner","ou","o","ipHostNumber",
-            "l","description","manager","deviceUUID","deviceStatus","macAddress",);
+            "l","description","manager","deviceUUID","deviceStatus","macAddress","deviceType");
 
     public $dynClasses = array(
             'ieee802Device' => array('macAddress'),
-            'registeredDevice' => array('deviceStatus','deviceUUID'),
+            'registeredDevice' => array('deviceStatus','deviceUUID','manager','deviceType'),
             'ipHost' => array('ipHostNumber'));
 
     public $cn = "";
@@ -24,7 +24,7 @@ class Device extends plugin
     public $manager = "";
     public $deviceUUID = "";
     public $deviceStatus = "";
-
+    public $deviceType = "";
     public $ipHostNumber = "";
     public $macAddress = "";