Updated the device templates

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

diff --git a/gosa-plugins/goto/admin/systems/goto/Device/InstallRecipe.tpl b/gosa-plugins/goto/admin/systems/goto/Device/InstallRecipe.tpl
index 6200e2295518ff9955f9666b1cb192ab3f16d46a..93db162468a7bf05e9de613202f0d62932aef1df 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/Device/InstallRecipe.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/Device/InstallRecipe.tpl
@@ -1,57 +1,83 @@
 <table>
     <tr>
         <td><LABEL for="member">{t}Member{/t}</LABEL></td>
-        <td><input type='text' name="member" id="member" value="{$member}">
+        <td>
+            <input type='text' name="member" id="member" value="{$member}">
+        </td>
     </tr>
     <tr>
         <td><LABEL for="ksTemplate">{t}Kickstart template{/t}</LABEL></td>
-        <td><input type='text' name="ksTemplate" id="ksTemplate" value="{$ksTemplate}">
+        <td>
+            <input type='text' name="ksTemplate" id="ksTemplate" value="{$ksTemplate}">
+        </td>
     </tr>
     <tr>
         <td><LABEL for="ksKeyboardlayout">{t}Keyboard layout{/t}</LABEL></td>
 
-        <td><input type='text' name="ksKeyboardlayout" id="ksKeyboardlayout" value="{$ksKeyboardlayout}">
+        <td>
+            <input type='text' name="ksKeyboardlayout" id="ksKeyboardlayout" value="{$ksKeyboardlayout}">
+        </td>
     </tr>
     <tr>
         <td><LABEL for="ksSystemLocale">{t}System locale{/t}</LABEL></td>
-        <td><input type='text' name="ksSystemLocale" id="ksSystemLocale" value="{$ksSystemLocale}">
+        <td>
+            <input type='text' name="ksSystemLocale" id="ksSystemLocale" value="{$ksSystemLocale}">
+        </td>
     </tr>
     <tr>
         <td><LABEL for="ksTimezone">{t}Timezone{/t}</LABEL></td>
-        <td><input type='text' name="ksTimezone" id="ksTimezone" value="{$ksTimezone}">
+        <td>
+            <input type='text' name="ksTimezone" id="ksTimezone" value="{$ksTimezone}">
+        </td>
     </tr>
 
     <tr>
         <td><LABEL for="ksTimeUTC">{t}UTC Time{/t}</LABEL></td>
-        <td><input type='text' name="ksTimeUTC" id="ksTimeUTC" value="{$ksTimeUTC}">
+        <td>
+            <input type='text' name="ksTimeUTC" id="ksTimeUTC" value="{$ksTimeUTC}">
+        </td>
     </tr>
     <tr>
         <td><LABEL for="ksNTPServer">{t}NTP server{/t}</LABEL></td>
-        <td><input type='text' name="ksNTPServer" id="ksNTPServer" value="{$ksNTPServer}">
+        <td>
+            <input type='text' name="ksNTPServer" id="ksNTPServer" value="{$ksNTPServer}">
+        </td>
     </tr>
     <tr>
         <td><LABEL for="ksMirror">{t}Mirror{/t}</LABEL></td>
-        <td><input type='text' name="ksMirror" id="ksMirror" value="{$ksMirror}">
+        <td>
+            <input type='text' name="ksMirror" id="ksMirror" value="{$ksMirror}">
+        </td>
     </tr>
     <tr>
         <td><LABEL for="ksMirrorTorrent">{t}Torrent mirror{/t}</LABEL></td>
-        <td><input type='text' name="ksMirrorTorrent" id="ksMirrorTorrent" value="{$ksMirrorTorrent}">
+        <td>
+            <input type='text' name="ksMirrorTorrent" id="ksMirrorTorrent" value="{$ksMirrorTorrent}">
+        </td>
     </tr>
     <tr>
         <td><LABEL for="ksRootEnabled">{t}Root enabled{/t}</LABEL></td>
