From 59d85befd7e0be90fdef4c051a8778f66d1a5136 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 16 Sep 2010 11:09:09 +0000
Subject: [PATCH] Updated the installable device template

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19705 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../systems/goto/Device/InstallRecipe.tpl     | 27 +++++++++----------
 .../goto/Device/class_InstallRecipe.inc       |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/gosa-plugins/goto/admin/systems/goto/Device/InstallRecipe.tpl b/gosa-plugins/goto/admin/systems/goto/Device/InstallRecipe.tpl
index 01bd5bf00..6200e2295 100644
--- a/gosa-plugins/goto/admin/systems/goto/Device/InstallRecipe.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/Device/InstallRecipe.tpl
@@ -1,58 +1,57 @@
 <table>
     <tr>
-        <td><LABEL for="member">{t}member{/t}</LABEL></td>
+        <td><LABEL for="member">{t}Member{/t}</LABEL></td>
         <td><input type='text' name="member" id="member" value="{$member}">
     </tr>
     <tr>
-        <td><LABEL for="ksTemplate">{t}ksTemplate{/t}</LABEL></td>
+        <td><LABEL for="ksTemplate">{t}Kickstart template{/t}</LABEL></td>
         <td><input type='text' name="ksTemplate" id="ksTemplate" value="{$ksTemplate}">
     </tr>
     <tr>
-        <td><LABEL for="ksKeyboardlayout">{t}ksKeyboardlayout{/t}</LABEL></td>
+        <td><LABEL for="ksKeyboardlayout">{t}Keyboard layout{/t}</LABEL></td>
 
         <td><input type='text' name="ksKeyboardlayout" id="ksKeyboardlayout" value="{$ksKeyboardlayout}">
     </tr>
     <tr>
-        <td><LABEL for="ksSystemLocale">{t}ksSystemLocale{/t}</LABEL></td>
+        <td><LABEL for="ksSystemLocale">{t}System locale{/t}</LABEL></td>
         <td><input type='text' name="ksSystemLocale" id="ksSystemLocale" value="{$ksSystemLocale}">
     </tr>
     <tr>
-        <td><LABEL for="ksTimezone">{t}ksTimezone{/t}</LABEL></td>
+        <td><LABEL for="ksTimezone">{t}Timezone{/t}</LABEL></td>
         <td><input type='text' name="ksTimezone" id="ksTimezone" value="{$ksTimezone}">
     </tr>
 
     <tr>
-        <td><LABEL for="ksTimeUTC">{t}ksTimeUTC{/t}</LABEL></td>
+        <td><LABEL for="ksTimeUTC">{t}UTC Time{/t}</LABEL></td>
         <td><input type='text' name="ksTimeUTC" id="ksTimeUTC" value="{$ksTimeUTC}">
     </tr>
     <tr>
-        <td><LABEL for="ksNTPServer">{t}ksNTPServer{/t}</LABEL></td>
+        <td><LABEL for="ksNTPServer">{t}NTP server{/t}</LABEL></td>
         <td><input type='text' name="ksNTPServer" id="ksNTPServer" value="{$ksNTPServer}">
     </tr>
     <tr>
-        <td><LABEL for="ksMirror">{t}ksMirror{/t}</LABEL></td>
-
+        <td><LABEL for="ksMirror">{t}Mirror{/t}</LABEL></td>
         <td><input type='text' name="ksMirror" id="ksMirror" value="{$ksMirror}">
     </tr>
     <tr>
-        <td><LABEL for="ksMirrorTorrent">{t}ksMirrorTorrent{/t}</LABEL></td>
+        <td><LABEL for="ksMirrorTorrent">{t}Torrent mirror{/t}</LABEL></td>
         <td><input type='text' name="ksMirrorTorrent" id="ksMirrorTorrent" value="{$ksMirrorTorrent}">
     </tr>
     <tr>
-        <td><LABEL for="ksRootEnabled">{t}ksRootEnabled{/t}</LABEL></td>
+        <td><LABEL for="ksRootEnabled">{t}Root enabled{/t}</LABEL></td>
         <td><input type='text' name="ksRootEnabled" id="ksRootEnabled" value="{$ksRootEnabled}">
     </tr>
 
     <tr>
-        <td><LABEL for="ksRootPasswordHash">{t}ksRootPasswordHash{/t}</LABEL></td>
+        <td><LABEL for="ksRootPasswordHash">{t}Root password hash{/t}</LABEL></td>
         <td><input type='text' name="ksRootPasswordHash" id="ksRootPasswordHash" value="{$ksRootPasswordHash}">
     </tr>
     <tr>
-        <td><LABEL for="ksKernelPackage">{t}ksKernelPackage{/t}</LABEL></td>
+        <td><LABEL for="ksKernelPackage">{t}Kernel package{/t}</LABEL></td>
         <td><input type='text' name="ksKernelPackage" id="ksKernelPackage" value="{$ksKernelPackage}">
     </tr>
     <tr>
-        <td><LABEL for="ksPartitionTable">{t}ksPartitionTable{/t}</LABEL></td>
+        <td><LABEL for="ksPartitionTable">{t}Partition table{/t}</LABEL></td>
         <td><input type='text' name="ksPartitionTable" id="ksPartitionTable" value="{$ksPartitionTable}">
     </tr>
 </table>
diff --git a/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc b/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc
index d556e0f40..1d0842f93 100644
--- a/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc
+++ b/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc
@@ -57,7 +57,7 @@ class InstallRecipe extends plugin
                     "plDepends"     => array(),
                     "plPriority"    => 1,
                     "plSection"     => array("administration"),
-                    "plCategory"    => array("registeredDevice"),
+                    "plCategory"    => array("Device"),
                     "plProvidedAcls" => array(
                         "member" => _("Member"),
                         "ksTemplate" => _("Template"),
-- 
2.30.2