From a62bd24a823f866aa7a1420a9307e06cf56bdac2 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 17 May 2011 07:17:44 +0000
Subject: [PATCH] Updated Device Config

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20841 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../goto/admin/systems/goto/Device/DeviceConfig.tpl      | 5 ++++-
 .../admin/systems/goto/Device/class_DeviceConfig.inc     | 9 ++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/gosa-plugins/goto/admin/systems/goto/Device/DeviceConfig.tpl b/gosa-plugins/goto/admin/systems/goto/Device/DeviceConfig.tpl
index 5517d0502..21e889b22 100644
--- a/gosa-plugins/goto/admin/systems/goto/Device/DeviceConfig.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/Device/DeviceConfig.tpl
@@ -1,9 +1,11 @@
 <table width='100%'>
     <tr>
-        <td>
+        <td style='width:50%; vertical-align: top;padding-right:5px;'>
+            <h3>{t}Assignable items{/t}</h3>
             {$assignableElementsList}
         </td>
         <td style='width:50%; vertical-align: top;padding-left:5px;' class='left-border'>
+            <h3>{t}Assigned items{/t}</h3>
             {$usedElementsList}
         </td>
     </tr>
@@ -14,6 +16,7 @@
     </tr>
     <tr>
         <td colspan=2>
+            <h3>{t}Parameters{/t}</h3>
             {$parameterList}
         </td>
     </tr>
diff --git a/gosa-plugins/goto/admin/systems/goto/Device/class_DeviceConfig.inc b/gosa-plugins/goto/admin/systems/goto/Device/class_DeviceConfig.inc
index 1edcb6f04..b064c1cfe 100644
--- a/gosa-plugins/goto/admin/systems/goto/Device/class_DeviceConfig.inc
+++ b/gosa-plugins/goto/admin/systems/goto/Device/class_DeviceConfig.inc
@@ -130,12 +130,11 @@ class DeviceConfig extends plugin
         $data = $lData = array();;
         foreach($this->usedElements as $name){
             $parameter = $this->assignableElements[$name]['parameter'];
-            foreach($parameter as $name => $desc){
-                $data[$name] = NULL;
-                $lData[$name] = array('data' => array($desc));
+            foreach($parameter as $param => $desc){
+                $data[$param] = NULL;
             }
-            $value = (isset($this->parameterValues[$name])) ? $this->parameterValues[$name] : "<i>"._('unset')."</i>";
-            $lData[$name] = array('data' => array($name, $value));
+            $value = (isset($this->parameterValues[$param])) ? $this->parameterValues[$param] : "<i>"._('unset')."</i>";
+            $lData[$param] = array('data' => array($name, $param, $value));
         }
         $this->parameterList->setListData($data, $lData);
         
-- 
2.30.2