Updated distribution parameters

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

diff --git a/gosa-plugins/goto-ng/admin/newConfigManagement/class_newConfigManagement.inc b/gosa-plugins/goto-ng/admin/newConfigManagement/class_newConfigManagement.inc
index 910cc8a1eef72a036997a9a3386ec3ba5538d7f6..b16916f93d1532208a1af70851c343b5c50609bc 100644 (file)
--- a/gosa-plugins/goto-ng/admin/newConfigManagement/class_newConfigManagement.inc
+++ b/gosa-plugins/goto-ng/admin/newConfigManagement/class_newConfigManagement.inc
@@ -50,6 +50,12 @@ class newConfigManagement extends plugin
                 'type' => 'string', 'display' => _('Mirror Url'));
         $dOpt4 = array('description' => _('Method'), 'default' => 'puppet', 'value' => 'puppet', 'required' => false,
                 'type' => 'combobox', 'display' => _('Installation method'), 'values'=>array('puppet'=>_('Puppet')));
+        $dOpt5 = array('description' => _('Architecture'), 'default' => '', 'value' => '', 'required' => false,
+                'type' => 'list', 'display' => _('Architecture'));
+        $dOpt6 = array('description' => _('Component'), 'default' => '', 'value' => '', 'required' => false,
+                'type' => 'list', 'display' => _('Component'));
+        $dOpt7 = array('description' => _('Mirror sources'), 'default' => '', 'value' => '', 'required' => false,
+                'type' => 'checkbox', 'display' => _('Mirror sources'));
 
         // Define release parameters
         $rOpt1 = array('description' => _('Name'), 'default' => '', 'value' => '', 'required' => true,
@@ -63,6 +69,10 @@ class newConfigManagement extends plugin
         $items['Distribution']['options']['installation_type'] = $dOpt2;
         $items['Distribution']['options']['installation_method'] = $dOpt4;
 
+        $items['Distribution']['options']['architectures'] = $dOpt5;
+        $items['Distribution']['options']['components'] = $dOpt6;
+        $items['Distribution']['options']['mirror_sources'] = $dOpt7;
+
         $items['Release']['container'] = array('Release', '__CFG_ITEMS__');
         $items['Release']['name'] = 'Release';
         $items['Release']['description'] = _('Release');

diff --git a/gosa-plugins/goto-ng/admin/newConfigManagement/goto/Config/root.tpl b/gosa-plugins/goto-ng/admin/newConfigManagement/goto/Config/root.tpl
index 399e8095b28b295e589786b5e407580fdc12ce56..0e0db6f4bd9c2ce6be93d25353f9df50e4c9251f 100644 (file)
--- a/gosa-plugins/goto-ng/admin/newConfigManagement/goto/Config/root.tpl
+++ b/gosa-plugins/goto-ng/admin/newConfigManagement/goto/Config/root.tpl
@@ -1,20 +1,43 @@
 {if $type == 'Distribution'}
+
 <table>
     <tr>
-        <td>{$nameName}</td>
-        <td>{$name}</td>
-    </tr>
-    <tr>
-        <td>{$installation_typeName}</td>
-        <td>{$installation_type}</td>
-    </tr>
-    <tr>
-        <td>{$installation_methodName}</td>
-        <td>{$installation_method}</td>
-    </tr>
-    <tr>
-        <td>{$originName}</td>
-        <td>{$origin}</td>
+        <td style='width: 50%'>
+            <table>
+                <tr>
+                    <td>{$nameName}</td>
+                    <td>{$name}</td>
+                </tr>
+                <tr>
+                    <td>{$installation_typeName}</td>
+                    <td>{$installation_type}</td>
+                </tr>
+                <tr>
+                    <td>{$installation_methodName}</td>
+                    <td>{$installation_method}</td>
+                </tr>
+                <tr>
+                    <td>{$originName}</td>
+                    <td>{$origin}</td>
+                </tr>
+            </table>
+        </td>
+        <td>
+            <table>
+                <tr>
+                    <td>{$architecturesName}</td>
+                    <td>{$architectures}</td>
+                </tr>
+                <tr>
+                    <td>{$componentsName}</td>
+                    <td>{$components}</td>
+                </tr>
+                <tr>
+                    <td>{$mirror_sourcesName}</td>
+                    <td>{$mirror_sources}</td>
+                </tr>
+            </table>
+        </td>
     </tr>
 </table>
 {else if $type == 'Release'}