From f1a9b677e0e99b3f7c28feb4e5809eaa3e23b528 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 16 Sep 2010 06:08:42 +0000
Subject: [PATCH] Updated registered device classes

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19691 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../goto/devices/class_registeredDevice.inc   | 15 +++-
 .../systems/goto/devices/registeredDevice.tpl | 86 ++++++++++++++++---
 2 files changed, 87 insertions(+), 14 deletions(-)

diff --git a/gosa-plugins/goto/admin/systems/goto/devices/class_registeredDevice.inc b/gosa-plugins/goto/admin/systems/goto/devices/class_registeredDevice.inc
index 52d1bcc97..2a7764ee6 100644
--- a/gosa-plugins/goto/admin/systems/goto/devices/class_registeredDevice.inc
+++ b/gosa-plugins/goto/admin/systems/goto/devices/class_registeredDevice.inc
@@ -5,8 +5,12 @@ class registeredDevice extends plugin
 {
 
     public $objectclasses = array('top','device','registeredDevice');
-    public $attributes = array("cn","serialNumber","seeAlso","owner","ou","o",
-            "l","description","manager","deviceUUID","deviceStatus");
+    public $attributes = array("cn","serialNumber","seeAlso","owner","ou","o","ipHostNumber",
+            "l","description","manager","deviceUUID","deviceStatus","macAddress",);
+
+    public $dynClasses = array(
+            'ieee802Device' => array('macAddress'),
+            'ipHost' => array('ipHostNumber'));
 
     public $cn = "";
     public $serialNumber = "";
@@ -20,6 +24,9 @@ class registeredDevice extends plugin
     public $deviceUUID = "";
     public $deviceStatus = "";
 
+    public $ipHostNumber = "";
+    public $macAddress = "";
+
     public $base = "";
     public $orig_dn ="";
 
@@ -81,7 +88,9 @@ class registeredDevice extends plugin
                         "description" => _("Description"),
                         "manager" => _("Manager"),
                         "deviceUUID" => _("Uuid"),
-                        "deviceStatus" => _("Stauts")
+                        "deviceStatus" => _("Stauts"),
+                        "macAddress" => _("MAC address"),
+                        "ipHostNumber" => _("IP address")
                         )
                         )
                         );
diff --git a/gosa-plugins/goto/admin/systems/goto/devices/registeredDevice.tpl b/gosa-plugins/goto/admin/systems/goto/devices/registeredDevice.tpl
index 6ab332f4b..8a45bf8bd 100644
--- a/gosa-plugins/goto/admin/systems/goto/devices/registeredDevice.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/devices/registeredDevice.tpl
@@ -1,13 +1,77 @@
 <h3>{t}Registered device{/t}</h3>
 
-<br>Name: <input type="text" name="cn" value="{$cn}">
-<br>Serial number <input type="text" name="serialNumber" value="{$serialNumber}">
-<br>See also <input type="text" name="seeAlso" value="{$seeAlso}">
-<br>Owner <input type="text" name="owner" value="{$owner}">
-<br>Organizational unit <input type="text" name="ou" value="{$ou}">
-<br>Organization <input type="text" name="o" value="{$o}">
-<br>Location <input type="text" name="l" value="{$l}">
-<br>Description <input type="text" name="description" value="{$description}">
-<br>Manager <input type="text" name="manager" value="{$manager}">
-<br>UUid <input type="text" name="deviceUUID" value="{$deviceUUID}">
-<br>Status <input type="text" name="deviceStatus" value="{$deviceStatus}">
+
+<table width="100%">
+    <tr>
+        <td style='width:50%;'>
+            <table>
+                <tr>
+                    <td><LABEL for='name'>{t}Name{/t}</LABEL></td>
+                    <td> <input type="text" name="cn" value="{$cn}"></td>
+                </tr>
+                <tr>
+                    <td><LABEL for='description'>{t}Description{/t}</LABEL></td>
+                    <td> <input type="text" name="description" value="{$description}"></td>
+                </tr>
+                <tr>
+                    <td><LABEL for='ou'>{t}Organizational unit{/t}</LABEL></td>
+                    <td> <input type="text" name="ou" value="{$ou}"></td>
+                </tr>
+                <tr>
+                    <td><LABEL for='o'>{t}Organizaton{/t}</LABEL></td>
+                    <td> <input type="text" name="o" value="{$o}"></td>
+                </tr>
+                <tr>
+                    <td><LABEL for='l'>{t}Location{/t}</LABEL></td>
+                    <td> <input type="text" name="l" value="{$l}"></td>
+                </tr>
+            </table>
+        </td>
+        <td class='left-border'>
+            <table>
+                <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='deviceUUID'>{t}Device UUID{/t}</LABEL></td>
+                    <td> <input type="text" name="deviceUUID" value="{$deviceUUID}"></td>
+                </tr>
+                <tr>
+                    <td><LABEL for='deviceStatus'>{t}Status{/t}</LABEL></td>
+                    <td> <input type="text" name="deviceStatus" value="{$deviceStatus}"></td>
+                </tr>
+            </table>
+            <hr>
+            <table>
+                <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>
+                <tr>
+                    <td><LABEL for='manager'>{t}Manager{/t}</LABEL></td>
+                    <td> <input type="text" name="manager" value="{$manager}"></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>
-- 
2.30.2