Code

Fixed samba template
[gosa.git] / gosa-plugins / samba / personal / samba / samba3.tpl
index 2ae4d66e26cbd83230ebfc1489aebddcea7cdbea..a27fd49eb9998cf1a53e8cb8d74e65f5a92ec95a 100644 (file)
@@ -1,19 +1,22 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="0" border="0">
+<table style='width:100%; ' summary="{t}Samba configuration{/t}">
+
 
  <!-- Headline container -->
  <tr>
-  <td colspan="2" style="width:50%; vertical-align:top;">
-   <h2><img class="center" alt="" align="middle" src="images/rightarrow.png"/>&nbsp;{t}Generic{/t}</h2>
+  <td style='width:50%; ' colspan="2">
+
+   <h3>{t}Generic{/t}</h3>
   </td>
  </tr>
  <tr>
-  <td style="vertical-align:top;">
-   <table summary="">
+  <td>
+
+   <table summary="{t}Path configuration{/t}">
     <tr>
      <td><label for="sambaHomePath">{t}Home directory{/t}</label></td>
      <td>
 {render acl=$sambaHomePathACL checkbox=$multiple_support checked=$use_sambaHomePath}
-      <input id="sambaHomePath" name="sambaHomePath" size=30 maxlength=60 value="{$sambaHomePath}">
+      <input type='text' id="sambaHomePath" name="sambaHomePath" size=30 maxlength=60 value="{$sambaHomePath}">
 {/render}
 {render acl=$sambaHomeDriveACL  checkbox=$multiple_support checked=$use_sambaHomeDrive}
       <select size="1" name="sambaHomeDrive">
      <td><label for="sambaDomainName">{t}Domain{/t}</label></td>
      <td>
 {render acl=$sambaDomainNameACL  checkbox=$multiple_support checked=$use_sambaDomainName}
-      <select id="sambaDomainName" size="1" name="sambaDomainName">
+      <select id="sambaDomainName" size="1" name="sambaDomainName"
+       onChange="document.mainform.submit();">
        {html_options values=$domains output=$domains selected=$sambaDomainName}
       </select>
+{/render}
+{render acl=$sambaDomainNameACL  checkbox=$multiple_support checked=$use_sambaDomainName}
+     <button type='submit' name='display_information'>{t}Show information{/t}</button>
+
 {/render}
      </td>
     </tr>
-    <tr>
-     <td>{t}Informations{/t}</td>
-     <td>
-      {if $display_informations}
-      <input type='submit' name='display_informations' value='{t}Hide{/t}'>
-      {else}
-      <input type='submit' name='display_informations' value='{t}Show{/t}'>
-      {/if}
-     </td>
-    </tr>
-    <tr>
-     <td colspan="2">
-     {if $display_informations}
-               {$samba_informations}
-     {/if}
-     <td>
-    </tr>
    </table>
   </td>
-  <td style="border-left:1px solid #A0A0A0">
+  <td class='left-border'>
+
    &nbsp;
   </td>
-  <td style="vertical-align:top;">
-   <table summary="">
+  <td>
+
+   <table summary="{t}Profile and script path settings{/t}">
     <tr>
      <td><label for="">{t}Script path{/t}</label></td>
      <td>
 {render acl=$sambaLogonScriptACL  checkbox=$multiple_support checked=$use_sambaLogonScript}
-      <input id="sambaLogonScript" name="sambaLogonScript" size=35 maxlength=60 value="{$sambaLogonScript}">
+      <input type='text' id="sambaLogonScript" name="sambaLogonScript" size=35 maxlength=60 value="{$sambaLogonScript}">
 {/render}
      </td>
     </tr>
@@ -68,7 +61,7 @@
      <td><label for="">{t}Profile path{/t}</label></td>
      <td>
 {render acl=$sambaProfilePathACL  checkbox=$multiple_support checked=$use_sambaProfilePath}
-      <input class="center" id="sambaProfilePath" name="sambaProfilePath" size=35 maxlength=60 value="{$sambaProfilePath}">
+      <input type='text' class="center" id="sambaProfilePath" name="sambaProfilePath" size=35 maxlength=60 value="{$sambaProfilePath}">
 {/render}
      </td>
     </tr>
  </tr>
 </table>
 
