X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fpersonal%2Fsamba%2Fsamba3.tpl;h=ce9442dd8c3be813bb07e691ce462c9dd86dc7d6;hb=1fb850eba9b26edf354a71e3f2a8fb1d1b17a473;hp=fa69000ed8c1a40e285a975d33a35f176fd3af66;hpb=ff2e351f748838d38ee9d3731a6c40d79b1c802e;p=gosa.git

diff --git a/plugins/personal/samba/samba3.tpl b/plugins/personal/samba/samba3.tpl
index fa69000ed..ce9442dd8 100644
--- a/plugins/personal/samba/samba3.tpl
+++ b/plugins/personal/samba/samba3.tpl
@@ -1,28 +1,28 @@
-<table style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
+<table summary="" 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 alt="" align="middle" src="images/rightarrow.png"> {t}Generic{/t}</h2>
+  <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>
  </tr>
  <tr>
   <td style="vertical-align:top;">
-   <table>
+   <table summary="">
     <tr>
-     <td>{t}Home directory{/t}</td>
+     <td><label for="sambaHomePath">{t}Home directory{/t}</label></td>
      <td>
-      <input name="sambaHomePath" size=30 maxlength=60 {$sambaHomePathACL} value="{$sambaHomePath}">
+      <input id="sambaHomePath" name="sambaHomePath" size=30 maxlength=60 {$sambaHomePathACL} value="{$sambaHomePath}">
       <select size="1" name="sambaHomeDrive" {$sambaHomeDriveACL}>
-       <option></option>
+       <option disabled>&nbsp;</option>
        {html_options values=$drives output=$drives selected=$sambaHomeDrive}
       </select>
      </td>
     </tr>
     <tr>
-     <td>{t}Domain{/t}</td>
+     <td><label for="sambaDomainName">{t}Domain{/t}</label></td>
      <td>
-      <select size="1" name="sambaDomainName" {$sambaDomainNameACL}>
+      <select id="sambaDomainName" size="1" name="sambaDomainName" {$sambaDomainNameACL}>
        {html_options values=$domains output=$domains selected=$sambaDomainName}
       </select>
      </td>
@@ -33,17 +33,17 @@
    &nbsp;
   </td>
   <td style="vertical-align:top;">
-   <table>
+   <table summary="">
     <tr>
-     <td>{t}Script path{/t}</td>
+     <td><label for="">{t}Script path{/t}</label></td>
      <td>
-      <input name="sambaLogonScript" size=35 maxlength=60 {$sambaLogonScriptACL} value="{$sambaLogonScript}">
+      <input id="sambaLogonScript" name="sambaLogonScript" size=35 maxlength=60 {$sambaLogonScriptACL} value="{$sambaLogonScript}">
      </td>
     </tr>
     <tr>
-     <td>{t}Profile path{/t}</td>
+     <td><label for="">{t}Profile path{/t}</label></td>
      <td>
-      <input name="sambaProfilePath" size=35 maxlength=60 {$sambaProfilePathACL} value="{$sambaProfilePath}">
+      <input id="sambaProfilePath" name="sambaProfilePath" size=35 maxlength=60 {$sambaProfilePathACL} value="{$sambaProfilePath}">
      </td>
     </tr>
    </table>
@@ -53,28 +53,57 @@
 
 <p class="seperator">&nbsp;</p>
 
-<h2><img alt="" align="middle" src="images/display.png"> {t}Terminal Server{/t}</h2>
+<h2><img class="center" alt="" align="middle" src="images/display.png" />&nbsp;{t}Terminal Server{/t}</h2>
 
-<table style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
+<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
  <tr>
   <td style="vertical-align:top;width:50%">