-        <td><input type='text' name="ksRootEnabled" id="ksRootEnabled" value="{$ksRootEnabled}">
+        <td>
+            <input type='text' name="ksRootEnabled" id="ksRootEnabled" value="{$ksRootEnabled}">
+        </td>
     </tr>
 
     <tr>
         <td><LABEL for="ksRootPasswordHash">{t}Root password hash{/t}</LABEL></td>
-        <td><input type='text' name="ksRootPasswordHash" id="ksRootPasswordHash" value="{$ksRootPasswordHash}">
+        <td>
+            <input type='text' name="ksRootPasswordHash" id="ksRootPasswordHash" value="{$ksRootPasswordHash}">
+        </td>
     </tr>
     <tr>
         <td><LABEL for="ksKernelPackage">{t}Kernel package{/t}</LABEL></td>
-        <td><input type='text' name="ksKernelPackage" id="ksKernelPackage" value="{$ksKernelPackage}">
+        <td>
+            <input type='text' name="ksKernelPackage" id="ksKernelPackage" value="{$ksKernelPackage}">
+        </td>
     </tr>
     <tr>
         <td><LABEL for="ksPartitionTable">{t}Partition table{/t}</LABEL></td>
-        <td><input type='text' name="ksPartitionTable" id="ksPartitionTable" value="{$ksPartitionTable}">
+        <td>
+            <input type='text' name="ksPartitionTable" id="ksPartitionTable" value="{$ksPartitionTable}">
+        </td>
     </tr>
 </table>

diff --git a/gosa-plugins/goto/admin/systems/goto/Device/class_Device.inc b/gosa-plugins/goto/admin/systems/goto/Device/class_Device.inc
index ccbc6a7a75d29f133657080e52091aad6245f133..a6a8a42fa46e7bd40fb12855a792fcbc467c0d31 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/Device/class_Device.inc
+++ b/gosa-plugins/goto/admin/systems/goto/Device/class_Device.inc
@@ -108,6 +108,11 @@ class Device extends plugin
             $message[]= msgPool::invalid(_("IP address"), "", "", "192.168.1.10");
         }
 
+        // Check if there a cn given
+        if (empty($this->cn)){
+            $message[]= msgPool::required(_("Name"));
+        }
+
         // Check mac-address
         if (!empty($this->ipHostNumber) && !tests::is_ip($this->macAddress)){
             $message[]= msgPool::invalid(_("MAC address"), "", "", "00:0C:7F:31:33:F1");
@@ -164,6 +169,10 @@ class Device extends plugin
             $this->dialog = new singleUserSelect($this->config, get_userinfo());
         }
 
+        // Remove owner initiated 
+        if(isset($_POST['removeManager']))  $this->manager = "";
+        if(isset($_POST['removeOwner']))  $this->owner = "";
+
         // The user selection dialog has send that it has finished its job.
         // Store the posted user-dn as manager or owner. 
         if($this->dialog && $this->dialog instanceOf singleUserSelect && count($this->dialog->detectPostActions())){

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 91539f1092c9d5d2aac463b5dc155b35b349786c..201ba9a459a8af595ea1f56cab7d961d8d09ab76 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc
+++ b/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc
@@ -24,12 +24,26 @@ class InstallRecipe extends plugin
     function __construct(&$config, $dn)
     {
         plugin::plugin($config, $dn);
+
+        // Prepare list of timezones
+        $tmp = timezone::_get_tz_zones();
+        $list = array();
+        foreach($tmp['TIMEZONES'] as $name => $offset){
+            if($offset >= 0){
+                $list[$name] = $name." ( + ".sprintf("%0.2f",$offset/(60*60))." "._("hours").")";
+            }else{
+                $offset = $offset * -1;
+                $list[$name] = $name." ( - ".sprintf("%0.2f",($offset/(60*60)))." "._("hours").")";
+            }
+        }   
+        $this->timezones = $list;
     }
 
     function execute()
     {
         plugin::execute();    
         $smarty = get_smarty();
+        $smarty->assign('timezones', $this->timezones);
         foreach($this->attributes as $attr){
             $smarty->assign($attr, $this->$attr);
         }