-<p class="seperator">&nbsp;</p>
+<hr>
 
-<h2><img class="center" alt="" align="middle" src="plugins/samba/images/terminal_server.png" />&nbsp;{t}Terminal Server{/t}</h2>
+<h3>{t}Terminal Server{/t}</h3>
 
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
+<table style='width:100%; ' summary="{t}Terminal server settings{/t}">
  <tr>
-  <td style="vertical-align:top;width:50%">
+  <td style='width:50%'>
+
 
 {if $multiple_support}
        <input class="center" type=checkbox name="use_tslogin" id="use_tslogin" value="1" 
 {/render}
 {/if}
    <i>{t}Allow login on terminal server{/t}</i>
-   <table summary="">
+   <table summary="{t}Terminal server connection settings{/t}">
     <tr>
      <td><label for="CtxWFHomeDir">{t}Home directory{/t}</label></td>
      <td>
 {render acl=$AllowLoginOnTerminalServerACL  checkbox=$multiple_support checked=$use_CtxWFHomeDir}
-      <input id="CtxWFHomeDir" name="CtxWFHomeDir" size=30 maxlength=60 value="{$CtxWFHomeDir}" {$tsloginstate}>
+      <input type='text' id="CtxWFHomeDir" name="CtxWFHomeDir" size=30 maxlength=60 value="{$CtxWFHomeDir}" {$tsloginstate}>
 {/render}
 {render acl=$AllowLoginOnTerminalServerACL  checkbox=$multiple_support checked=$use_CtxWFHomeDirDrive}
       <select size="1" id="CtxWFHomeDirDrive" name="CtxWFHomeDirDrive"  {$tsloginstate}>
      <td><label for="CtxWFProfilePath">{t}Profile path{/t}</label></td>
      <td>
 {render acl=$AllowLoginOnTerminalServerACL  checkbox=$multiple_support checked=$use_CtxWFProfilePath}
-      <input id="CtxWFProfilePath" name="CtxWFProfilePath" size=35 maxlength=60 value="{$CtxWFProfilePath}" {$tsloginstate}>
+      <input type='text' id="CtxWFProfilePath" name="CtxWFProfilePath" size=35 maxlength=60 value="{$CtxWFProfilePath}" {$tsloginstate}>
 {/render}
      </td>
     </tr>
    </table>
   </td>
-  <td style="border-left:1px solid #A0A0A0">
+  <td class='left-border'>
+
    &nbsp;
   </td>
-  <td style="vertical-align:top;">
+  <td>
+
 {render acl=$AllowLoginOnTerminalServerACL  checkbox=$multiple_support checked=$use_inherit}
    <input class="center" type=checkbox id="inherit" name="inherit" {if $inheritstate} checked {/if}
+    {$tsloginstate}
        onClick="changeState('CtxInitialProgram');
                 changeState('CtxWorkDirectory');"
        
        > 
 {/render}
-   <i>{t}Inherit client config{/t}</i>
-   <table summary="">
+   <i>{t}Inherit client configuration{/t}</i>
+   <table summary="{t}Client configuration{/t}">
     <tr>
      <td><label for="CtxInitialProgram">{t}Initial program{/t}</label></td>
      <td>
 {render acl=$AllowLoginOnTerminalServerACL  checkbox=$multiple_support checked=$use_CtxInitialProgram}
-      <input id="CtxInitialProgram" name="CtxInitialProgram" size=35 maxlength=60 value="{$CtxInitialProgram}" {$inheritstate}>
+      <input type='text' id="CtxInitialProgram" name="CtxInitialProgram" size=35 maxlength=60 value="{$CtxInitialProgram}" {$inheritstate} {$tsloginstate}>
 {/render}
      </td>
     </tr>
      <td><label for="CtxWorkDirectory">{t}Working directory{/t}</label></td>
      <td>
 {render acl=$AllowLoginOnTerminalServerACL  checkbox=$multiple_support checked=$use_CtxWorkDirectory}