-   <input type=checkbox name="tslogin" value="1" {$tslogin} {$tsloginACL}>
+   <input type=checkbox name="tslogin" id="tslogin" value="1" {$tslogin} {$tsloginACL}
+   	onclick="
+		
+		{if $connectclientdrivesACL==""}	changeState('CtxWFHomeDir');		{/if}
+		{if $CtxWFHomeDirDriveACL==""} 		changeState('CtxWFHomeDirDrive');	{/if}
+		{if $CtxWFProfilePathACL==""} 		changeState('CtxWFProfilePath'); 	{/if}
+
+		{if $inheritACL==""}				
+		changeState('inherit');				
+		changeTripleSelectState_2nd_neg('tslogin','inherit','CtxInitialProgram');
+		changeTripleSelectState_2nd_neg('tslogin','inherit','CtxWorkDirectory');
+		{/if}
+		
+		{if $CtxMaxConnectionTimeACL==""}      	changeState('CtxMaxConnectionTimeF'); 	{/if}
+		{if $CtxMaxDisconnectionTimeACL==""}   	changeState('CtxMaxDisconnectionTimeF');{/if}
+		{if $CtxMaxIdleTimeACL==""}      		changeState('CtxMaxIdleTimeF');			{/if}
+	
+		
+		changeTripleSelectState('tslogin','CtxMaxConnectionTimeF','CtxMaxConnectionTime');
+		changeTripleSelectState('tslogin','CtxMaxDisconnectionTimeF','CtxMaxDisconnectionTime');
+		changeTripleSelectState('tslogin','CtxMaxIdleTimeF','CtxMaxIdleTime');
+	
+		{if $connectclientdrivesACL==""}	changeState('connectclientdrives');		{/if}
+		{if $connectclientprintersACL==""}	changeState('connectclientprinters');	{/if}
+		{if $defaultprinterACL==""}			changeState('defaultprinter');			{/if}
+		
+		{if $shadowACL == "" }				changeState('shadow'); 				{/if}
+		{if $brokenconnACL == "" }          changeState('brokenconn');			{/if}
+		{if $reconnACL == "" }              changeState('reconn');				{/if}
+	">
    <i>{t}Allow login on terminal server{/t}</i>
-   <table>
+   <table summary="">
     <tr>
-     <td>{t}Home directory{/t}</td>
+     <td><label for="CtxWFHomeDir">{t}Home directory{/t}</label></td>
      <td>
-      <input name="CtxWFHomeDir" size=30 maxlength=60 {$CtxWFHomeDirACL} value="{$CtxWFHomeDir}">
-      <select size="1" name="CtxWFHomeDirDrive" {$CtxWFHomeDirDriveACL}>
-       <option></option>
+      <input id="CtxWFHomeDir" name="CtxWFHomeDir" size=30 maxlength=60 {$CtxWFHomeDirACL} value="{$CtxWFHomeDir}" {$tsloginstate}>
+      <select size="1" id="CtxWFHomeDirDrive" name="CtxWFHomeDirDrive" {$CtxWFHomeDirDriveACL} {$tsloginstate}>
+       <option disabled>&nbsp;</option>
        {html_options values=$drives output=$drives selected=$CtxWFHomeDirDrive}
       </select>
      </td>
     </tr>
     <tr>
-     <td>{t}Profile path{/t}</td>
+     <td><label for="CtxWFProfilePath">{t}Profile path{/t}</label></td>
      <td>
-      <input name="CtxWFProfilePath" size=35 maxlength=60 {$CtxWFProfilePathACL} value="{$CtxWFProfilePath}">
+      <input id="CtxWFProfilePath" name="CtxWFProfilePath" size=35 maxlength=60 {$CtxWFProfilePathACL} value="{$CtxWFProfilePath}" {$tsloginstate}>
      </td>
     </tr>
    </table>
@@ -83,19 +112,32 @@
    &nbsp;
   </td>
   <td style="vertical-align:top;">
-   <input type=checkbox name="inherit" value="1" {$inherit} {$inheritACL} onclick="changeState('CtxInitialProgram'); changeState('CtxWorkDirectory')">
+   <input type=checkbox id="inherit" name="inherit" {$inherit} {$inheritACL} 
+	onclick="{if $CtxInitialProgramACL ==""}changeState('CtxInitialProgram');{/if}
+			 {if $CtxWorkDirectoryACL ==""}changeState('CtxWorkDirectory');{/if}" {$tsloginstate}>
    <i>{t}Inherit client config{/t}</i>
-   <table>
+   <table summary="">
     <tr>
-     <td>{t}Initial program{/t}</td>
+     <td><label for="CtxInitialProgram">{t}Initial program{/t}</label></td>
      <td>
-      <input name="CtxInitialProgram" id="CtxInitialProgram" size=35 maxlength=60 {$CtxInitialProgramACL} value="{$CtxInitialProgram}" {$CtxInitialProgramMode}>
+      <input id="CtxInitialProgram" name="CtxInitialProgram" size=35 maxlength=60 {if $CtxInitialProgramACL==""}{$CtxInitialProgramMode}{/if} value="{$CtxInitialProgram}" 
+		{if ($CtxInitialProgramACL!="" || $tsloginstate!="" || $inheritstate!="") && $CtxInitialProgramACL!=""}
+			disabled 
+		{/if}
+		>
      </td>
     </tr>
     <tr>
-     <td>{t}Working directory{/t}</td>
+     <td><label for="CtxWorkDirectory">{t}Working directory{/t}</label></td>
      <td>
