Updated for non-single value

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

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index 0748e91381d97067f6bd15153166eba19dc9703e..02374a3db10e5e1b3e2fda3cbfb5849035d6af66 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -73,6 +73,11 @@ class workgeneric extends plugin
       $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
     }
 
+    /* Workaround for not single-value attribute gotoNtpServer */
+    if (isset($this->attrs['gotoNtpServer'][0])){
+      $this->gotoNtpServer= $this->attrs['gotoNtpServer'][0];
+    }
+
     /* Save 'dn' for later referal */
     $this->orig_dn= $this->dn;
   }

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 9b9ffacfe3075a6b0fdf5d8ec1135038b285a405..0fa75c4b40585c28e3736cd37376fb8d0f56bbb5 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -557,7 +557,7 @@ class workstartup extends plugin
     /* Create divSelectBox for ldap server selection
      */
     $SelectBoxLdapServer = new divSelectBox("LdapServer");
-    $SelectBoxLdapServer->SetHeight(80);
+    $SelectBoxLdapServer->SetHeight(130);
 
     /* Set first entry as selected, if $this->gotoLdapServer is empty
      *  or given entry is no longer available ... 

diff --git a/plugins/admin/systems/workstationStartup.tpl b/plugins/admin/systems/workstationStartup.tpl
index ae77f1aec841ea209d097e37d2d8e8e3c48d6eea..c27a8ce2a4672428f04a9858fa259c38679064f0 100644 (file)
--- a/plugins/admin/systems/workstationStartup.tpl
+++ b/plugins/admin/systems/workstationStartup.tpl
@@ -4,11 +4,6 @@
 <h2><img class="center" alt="" align="middle" src="images/penguin.png"> {t}Boot parameters{/t}</h2>
 
    <table summary="" style="width:100%">
-    <tr>
-     <td colspan="2" style='vertical-align:top;padding-top:3px;'><LABEL for="gotoLdapServer">{t}LDAP server{/t}</LABEL><br>
-         {$SelectBoxLdapServer}        
-     </td>
-    </tr>
     <tr>
      <td><LABEL for="gotoBootKernel">{t}Boot kernel{/t}</LABEL></td>
      <td style="width:70%">
@@ -20,9 +15,14 @@
     </tr>
     <tr>
      <td><LABEL for="customParameters">{t}Custom options{/t}</LABEL></td>
-     <td><input name="customParameters" id="customParameters"  size=25 maxlength=500 {$gotoKernelParametersACL}
+     <td><input name="customParameters" id="customParameters" size=25 maxlength=500 {$gotoKernelParametersACL}
                 value="{$customParameters}" title="{t}Enter any parameters that should be passed to the kernel as append line during bootup{/t}"></td>
     </tr>
+    <tr>
+     <td colspan="2" style='vertical-align:top;padding-top:3px;'><LABEL for="gotoLdapServer">{t}LDAP server{/t}</LABEL><br>
+         {$SelectBoxLdapServer}        
+     </td>
+    </tr>
    </table>
 
   </td>