-      <input id="CtxWorkDirectory" name="CtxWorkDirectory" size=35 maxlength=60        value='{$CtxWorkDirectory}' {$inheritstate}>
+      <input type='text' id="CtxWorkDirectory" name="CtxWorkDirectory" size=35 maxlength=60    value='{$CtxWorkDirectory}' {$inheritstate} {$tsloginstate}>
 {/render}
      </td>
     </tr>
  </tr>
 </table>
 
-<p class="seperator">&nbsp;</p>
+<hr>
+
+<table style='width:100%; ' summary="{t}Connection timeout settings{/t}">
 
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
  <tr>
-  <td style="vertical-align:top;">
+  <td>
+
    <i>{t}Timeout settings (in minutes){/t}</i>
-   <table summary="">
+   <table summary="{t}Connection timeout settings{/t}">
     <tr>
      <td>
 {if $multiple_support}
      </td>
      <td>
 {render acl=$AllowLoginOnTerminalServerACL}
-      <input name="CtxMaxConnectionTime" id="CtxMaxConnectionTime" size=5 maxlength=5 value="{$CtxMaxConnectionTime}" {$tsloginstate}
-                       { if !$CtxMaxConnectionTimeF } disabled  {/if}>
+      <input name="CtxMaxConnectionTime" type="text" id="CtxMaxConnectionTime" size=5 maxlength=5 value="{$CtxMaxConnectionTime}" 
+                       {if !$CtxMaxConnectionTimeF ||  $tsloginstate == "disabled"} disabled  {/if}>
 {/render}
      </td>
     </tr>
      </td>
      <td>
 {render acl=$AllowLoginOnTerminalServerACL}
-      <input name="CtxMaxDisconnectionTime" id="CtxMaxDisconnectionTime" size=5 maxlength=5 value="{$CtxMaxDisconnectionTime}" {$tsloginstate}
-                       { if !$CtxMaxDisconnectionTimeF } disabled  {/if}>
+      <input name="CtxMaxDisconnectionTime" id="CtxMaxDisconnectionTime" type="text" size=5 maxlength=5 value="{$CtxMaxDisconnectionTime}" 
+                       {if $tsloginstate == "disabled" || !$CtxMaxDisconnectionTimeF} disabled  {/if}>
 {/render}
      </td>
     </tr>
      </td>
      <td>
 {render acl=$AllowLoginOnTerminalServerACL}
-      <input name="CtxMaxIdleTime" id="CtxMaxIdleTime" size=5 maxlength=5 value="{$CtxMaxIdleTime}" {$tsloginstate}
-                       { if !$CtxMaxIdleTimeF } disabled  {/if}>
+      <input name="CtxMaxIdleTime" id="CtxMaxIdleTime" size=5 maxlength=5 type="text" value="{$CtxMaxIdleTime}" 
+                       {if !$CtxMaxIdleTimeF || $tsloginstate == "disabled"} disabled  {/if}>
 {/render}
      </td>
     </tr>
    </table>
   </td>
-  <td style="border-left:1px solid #A0A0A0">
+  <td class='left-border'>
+
    &nbsp;
   </td>
-  <td style="vertical-align:top;">
+  <td>
+
 
    <i>{t}Client devices{/t}</i>
-   <table summary="">
+   <table summary="{t}Client devices{/t}">
     <tr>
      <td>
 {render acl=$AllowLoginOnTerminalServerACL  checkbox=$multiple_support checked=$use_connectclientdrives}
       <input id="connectclientdrives" type=checkbox name="connectclientdrives" value="1" {$connectclientdrives} {$tsloginstate} class="center">
 {/render}
-      <label for="connectclientdrives">{t}Connect client drives at logon{/t}</label>
+      <label for="connectclientdrives">{t}Connect client drives at log on{/t}</label>
      </td>
     </tr>
     <tr>
 {render acl=$AllowLoginOnTerminalServerACL  checkbox=$multiple_support checked=$use_connectclientprinters}
       <input id="connectclientprinters" type=checkbox name="connectclientprinters" value="1" {$connectclientprinters}{$tsloginstate} class="center">
 {/render}
-      <label for="connectclientprinters">{t}Connect client printers at logon{/t}</label>
+      <label for="connectclientprinters">{t}Connect client printers at log on{/t}</label>
      </td>
     </tr>
     <tr>
    </table>
 
   </td>