-      <input name="CtxWorkDirectory" id="CtxWorkDirectory" size=35 maxlength=60 {$CtxWorkDirectoryACL} value="{$CtxWorkDirectory}" {$CtxInitialProgramMode}>
+      <input id="CtxWorkDirectory" name="CtxWorkDirectory" size=35 maxlength=60 
+		{if $CtxWorkDirectoryACL==""}
+			{$CtxInitialProgramMode}
+		{/if} value="{$CtxWorkDirectory}" 
+		{if ($CtxInitialProgramACL=="disabled" || $tsloginstate=="disabled" || $inheritstate=="disabled") && $CtxWorkDirectoryACL!=""}
+			disabled 
+		{/if}
+		>
      </td>
     </tr>
    </table>
@@ -105,36 +147,36 @@
 
 <p class="seperator">&nbsp;</p>
 
-<table style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
+<table summary="" 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>
+   <table summary="">
     <tr>
      <td>
-      <input type=checkbox name="CtxMaxConnectionTimeF" value="1" {$CtxMaxConnectionTimeF} {$CtxMaxConnectionTimeACL} onclick="changeState('CtxMaxConnectionTime')">
-      {t}Connection{/t}
+      <input id="CtxMaxConnectionTimeF" type=checkbox name="CtxMaxConnectionTimeF" value="1" {$CtxMaxConnectionTimeF} {$CtxMaxConnectionTimeACL} onclick="changeSubselectState('CtxMaxConnectionTimeF','CtxMaxConnectionTime')" {$tsloginstate}>
+      <label for="CtxMaxConnectionTimeF">{t}Connection{/t}</label>
      </td>
      <td>
-      <input name="CtxMaxConnectionTime" id="CtxMaxConnectionTime" size=5 maxlength=5 {$CtxMaxConnectionTimeACL} value="{$CtxMaxConnectionTime}" {$CtxMaxConnectionTimeMode}>
+      <input name="CtxMaxConnectionTime" id="CtxMaxConnectionTime" size=5 maxlength=5 {if $CtxMaxConnectionTimeACL==""}{$CtxMaxConnectionTimeMode}{/if} value="{$CtxMaxConnectionTime}" {$CtxMaxConnectionTimeACL} {$tsloginstate}>
      </td>
     </tr>
     <tr>
      <td>
-      <input type=checkbox name="CtxMaxDisconnectionTimeF" value="1" {$CtxMaxDisconnectionTimeF} {$CtxMaxDisconnectionTimeACL} onclick="changeState('CtxMaxDisconnectionTime')">
-      {t}Disconnection{/t}
+      <input id="CtxMaxDisconnectionTimeF" type=checkbox name="CtxMaxDisconnectionTimeF" value="1" {$CtxMaxDisconnectionTimeF} {$CtxMaxDisconnectionTimeACL} onclick="changeState('CtxMaxDisconnectionTime')" {$tsloginstate}>
+      <label for="CtxMaxDisconnectionTimeF">{t}Disconnection{/t}</label>
      </td>
      <td>
-      <input name="CtxMaxDisconnectionTime" id="CtxMaxDisconnectionTime" size=5 maxlength=5 {$CtxMaxDisconnectionTimeACL} value="{$CtxMaxDisconnectionTime}" {$CtxMaxDisconnectionTimeMode}>
+      <input name="CtxMaxDisconnectionTime" id="CtxMaxDisconnectionTime" size=5 maxlength=5 {if $CtxMaxDisconnectionTimeACL ==""}{$CtxMaxDisconnectionTimeMode}{/if} value="{$CtxMaxDisconnectionTime}" {$CtxMaxDisconnectionTimeACL} {$tsloginstate}>
      </td>
     </tr>
     <tr>
      <td>
-      <input type=checkbox name="CtxMaxIdleTimeF" value="1" {$CtxMaxIdleTimeF} {$CtxMaxIdleTimeACL} onclick="changeState('CtxMaxIdleTime')">
-      {t}IDLE{/t}
+      <input id="CtxMaxIdleTimeF" type=checkbox name="CtxMaxIdleTimeF" value="1" {$CtxMaxIdleTimeF} {$CtxMaxIdleTimeACL} onclick="changeState('CtxMaxIdleTime')" {$tsloginstate}>
+      <label for="CtxMaxIdleTimeF">{t}IDLE{/t}</label>
      </td>
      <td>
