diff --git a/gosa-plugins/samba/personal/samba/samba3.tpl b/gosa-plugins/samba/personal/samba/samba3.tpl
index 9e158dd90d2c24184306a5de90c4ab5e3fa5c27b..b378276f72b8c2cdef86c289a36da311f1191d12 100644 (file)
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="0" border="0">
+<table style="width:100%; vertical-align:top; text-align:left;" cellpadding="0" border="0">
<!-- Headline container -->
<tr>
<td colspan="2" style="width:50%; vertical-align:top;">
- <h2><img class="center" alt="" align="middle" src="images/rightarrow.png"/> {t}Generic{/t}</h2>
+ <h3>{t}Generic{/t}
+</h3>
</td>
</tr>
<tr>
<td style="vertical-align:top;">
- <table summary="">
+ <table >
<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>
{render acl=$sambaDomainNameACL checkbox=$multiple_support checked=$use_sambaDomainName}
<select id="sambaDomainName" size="1" name="sambaDomainName"
- {if $display_information} onChange="document.mainform.submit();" {/if}>
+ 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>
</td>
<td style="vertical-align:top;">
- <table summary="">
+ <table >
<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>
<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"> </p>
-<h2> <img class="center" src='images/info_small.png'> {t}Information{/t}</h2>
-<table style='width:100%;'>
- <tr>
- <td>{t}Show information{/t}
- {if $display_information}
- <input type='submit' name='display_information' value='{t}Hide{/t}'>
- {else}
- <input type='submit' name='display_information' value='{t}Show{/t}'>
- {/if}
- </td>
- </tr>
- {if $display_information}
- <tr>
- <td>
- {$samba_information}
- </td>
- </tr>
- {/if}
-</table>
-<p class="seperator"> </p>
+<hr>
-<h2><img class="center" alt="" align="middle" src="plugins/samba/images/terminal_server.png" /> {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%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
<tr>
<td style="vertical-align:top;width:50%">
{/render}
{/if}
<i>{t}Allow login on terminal server{/t}</i>
- <table summary="">
+ <table >
<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>
<td style="vertical-align:top;">
{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="">
+ <table >
<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"> </p>
+<hr>
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
+<table style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
<tr>
<td style="vertical-align:top;">
<i>{t}Timeout settings (in minutes){/t}</i>
- <table summary="">
+ <table >
<tr>
<td>
{if $multiple_support}
<td>
{render acl=$AllowLoginOnTerminalServerACL}
<input name="CtxMaxConnectionTime" id="CtxMaxConnectionTime" size=5 maxlength=5 value="{$CtxMaxConnectionTime}" {$tsloginstate}
- { if !$CtxMaxConnectionTimeF } disabled {/if}>
+ {if !$CtxMaxConnectionTimeF} disabled {/if}>
{/render}
</td>
</tr>
<td>
{render acl=$AllowLoginOnTerminalServerACL}
<input name="CtxMaxDisconnectionTime" id="CtxMaxDisconnectionTime" size=5 maxlength=5 value="{$CtxMaxDisconnectionTime}" {$tsloginstate}
- { if !$CtxMaxDisconnectionTimeF } disabled {/if}>
+ {if !$CtxMaxDisconnectionTimeF} disabled {/if}>
{/render}
</td>
</tr>
<td>
{render acl=$AllowLoginOnTerminalServerACL}
<input name="CtxMaxIdleTime" id="CtxMaxIdleTime" size=5 maxlength=5 value="{$CtxMaxIdleTime}" {$tsloginstate}
- { if !$CtxMaxIdleTimeF } disabled {/if}>
+ {if !$CtxMaxIdleTimeF} disabled {/if}>
{/render}
</td>
</tr>
<td style="vertical-align:top;">
<i>{t}Client devices{/t}</i>
- <table summary="">
+ <table >
<tr>
<td>
{render acl=$AllowLoginOnTerminalServerACL checkbox=$multiple_support checked=$use_connectclientdrives}
</td>
<td style="vertical-align:top;width:50%">
<i>{t}Miscellaneous{/t}</i>
- <table summary="">
+ <table >
<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"> </p>
+<hr>
-<h2><img class="center" alt="" align="middle" src="images/lists/key.png" /> {t}Access options{/t}</h2>
+<h3>{t}Access options{/t}
+</h3>
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
+<table style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
<tr>
<td colspan=2 style="width:50%; vertical-align:top;">
<!-- Samba policies -->
<table>
+ <tr>
+ <td colspan=2>
+ {render acl=$sambaAcctFlagsXACL checkbox=$multiple_support checked=$use_no_expiry}
+ <input id="no_expiry" type=checkbox name="no_expiry" value="1" {$flagsX} class="center">
+ {/render}
+ <label for="no_expiry">{t}The password never expires{/t}</label>
+ </td>
+ </tr>
<tr>
<td colspan=2>
{render acl=$sambaAcctFlagsNACL checkbox=$multiple_support checked=$use_no_password_required}
<label for="no_password_required">{t}Login from windows client requires no password{/t}</label>
</td>
</tr>
+<!--
<tr>
- <td colspan=2 style="width:50%; vertical-align:top;">
+ <td colspan=2 style="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>
</td>
</tr>
+-->
<tr>
<td colspan=2>
{render acl=$sambaAcctFlagsLACL checkbox=$multiple_support checked=$use_temporary_disable}
<label for="temporary_disable">{t}Lock samba account{/t}</label>
</td>
</tr>
+<!--
<tr>
<td>
{render acl=$sambaPwdMustChangeACL checkbox=$multiple_support checked=$use_password_expires}
- <input id="password_expires" type=checkbox name="password_expires" value="1" {$flagsC} class="center">
+ <input id="password_expires" type=checkbox name="password_expires" value="1" {$flagsC} class="center"
+ onClick="document.mainform.submit();">
{/render}
<label for="password_expires">{t}Password expires on{/t}</label>
</td>
- <td>
+ <td style='width:55%'>
{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>
+ <input type="text" id="sambaPwdMustChange" name="sambaPwdMustChange" class="date" style='width:100px' value="{$sambaPwdMustChange}">
+ {if $sambaPwdMustChangeACL|regex_replace:"/[cdmr]/":"" == "w"}
+ <script type="text/javascript">
+ {literal}
+ var datepicker = new DatePicker({ relative : 'sambaPwdMustChange', language : '{/literal}{$lang}{literal}', keepFieldEmpty : true, enableCloseEffect : false, enableShowEffect : false });
+ {/literal}
+ </script>
+ {/if}
{/render}
</td>
</tr>
+ -->
{if $additional_info_PwdMustChange}
<tr>
<td colspan=2 style='padding-left: 10px;'>
</td>
<td>
{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>
+ <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}
- <input type="hidden" name="sambaPwdMustChange" value="{$sambaPwdMustChange}">
- <input type="hidden" name="sambaPwdCanChange" value="{$sambaPwdMustChange}">
- <input type="hidden" name="sambaKickoffTime" value="{$sambaKickoffTime}">
</td>
</tr>
<tr>
<tr>
<td colspan=2>
{render acl=$sambaLogonHoursACL mode=read_active checkbox=$multiple_support checked=$use_SetSambaLogonHours}
- {t}Samba logon times{/t} <input type='submit' name='SetSambaLogonHours' value='{t}Edit settings...{/t}'>
+ {t}Samba logon times{/t} <button type='submit' name='SetSambaLogonHours'>{t}Edit settings...{/t}</button>
+
{/render}
</td>
</tr>
{/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>
{/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>