-  <td style="border-left:1px solid #A0A0A0">
+  <td class='left-border'>
+
    &nbsp;
   </td>
-  <td style="vertical-align:top;width:50%">
+  <td style='width:50%'>
+
    <i>{t}Miscellaneous{/t}</i>
-   <table summary="">
+   <table summary="{t}Miscellaneous{/t}">
     <tr>
      <td>
       <label for="shadow">{t}Shadowing{/t}</label>
      </td>
      <td>
 {render acl=$AllowLoginOnTerminalServerACL  checkbox=$multiple_support checked=$use_shadow}
-      <select id="shadow" size="1" name="shadow" >
+      <select id="shadow" size="1" name="shadow" {$tsloginstate}>
        {html_options options=$shadow selected=$shadowmode}
       </select>
 {/render}
      <td><label for="brokenconn">{t}On broken or timed out{/t}</label></td>
      <td>
 {render acl=$AllowLoginOnTerminalServerACL  checkbox=$multiple_support checked=$use_brokenconn}
-      <select id="brokenconn" size="1" name="brokenconn">
+      <select id="brokenconn" size="1" name="brokenconn" {$tsloginstate}>
        {html_options options=$brokenconn selected=$brokenconnmode}
       </select>
 {/render}
      <td><label for="reconn">{t}Reconnect if disconnected{/t}</label></td>
      <td>
 {render acl=$AllowLoginOnTerminalServerACL  checkbox=$multiple_support checked=$use_reconn}
-      <select id="reconn" size="1" name="reconn">
+      <select id="reconn" size="1" name="reconn" {$tsloginstate}>
        {html_options options=$reconn selected=$reconnmode}
       </select>
 {/render}
  </tr>
 </table>
 
-<p class="seperator">&nbsp;</p>
+<hr>
+
+<h3>{t}Access options{/t}
+</h3>
 
-<h2><img class="center" alt="" align="middle" src="images/lists/key.png" />&nbsp;{t}Access options{/t}</h2>
+<table style='width:100%; ' summary="{t}Access options{/t}">
 
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
  <tr>