-      <input name="CtxMaxIdleTime" id="CtxMaxIdleTime" size=5 maxlength=5 {$CtxMaxIdleTimeACL} value="{$CtxMaxIdleTime}" {$CtxMaxIdleTimeMode}>
+      <input name="CtxMaxIdleTime" id="CtxMaxIdleTime" size=5 maxlength=5 {if $CtxMaxIdleTimeACL==""}{$CtxMaxIdleTimeMode}{/if} value="{$CtxMaxIdleTime}" {$CtxMaxIdleTimeACL} {$tsloginstate}>
      </td>
     </tr>
    </table>
@@ -145,23 +187,23 @@
   <td style="vertical-align:top;">
 
    <i>{t}Client devices{/t}</i>
-   <table>
+   <table summary="">
     <tr>
      <td>
-      <input type=checkbox name="connectclientdrives" value="1" {$connectclientdrives} {$connectclientdrivesACL}>
-      {t}Connect client drives at logon{/t}
+      <input id="connectclientdrives" type=checkbox name="connectclientdrives" value="1" {$connectclientdrives} {$connectclientdrivesACL} {$tsloginstate}>
+      <label for="connectclientdrives">{t}Connect client drives at logon{/t}</label>
      </td>
     </tr>
     <tr>
      <td>
-      <input type=checkbox name="connectclientprinters" value="1" {$connectclientprinters} {$connectclientprintersACL}>
-      {t}Connect client printers at logon{/t}
+      <input id="connectclientprinters" type=checkbox name="connectclientprinters" value="1" {$connectclientprinters} {$connectclientprintersACL} {$tsloginstate}>
+      <label for="connectclientprinters">{t}Connect client printers at logon{/t}</label>
      </td>
     </tr>
     <tr>
      <td>
-      <input type=checkbox name="defaultprinter" value="1" {$defaultprinter} {$defaultprinterACL}>
-      {t}Default to main client printer{/t}
+      <input id="defaultprinter" type=checkbox name="defaultprinter" value="1" {$defaultprinter} {$defaultprinterACL} {$tsloginstate}>
+      <label for="defaultprinter">{t}Default to main client printer{/t}</label>
      </td>
     </tr>
    </table>
@@ -170,31 +212,31 @@
   <td style="border-left:1px solid #A0A0A0">
    &nbsp;
   </td>
-  <td style="vertical-align:top;">
+  <td style="vertical-align:top;width:50%">
    <i>{t}Miscellaneous{/t}</i>
-   <table>
+   <table summary="">
     <tr>
      <td>
-      {t}Shadowing{/t}
+      <label for="shadow">{t}Shadowing{/t}</label>
      </td>
      <td>
-      <select size="1" name="shadow" {$shadowACL}>
+      <select id="shadow" size="1" name="shadow" {$shadowACL} {$tsloginstate}>
        {html_options options=$shadow selected=$shadowmode}
       </select>
      </td>
     </tr>
     <tr>
-     <td>{t}On broken or timed out{/t}</td>
+     <td><label for="brokenconn">{t}On broken or timed out{/t}</label></td>
      <td>
-      <select size="1" name="brokenconn" {$brokenconnACL}>
+      <select id="brokenconn" size="1" name="brokenconn" {$brokenconnACL} {$tsloginstate}>
        {html_options options=$brokenconn selected=$brokenconnmode}
       </select>
      </td>
     </tr>
     <tr>
-     <td>{t}Reconnect if disconnected{/t}</td>
+     <td><label for="reconn">{t}Reconnect if disconnected{/t}</label></td>
      <td>
-      <select size="1" name="reconn" {$reconnACL}>
+      <select id="reconn" size="1" name="reconn" {$reconnACL} {$tsloginstate}>
        {html_options options=$reconn selected=$reconnmode}
       </select>
      </td>
@@ -207,22 +249,22 @@
 
 <p class="seperator">&nbsp;</p>
 
-<h2><img alt="" align="middle" src="images/certs.png"> {t}Access options{/t}</h2>
+<h2><img class="center" alt="" align="middle" src="images/certs.png" />&nbsp;{t}Access options{/t}</h2>
 
-<table style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
+<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
  <tr>
   <td style="width:50%; vertical-align:top;">
-   <input type=checkbox name="allow_pwchange" value="1" {$flagsP} {$allow_pwchangeACL}>
-   {t}Allow user to change password from client{/t}
+   <input id="allow_pwchange" type=checkbox name="allow_pwchange" value="1" {$flagsP} {$allow_pwchangeACL}>
+   <label for="allow_pwchange">{t}Allow user to change password from client{/t}</label>
    <br>
-   <input type=checkbox name="no_password_required" value="1" {$flagsN}  {$no_password_requiredACL}>
-   {t}Login from windows client requires no password{/t}
+   <input id="no_password_required" type=checkbox name="no_password_required" value="1" {$flagsN}  {$no_password_requiredACL}>
+   <label for="no_password_required">{t}Login from windows client requires no password{/t}</label>
    <br>
-   <input type=checkbox name="temporary_disable" value="1" {$flagsD} {$temporary_disableACL}>
-   {t}Lock samba account{/t}
+   <input id="temporary_disable" type=checkbox name="temporary_disable" value="1" {$flagsD} {$temporary_disableACL}>
+   <label for="temporary_disable">{t}Lock samba account{/t}</label>
    <br>
-   <input type=checkbox name="password_expires" value="1" {$flagsC} {$password_expiresACL}>
-   {t}Password expires on{/t}
+   <input id="password_expires" type=checkbox name="password_expires" value="1" {$flagsC} {$sambaPwdMustChangeACL}>
+   <label for="password_expires">{t}Password expires on{/t}</label>
    <select name=day onChange="createResult(this.form,this.form.sambaPwdMustChange);" {$sambaPwdMustChangeACL}>
     {html_options values=$days output=$days selected=$day}
    </select>
@@ -233,8 +275,8 @@
     {html_options values=$years output=$years selected=$year}
    </select>
    <br>
-   <input type=checkbox name="logon_time_set" value="1" {$flagsT} {$logon_time_setACL}>
-   {t}Limit Logon Time{/t}
+   <input id="logon_time_set" type=checkbox name="logon_time_set" value="1" {$flagsT} {$sambaLogonTimeACL}>
+   <label for="logon_time_set">{t}Limit Logon Time{/t}</label>
    <select name=sambaLogonTime_day onChange="createResult_sambaLogonTime(this.form,this.form.sambaLogonTime);" {$sambaLogonTimeACL}>
    {html_options values=$sambaLogonTime_days output=$sambaLogonTime_days selected=$sambaLogonTime_day}
    </select>
@@ -245,8 +287,8 @@
    {html_options values=$sambaLogonTime_years output=$sambaLogonTime_years selected=$sambaLogonTime_year}
    </select>
    <br>
-   <input type=checkbox name="logoff_time_set" value="1" {$flagsO} {$logoff_time_setACL}>
-   {t}Limit Logoff Time{/t}
+   <input id="logoff_time_set" type=checkbox name="logoff_time_set" value="1" {$flagsO} {$sambaLogoffTimeACL}>
+   <label for="logoff_time_set">{t}Limit Logoff Time{/t}</label>
    <select name=sambaLogoffTime_day onChange="createResult_sambaLogoffTime(this.form,this.form.sambaLogoffTime);" {$sambaLogoffTimeACL}>
    {html_options values=$sambaLogoffTime_days output=$sambaLogoffTime_days selected=$sambaLogoffTime_day}
    </select>
@@ -257,8 +299,9 @@
    {html_options values=$sambaLogoffTime_years output=$sambaLogoffTime_years selected=$sambaLogoffTime_year}
    </select>
    <br>
-   <input type=checkbox name="kickoff_time_set" value="1" {$flagsK} {$kickoff_time_setACL}>
-   {t}Account expires after{/t}
+   
+   <input id="kickoff_time_set" type=checkbox name="kickoff_time_set" value="1" {$flagsK} {$sambaKickoffTimeACL}>
+   <label for="kickoff_time_set">{t}Account expires after{/t}</label>
    <select name=sambaKickoffTime_day onChange="createResult_sambaKickoffTime(this.form,this.form.sambaKickoffTime);" {$sambaKickoffTimeACL}>
    {html_options values=$sambaKickoffTime_days output=$sambaKickoffTime_days selected=$sambaKickoffTime_day}
    </select>
@@ -278,9 +321,9 @@
    &nbsp;
   </td>
   <td style="vertical-align:top;">
-   {t}Allow connection from these workstations only{/t}
+   <label for="workstation_list">{t}Allow connection from these workstations only{/t}</label>
    <br>
-   <select style="width:350px;" name="workstation_list[]" size=10 multiple {$sambaUserWorkstationACL}>
+   <select id="workstation_list" style="width:100%;" name="workstation_list[]" size=10 multiple {$sambaUserWorkstationACL}>
     {html_options values=$workstations output=$workstations}
    </select>
    <br>
@@ -297,9 +340,6 @@
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">
   <!-- 
-  // First input field on page
-  document.mainform.sambaHomePath.focus();
-
   // Populate expiery dialog
   populate(document.mainform,document.mainform.sambaPwdMustChange);