-  <td style="width:50%; vertical-align:top;">
-{render acl=$sambaPwdCanChangeACL  checkbox=$multiple_support checked=$use_allow_pwchange}
-   <input id="allow_pwchange" type=checkbox name="allow_pwchange" value="1" {$flagsP} class="center">
-{/render}
-   <label for="allow_pwchange">{t}Allow user to change password from client{/t}</label>
-   <br>
-{render acl=$sambaAcctFlagsNACL  checkbox=$multiple_support checked=$use_no_password_required}
-   <input id="no_password_required" type=checkbox name="no_password_required" value="1" {$flagsN} class="center">
-{/render}
-   <label for="no_password_required">{t}Login from windows client requires no password{/t}</label>
-   <br>
-{render acl=$sambaAcctFlagsLACL  checkbox=$multiple_support checked=$use_temporary_disable}
-   <input id="temporary_disable" type=checkbox name="temporary_disable" value="1" {$flagsD} class="center">
-{/render}
-   <label for="temporary_disable">{t}Lock samba account{/t}</label>
-   <br>
-{render acl=$sambaPwdMustChangeACL  checkbox=$multiple_support checked=$use_password_expires}
-   <input id="password_expires" type=checkbox name="password_expires" value="1" {$flagsC} class="center">
-{/render}
-   <label for="password_expires">{t}Password expires on{/t}</label>
-{render acl=$sambaPwdMustChangeACL} 
-   <select name=day onChange="createResult(this.form,this.form.sambaPwdMustChange);">
-    {html_options values=$days output=$days selected=$day}
-   </select>
-{/render}
-{render acl=$sambaPwdMustChangeACL} 
-   <select name=month onChange="populate(this.form,this.form.sambaPwdMustChange);">
-    {html_options options=$months selected=$month}
-   </select>
-{/render}
-{render acl=$sambaPwdMustChangeACL} 
-   <select name=year onChange="populate(this.form,this.form.sambaPwdMustChange);">
-    {html_options values=$years output=$years selected=$year}
-   </select>
-{/render}
-   <br>
-{render acl=$sambaLogonTimeACL  checkbox=$multiple_support checked=$use_logon_time_set}
-   <input id="logon_time_set" type=checkbox name="logon_time_set" value="1" {$flagsT} class="center">
-{/render}
-   <label for="logon_time_set">{t}Limit Logon Time{/t}</label>
-{render acl=$sambaLogonTimeACL}
-   <select name=sambaLogonTime_day onChange="createResult_sambaLogonTime(this.form,this.form.sambaLogonTime);">
-   {html_options values=$sambaLogonTime_days output=$sambaLogonTime_days selected=$sambaLogonTime_day}
-   </select>
-{/render}
-{render acl=$sambaLogonTimeACL}
-   <select name=sambaLogonTime_month onChange="populate_sambaLogonTime(this.form,this.form.sambaLogonTime);">
-   {html_options options=$sambaLogonTime_months output=$sambaLogonTime_months selected=$sambaLogonTime_month}
-   </select>
-{/render}
-{render acl=$sambaLogonTimeACL}
-   <select name=sambaLogonTime_year onChange="populate_sambaLogonTime(this.form,this.form.sambaLogonTime);">
-   {html_options values=$sambaLogonTime_years output=$sambaLogonTime_years selected=$sambaLogonTime_year}
-   </select>
-{/render}
-   <br>
-{render acl=$sambaLogoffTimeACL  checkbox=$multiple_support checked=$use_logoff_time_set}
-   <input id="logoff_time_set" type=checkbox name="logoff_time_set" value="1" {$flagsO} class="center">
-{/render}
-   <label for="logoff_time_set">{t}Limit Logoff Time{/t}</label>
-{render acl=$sambaLogoffTimeACL}
-   <select name=sambaLogoffTime_day onChange="createResult_sambaLogoffTime(this.form,this.form.sambaLogoffTime);">
-   {html_options values=$sambaLogoffTime_days output=$sambaLogoffTime_days selected=$sambaLogoffTime_day}
-   </select>
-{/render}
-{render acl=$sambaLogoffTimeACL}
-   <select name=sambaLogoffTime_month onChange="populate_sambaLogoffTime(this.form,this.form.sambaLogoffTime);">
-   {html_options options=$sambaLogoffTime_months output=$sambaLogoffTime_months selected=$sambaLogoffTime_month}
-   </select>
-{/render}
-{render acl=$sambaLogoffTimeACL}
-   <select name=sambaLogoffTime_year onChange="populate_sambaLogoffTime(this.form,this.form.sambaLogoffTime);">
-   {html_options values=$sambaLogoffTime_years output=$sambaLogoffTime_years selected=$sambaLogoffTime_year}
-   </select>
-{/render}
-   <br>
-   
-{render acl=$sambaKickoffTimeACL  checkbox=$multiple_support checked=$use_kickoff_time_set}
-   <input id="kickoff_time_set" type=checkbox name="kickoff_time_set" value="1" {$flagsK} class="center">
-{/render}
-   <label for="kickoff_time_set">{t}Account expires after{/t}</label>
-{render acl=$sambaKickoffTimeACL}
-   <select name=sambaKickoffTime_day onChange="createResult_sambaKickoffTime(this.form,this.form.sambaKickoffTime);">
-   {html_options values=$sambaKickoffTime_days output=$sambaKickoffTime_days selected=$sambaKickoffTime_day}
-   </select>
-{/render}
-{render acl=$sambaKickoffTimeACL}
-   <select name=sambaKickoffTime_month onChange="populate_sambaKickoffTime(this.form,this.form.sambaKickoffTime);">
-   {html_options options=$sambaKickoffTime_months output=$sambaKickoffTime_months selected=$sambaKickoffTime_month}
-   </select>
-{/render}
-{render acl=$sambaKickoffTimeACL}
-   <select name=sambaKickoffTime_year onChange="populate_sambaKickoffTime(this.form,this.form.sambaKickoffTime);">
-   {html_options values=$sambaKickoffTime_years output=$sambaKickoffTime_years selected=$sambaKickoffTime_year}
-   </select>
-{/render}
-   <br>
-   <input type="hidden" name="sambaPwdMustChange" value="{$sambaPwdMustChange}">
-   <input type="hidden" name="sambaLogonTime" value="{$sambaLogonTime}">
-   <input type="hidden" name="sambaLogoffTime" value="{$sambaLogoffTime}">
-   <input type="hidden" name="sambaKickoffTime" value="{$sambaKickoffTime}">
-<br>
-{render acl=$sambaLogonHoursACL mode=read_active  checkbox=$multiple_support checked=$use_SetSambaLogonHours}
-   {t}Samba logon times{/t}&nbsp;<input type='submit' name='SetSambaLogonHours' value='{t}Edit settings...{/t}'>
-{/render}
+  <td style='width:50%; ' colspan="2">
+
+
+      <table>
+       <tr>
+            <td>
+                {render acl=$enforcePasswordChangeACL checkbox=$multiple_support checked=$use_enforcePasswordChange}
+                 <input type='checkbox' value='1' name='flag_enforcePasswordChange'
+                  {if $flag_enforcePasswordChange} checked {/if} id='flag_enforcePasswordChange'>
+                {/render}
+            </td>
+            <td>
+                <label for='flag_enforcePasswordChange'>{t}Enforce password change{/t}</label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                {render acl=$passwordNeverExpiresACL  checkbox=$multiple_support checked=$use_passwordNeverExpires}
+                <input type='checkbox' value='1' name="flag_passwordNeverExpires"
+                    {if $flag_passwordNeverExpires} checked {/if} id='flag_passwordNeverExpires'>
+                {/render}
+            </td>
+            <td>
+                <label for="flag_passwordNeverExpires">{t}The password never expires{/t}</label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                {render acl=$noPasswordRequiredACL  checkbox=$multiple_support checked=$use_noPasswordRequired}
+                <input type='checkbox' value='1' name="flag_noPasswordRequired"
+                    {if $flag_noPasswordRequired} checked {/if} id='flag_noPasswordRequired'>
+                {/render}
+            </td>
+            <td>
+                <label for="flag_noPasswordRequired">{t}Login from windows client requires no password{/t}</label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                {render acl=$temporaryDisabledACL  checkbox=$multiple_support checked=$use_temporaryDisabled}
+                <input type='checkbox' value='1' name="flag_temporaryDisabled"
+                    {if $flag_temporaryDisabled} checked {/if} id='flag_temporaryDisabled'>
+                {/render}
+            </td>
+            <td>
+                <label for="flag_temporaryDisabled">{t}Lock samba account{/t}</label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                {render acl=$cannotChangePasswordACL  checkbox=$multiple_support checked=$use_cannotChangePassword}
+                 <input type='checkbox' value='1' name='flag_cannotChangePassword'
+                    {if $flag_cannotChangePassword} checked {/if} id='flag_cannotChangePassword'>
+                {/render}
+            </td>
+            <td>
+                <label for="flag_cannotChangePassword">{t}Cannot change password{/t}</label>
+            </td>
+        </tr>
+
+
+    </table>
+    <table>
+      <tr>
+        <td colspan=2>
+           {render acl=$sambaKickoffTimeACL  checkbox=$multiple_support checked=$use_sambaKickoffTime}
+             <input id="flag_sambaKickoffTime" type=checkbox name="flag_sambaKickoffTime" value="1" 
+                    {if $flag_sambaKickoffTime} checked {/if} class="center">
+           {/render}
+           <label for="flag_sambaKickoffTime">{t}Account expires after{/t}</label>
+         </td>
+         <td style='width:200px;'>
+           {render acl=$sambaKickoffTimeACL}
+             <input type="text" id="sambaKickoffTime" name="sambaKickoffTime" class="date" style='width:100px' value="{$sambaKickoffTime}">
+                {if $sambaKickoffTimeACL|regex_replace:"/[cdmr]/":"" == "w"}
+                  <script type="text/javascript">
+                    {literal}
+                       var datepicker2 = new DatePicker({ 
+                            relative : 'sambaKickoffTime', 
+                            language : '{/literal}{$lang}{literal}', 
+                            keepFieldEmpty : true, 
+                            enableCloseEffect : false, 
+                            enableShowEffect : false });
+                    {/literal}
+                  </script>
+               {/if}
+            {/render}
+          </td>
+       </tr>
+        <tr>
+            <td>
+            </td>
+            <td>
+                {if $additional_info_PwdMustChange}
+                    <i>({$additional_info_PwdMustChange})</i>
+                {/if}
+            </td>
+        </tr>            
+    </table>
+
+    <table>
+        <tr>
+            <td colspan=2>
+                {render acl=$sambaKickoffTimeACL  checkbox=$multiple_support checked=$use_sambaKickoffTime}
+                    <input id="flag_sambaKickoffTime" type=checkbox name="flag_sambaKickoffTime" value="1"
+                        {if $flag_sambaKickoffTime} checked {/if} class="center">
+                {/render}
+                <label for="flag_sambaKickoffTime">{t}Account expires after{/t}</label>
+            </td>
+            <td style='width:200px;'>
+                {render acl=$sambaKickoffTimeACL}
+                    <input type="text" id="sambaKickoffTime" name="sambaKickoffTime" 
+                        class="date" style='width:100px' value="{$sambaKickoffTime}">
+                    {if $sambaKickoffTimeACL|regex_replace:"/[cdmr]/":"" == "w"}
+                        <script type="text/javascript">
+                            {literal}
+                               var datepicker2 = new DatePicker({
+                                    relative : 'sambaKickoffTime',
+                                    language : '{/literal}{$lang}{literal}',
+                                    keepFieldEmpty : true,
+                                    enableCloseEffect : false,
+                                    enableShowEffect : false });
+                            {/literal}
+                        </script>
+                    {/if}
+                {/render}
+            </td>
+        </tr>
+    </table>
+
+
+    <hr>
+
+    {render acl=$sambaLogonHoursACL mode=read_active  checkbox=$multiple_support checked=$use_SetSambaLogonHours}
+        {t}Samba log on times{/t}&nbsp;<button type='submit' name='SetSambaLogonHours'>{t}Edit settings...{/t}</button>
+    {/render}
+    <!-- /Samba policies -->
+
+  </td>
+  <td class='left-border'>
 
-  </td>        
-  <td style="border-left:1px solid #A0A0A0">
    &nbsp;
   </td>
-  <td style="vertical-align:top;">
+  <td>
+
    <label for="workstation_list">{t}Allow connection from these workstations only{/t}</label>
    <br>
 
        {/foreach}
    </select>
    <br>
-   <input type="submit" value="{msgPool type=addButton}" name="add_ws">
-   <input type="submit" value="{msgPool type=delButton}" name="delete_ws">
+   <button type='submit' name='add_ws'>{msgPool type=addButton}</button>
+
+   <button type='submit' name='delete_ws'>{msgPool type=delButton}</button>
+
 {else}
        {render acl=$sambaUserWorkstationsACL}
-          <select id="workstation_list" style="width:100%;" name="workstation_list[]" size=10 multiple>
+          <select id="workstation_list" style="width:100%;" name="workstation_list[]" size=5 multiple>
                {html_options values=$workstations output=$workstations}
           </select>
        {/render}
           <br>
        {render acl=$sambaUserWorkstationsACL}
-          <input type="submit" value="{msgPool type=addButton}" name="add_ws">
+          <button type='submit' name='add_ws'>{msgPool type=addButton}</button>
+
        {/render}
        {render acl=$sambaUserWorkstationsACL}
-          <input type="submit" value="{msgPool type=delButton}" name="delete_ws">
+          <button type='submit' name='delete_ws'>{msgPool type=delButton}</button>
+
        {/render}
 {/if}
   </td>
 </table>
 
 <input type="hidden" name="sambaTab" value="sambaTab">
-
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- 
-  // Populate expiery dialog
-  populate(document.mainform,document.mainform.sambaPwdMustChange);
-
-  // Populate samba Time dialogs
-  populate_sambaLogonTime(document.mainform,document.mainform.sambaLogonTime);
-  populate_sambaLogoffTime(document.mainform,document.mainform.sambaLogoffTime);
-  populate_sambaKickoffTime(document.mainform,document.mainform.sambaKickoffTime);
-  -->
-</script>