From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 21 Jul 2005 11:35:23 +0000 (+0000)
Subject: Added Label tag
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8cdcf63abe668ca967b6000efabb541dac8bad89;p=gosa.git

Added Label tag


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

diff --git a/plugins/admin/systems/service.tpl b/plugins/admin/systems/service.tpl
index 672e2e4d7..d344c81eb 100644
--- a/plugins/admin/systems/service.tpl
+++ b/plugins/admin/systems/service.tpl
@@ -4,25 +4,25 @@
    <h2><img alt="" align="middle" src="images/keyboard.png"> {t}Keyboard{/t}</h2>
    <table summary="">
     <tr>
-     <td>{t}Model{/t}</td>
+     <td><LABEL for="gotoXKbModel">{t}Model{/t}</LABEL></td>
      <td>
-      <select name="gotoXKbModel" title="{t}Choose keyboard model{/t}" {$gotoXKbModelACL}>
+      <select id="gotoXKbModel" name="gotoXKbModel" title="{t}Choose keyboard model{/t}" {$gotoXKbModelACL}>
        {html_options values=$XKbModels output=$XKbModels selected=$gotoXKbModel_select}
       </select>
      </td>
     </tr>
     <tr>
-     <td>{t}Layout{/t}</td>
+     <td><LABEL for="gotoXKbLayout">{t}Layout{/t}</LABEL></td>
      <td>
-      <select name="gotoXKbLayout" title="{t}Choose keyboard layout{/t}" {$gotoXKbLayoutACL}>
+      <select id="gotoXKbLayout" name="gotoXKbLayout" title="{t}Choose keyboard layout{/t}" {$gotoXKbLayoutACL}>
        {html_options values=$XKbLayouts output=$XKbLayouts selected=$gotoXKbLayout_select}
       </select>
      </td>
     </tr>
     <tr>
-     <td>{t}Variant{/t}</td>
+     <td><LABEL for="gotoXKbVariant">{t}Variant{/t}</LABEL></td>
      <td>
-      <select name="gotoXKbVariant" title="{t}Choose keyboard variant{/t}" {$gotoXKbVariantACL}>
+      <select id="gotoXKbVariant" name="gotoXKbVariant" title="{t}Choose keyboard variant{/t}" {$gotoXKbVariantACL}>
        {html_options values=$XKbVariants output=$XKbVariants selected=$gotoXKbVariant_select}
       </select>
      </td>
@@ -39,17 +39,17 @@
    <h2><img alt="" align="middle" src="images/mouse.png"> {t}Mouse{/t}</h2>
    <table summary="">
     <tr>
-     <td>{t}Type{/t}</td>
+     <td><LABEL for="gotoXMouseType">{t}Type{/t}</LABEL></td>
      <td>
-      <select name="gotoXMouseType" title="{t}Choose mouse type{/t}" {$gotoXMouseTypeACL}>
+      <select name="gotoXMouseType" id="gotoXMouseType" title="{t}Choose mouse type{/t}" {$gotoXMouseTypeACL}>
        {html_options values=$MouseTypes output=$MouseTypes selected=$gotoXMouseType_select}
       </select>
      </td>
     </tr>
     <tr>
-     <td>{t}Port{/t}</td>
+     <td><LABEL for="gotoXMouseport">{t}Port{/t}</LABEL></td>
      <td>
-      <select name="gotoXMouseport" title="{t}Choose mouse port{/t}" {$gotoXMouseportACL}>
+      <select id="gotoXMouseport" name="gotoXMouseport" title="{t}Choose mouse port{/t}" {$gotoXMouseportACL}>
        {html_options values=$MousePorts output=$MousePorts selected=$gotoXMouseport_select}
       </select>
      </td>
@@ -83,25 +83,25 @@
    <h2><img alt="" align="middle" src="images/hardware.png"> {t}Graphic device{/t}</h2>
    <table summary="">
     <tr>
-     <td>{t}Driver{/t}</td>
+     <td><LABEL for="gotoXDriver">{t}Driver{/t}</LABEL></td>
      <td>
-      <select name="gotoXDriver" title="{t}Choose graphic driver that is needed by the installed graphic board{/t}" {$gotoXDriverACL}>
+      <select id="gotoXDriver" name="gotoXDriver" title="{t}Choose graphic driver that is needed by the installed graphic board{/t}" {$gotoXDriverACL}>
        {html_options values=$XDrivers output=$XDrivers selected=$gotoXDriver_select}
       </select>
      </td>
     </tr>
     <tr>
-     <td>{t}Resolution{/t}</td>
+     <td><LABEL for="gotoXResolution">{t}Resolution{/t}</LABEL></td>
      <td>
-      <select name="gotoXResolution" title="{t}Choose screen resolution used in graphic mode{/t}" {$gotoXResolutionACL}>
+      <select id="gotoXResolution" name="gotoXResolution" title="{t}Choose screen resolution used in graphic mode{/t}" {$gotoXResolutionACL}>
        {html_options values=$XResolutions output=$XResolutions selected=$gotoXResolution_select}
       </select>
      </td>
     </tr>
     <tr>
-     <td>{t}Color depth{/t}</td>
+     <td><LABEL for="gotoXColordepth">{t}Color depth{/t}</LABEL></td>
      <td>
-      <select name="gotoXColordepth" title="{t}Choose colordepth used in graphic mode{/t}" {$gotoXColordepthACL}>
+      <select id="gotoXColordepth" name="gotoXColordepth" title="{t}Choose colordepth used in graphic mode{/t}" {$gotoXColordepthACL}>
        {html_options values=$XColordepths output=$XColordepths selected=$gotoXColordepth_select}
       </select>
      </td>
@@ -121,13 +121,13 @@
      <td>{$gotoXMonitor}</td>
     </tr>
     <tr>
-     <td>{t}HSync{/t}</td>
-     <td><input name="gotoXHsync" size=10 maxlength=60 {$gotoXHsyncACL}
+     <td><LABEL for="gotoXHsync">{t}HSync{/t}</LABEL></td>
+     <td><input id="gotoXHsync" name="gotoXHsync" size=10 maxlength=60 {$gotoXHsyncACL}
                 value="{$gotoXHsync}" title="{t}Horizontal refresh frequency for installed monitor{/t}"> kHz</td>
     </tr>
     <tr>
-     <td>{t}VSync{/t}</td>
-     <td><input name="gotoXVsync" size=10 maxlength=60 {$gotoXVsyncACL}
+     <td><LABEL for="gotoXVsync">{t}VSync{/t}</LABEL></td>
+     <td><input id="gotoXVsync"  name="gotoXVsync" size=10 maxlength=60 {$gotoXVsyncACL}
                 value="{$gotoXVsync}" title="{t}Vertical refresh frequency for installed monitor{/t}"> Hz</td>
     </tr>
    </table>
@@ -142,27 +142,27 @@
    <table summary="">
     <tr>
      <td></td>
-     <td>{t}Connect method{/t}</td>
+     <td><LABEL for="gotoXMethod">{t}Connect method{/t}</LABEL></td>
      <td>
-      <select name="gotoXMethod" title="{t}Choose method to connect to terminal server{/t}" {$gotoXMethodACL}>
+      <select name="gotoXMethod" id="gotoXMethod" title="{t}Choose method to connect to terminal server{/t}" {$gotoXMethodACL}>
        {html_options options=$XMethods selected=$gotoXMethod_select}
       </select>
      </td>
     </tr>
     <tr>
      <td></td>
-     <td>{t}Terminal server{/t}</td>
+     <td><LABEL for="gotoXdmcpServer">{t}Terminal server{/t}</LABEL></td>
      <td>
-      <select name="gotoXdmcpServer" title="{t}Select specific terminal server to use{/t}" {$gotoXdmcpServerACL}>
+      <select id="gotoXdmcpServer" name="gotoXdmcpServer" title="{t}Select specific terminal server to use{/t}" {$gotoXdmcpServerACL}>
        {html_options values=$xdmcpservers output=$xdmcpservers selected=$gotoXdmcpServer_select}
       </select>
      </td>
     </tr>
     <tr>
      <td></td>
-     <td>{t}Font server{/t}</td>
+     <td><LABEL for="gotoFontPath">{t}Font server{/t}</LABEL></td>
      <td>
-      <select name="gotoFontPath" title="{t}Select specific font server to use{/t}" {$gotoFontPathACL}>
+      <select name="gotoFontPath" id="gotoFontPath" title="{t}Select specific font server to use{/t}" {$gotoFontPathACL}>
        {html_options values=$fontservers output=$fontservers selected=$gotoFontPath_select}
       </select>
      </td>
@@ -178,17 +178,17 @@
 
  <tr>
   <td style="width:50%; vertical-align:top;">
-   <h2><img alt="" align="middle" src="images/printer.png"> {t}Print device{/t}</h2>
-   <input type=checkbox name="gotoLpdEnable" value="1" {$gotoLpdEnable} {$gotoLpdEnableACL} title="{t}Select to start IPP based printing service on terminal{/t}">
+   <h2><img alt="" align="middle" src="images/printer.png"><LABEL for="gotoLpdEnable"> {t}Print device{/t}</LABEL></h2>
+   <input id="gotoLpdEnable" type=checkbox name="gotoLpdEnable" value="1" {$gotoLpdEnable} {$gotoLpdEnableACL} title="{t}Select to start IPP based printing service on terminal{/t}">
    {t}Provide print services{/t}
    <br>
 
    <table summary="">
    <tr>
      <td><div style="width:20px;"></div></td>
-     <td>{t}Spool server{/t}</td>
+     <td><LABEL for="gotoLpdServer">{t}Spool server{/t}</LABEL></td>
      <td>
-      <select name="gotoLpdServer" title="{t}Select NFS filesystem to place spool files on{/t}" {$gotoLpdServerACL}>
+      <select name="gotoLpdServer" id="gotoLpdServer" title="{t}Select NFS filesystem to place spool files on{/t}" {$gotoLpdServerACL}>
        {html_options values=$nfsservers output=$nfsservers selected=$gotoLpdServer_select}
       </select>
      </td>
@@ -207,9 +207,9 @@
    <table summary="">
     <tr>
      <td><div style="width:20px;"></div></td>
-     <td>{t}Model{/t}</td>
+     <td><LABEL for="gotoScannerModel">{t}Model{/t}</LABEL></td>
      <td>
-      <select name="gotoScannerModel" title="{t}Select scanner driver to use{/t}" {$gotoScannerEnableACL}>
+      <select name="gotoScannerModel" id="gotoScannerModel" title="{t}Select scanner driver to use{/t}" {$gotoScannerEnableACL}>
        {html_options values=$gotoScannerModels output=$gotoScannerModels selected=$gotoScannerModel_select}
       </select>
      </td>
diff --git a/plugins/admin/systems/servkolab.tpl b/plugins/admin/systems/servkolab.tpl
index b6f1a597e..c43aa90c1 100644
--- a/plugins/admin/systems/servkolab.tpl
+++ b/plugins/admin/systems/servkolab.tpl
@@ -8,66 +8,66 @@
 	</tr>
 	<tr>
 		<td>
-			<input name="cyrus_pop3" value="1" type="checkbox" {$cyrus_pop3Check} {$cyrus_pop3ACL}>
+			<input id="cyrus_pop3" name="cyrus_pop3" value="1" type="checkbox" {$cyrus_pop3Check} {$cyrus_pop3ACL}>
 		</td>
 		<td>
-			{t}POP3 service{/t}
+			<LABEL for="cyrus_pop3">{t}POP3 service{/t}</LABEL>
 		</td>
 	</tr>
 	<tr>
         <td>
-            <input name="cyrus_pop3s" value="1" type="checkbox" {$cyrus_pop3sCheck} {$cyrus_pop3sACL}>
+            <input id="cyrus_pop3s" name="cyrus_pop3s" value="1" type="checkbox" {$cyrus_pop3sCheck} {$cyrus_pop3sACL}>
         </td>
 		<td>
-			{t}POP3/SSL service{/t}
+			<LABEL for="cyrus_pop3s">{t}POP3/SSL service{/t}</LABEL>
         </td>
     </tr>
     <tr>
         <td>
-            <input name="cyrus_imap" value="1" type="checkbox" {$cyrus_imapCheck} {$cyrus_imapACL}>
+            <input id="cyrus_imap" name="cyrus_imap" value="1" type="checkbox" {$cyrus_imapCheck} {$cyrus_imapACL}>
         </td>
         <td>
-			{t}IMAP service{/t}
+			<LABEL for="cyrus_imap">{t}IMAP service{/t}</LABEL>
         </td>
     </tr>
     <tr>
         <td>
-            <input name="cyrus_imaps" value="1" type="checkbox" {$cyrus_imapsCheck} {$cyrus_imapsACL}>
+            <input id="cyrus_imaps" name="cyrus_imaps" value="1" type="checkbox" {$cyrus_imapsCheck} {$cyrus_imapsACL}>
         </td>
         <td>
-			{t}IMAP/SSL service{/t}
+			<LABEL for="cyrus_imaps">{t}IMAP/SSL service{/t}</LABEL>
         </td>
     </tr>
     <tr>
         <td>
-            <input name="cyrus_sieve" value="1" type="checkbox" {$cyrus_sieveCheck} {$cyrus_sieveACL}>
+            <input id="cyrus_sieve" name="cyrus_sieve" value="1" type="checkbox" {$cyrus_sieveCheck} {$cyrus_sieveACL}>
         </td>
         <td>
-			{t}Sieve service{/t}
+			<LABEL for="cyrus_sieve">{t}Sieve service{/t}</LABEL>
         </td>
     </tr>
     <tr>
         <td>
-            <input name="proftpd_ftp" value="1" type="checkbox" {$proftpd_ftpCheck} {$proftpd_ftpACL}>
+            <input id="proftpd_ftp" name="proftpd_ftp" value="1" type="checkbox" {$proftpd_ftpCheck} {$proftpd_ftpACL}>
         </td>	
         <td>
-			{t}FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy){/t}
+			<LABEL for="proftpd_ftp">{t}FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy){/t}</LABEL>
         </td>
     </tr>
     <tr>
         <td>
-            <input name="apache_http" value="1" type="checkbox" {$apache_httpCheck} {$apache_httpACL}>
+            <input id="apache_http" name="apache_http" value="1" type="checkbox" {$apache_httpCheck} {$apache_httpACL}>
         </td>
         <td>
-			{t}HTTP FreeBusy service (legacy){/t}
+			<LABEL for="apache_http">{t}HTTP FreeBusy service (legacy){/t}</LABEL>
         </td>
     </tr>
     <tr>
         <td>
-            <input name="postfix_enable_virus_scan" value="1" type="checkbox" {$postfix_enable_virus_scanCheck} {$postfix_enable_virus_scanACL}>
+			<input id="postfix_enable_virus_scan" name="postfix_enable_virus_scan" value="1" type="checkbox" {$postfix_enable_virus_scanCheck} {$postfix_enable_virus_scanACL}>
         </td>
         <td>
-			{t}Amavis email scanning (virus/spam){/t}
+			<LABEL for="postfix_enable_virus_scan">{t}Amavis email scanning (virus/spam){/t}</LABEL>
 		</td>
 	</tr>
    </table>
@@ -119,8 +119,8 @@
     </tr>
     <tr>
 	  <td>
-	    {t}Hosts/networks allowed to relay{/t}<br>
-        <input name="postfix_mynetworks" size="60" maxlength="220" value="{$postfix_mynetworks}" {$postfix_mynetworksACL} type="text">
+	    <LABEL for="postfix_mynetworks">{t}Hosts/networks allowed to relay{/t}</LABEL><br>
+        <input id="postfix_mynetworks" name="postfix_mynetworks" size="60" maxlength="220" value="{$postfix_mynetworks}" {$postfix_mynetworksACL} type="text">
 		<br>
 		( {t}Enter multiple values, seperated with{/t} ; )
 	</td>
@@ -140,14 +140,14 @@
     </tr>
     <tr>
         <td>
-            <input name="RelayMxSupport" value="1" type="checkbox" {$RelayMxSupportCheck} {$postfix_relayhostACL}>
-			{t}Enable MX lookup for relayhost{/t}
+            <input id="RelayMxSupport" name="RelayMxSupport" value="1" type="checkbox" {$RelayMxSupportCheck} {$postfix_relayhostACL}>
+			<LABEL for="RelayMxSupport">{t}Enable MX lookup for relayhost{/t}</LABEL>
 		</td>
      </tr>
 	<tr>	
 		<td>
-		    {t}Host used to relay mails{/t}&nbsp;
-			<input name="postfix_relayhost" size="35" maxlength="120" value="{$postfix_relayhost}" {$postfix_relayhostACL} type="text">
+		    <LABEL for="postfix_relayhost">{t}Host used to relay mails{/t}</LABEL>&nbsp;
+			<input id="postfix_relayhost" name="postfix_relayhost" size="35" maxlength="120" value="{$postfix_relayhost}" {$postfix_relayhostACL} type="text">
 		</td>
 	</tr>
    </table>
@@ -165,8 +165,8 @@
     </tr>
     <tr>
         <td>
-            <input name="postfix_allow_unauthenticated" value="1" type="checkbox" {$postfix_allow_unauthenticatedCheck} {$postfix_allow_unauthenticatedACL}>
-        	{t}Accept mail from other domains over non-authenticated SMTP{/t}
+            <input id="postfix_allow_unauthenticated" name="postfix_allow_unauthenticated" value="1" type="checkbox" {$postfix_allow_unauthenticatedCheck} {$postfix_allow_unauthenticatedACL}>
+        	<LABEL for="postfix_allow_unauthenticated">{t}Accept mail from other domains over non-authenticated SMTP{/t}</LABEL>
 		</td>
      </tr>
    </table>
diff --git a/plugins/admin/systems/startup.tpl b/plugins/admin/systems/startup.tpl
index d6317e8f5..12321d0c1 100644
--- a/plugins/admin/systems/startup.tpl
+++ b/plugins/admin/systems/startup.tpl
@@ -5,22 +5,22 @@
 
    <table summary="">
     <tr>
-     <td>{t}LDAP server{/t}</td>
+     <td><LABEL for="gotoLdapServer">{t}LDAP server{/t}</LABEL></td>
      <td>
-      <select name="gotoLdapServer" title="{t}Choose LDAP server to use for accounts and terminal management{/t}" {$gotoLdapServerACL}>
+      <select name="gotoLdapServer" id="gotoLdapServer" title="{t}Choose LDAP server to use for accounts and terminal management{/t}" {$gotoLdapServerACL}>
        {html_options values=$ldapservers output=$ldapservers selected=$gotoLdapServer_select}
 	   <option disabled>&nbsp;</option>
       </select>
      </td>
     </tr>
     <tr>
-     <td>{t}Boot kernel{/t}</td>
-     <td><input name="gotoBootKernel" size=20 maxlength=60 {$gotoBootKernelACL}
+     <td><LABEL for="gotoBootKernel">{t}Boot kernel{/t}</LABEL></td>
+     <td><input id="gotoBootKernel" name="gotoBootKernel" size=20 maxlength=60 {$gotoBootKernelACL}
                 value="{$gotoBootKernel}" title="{t}Enter the filename of the kernel to use{/t}"></td>
     </tr>
     <tr>
-     <td>{t}Custom options{/t}</td>
-     <td><input name="customParameters" size=25 maxlength=500 {$gotoKernelParametersACL}
+     <td><LABEL for="customParameters">{t}Custom options{/t}</LABEL></td>
+     <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>
    </table>
diff --git a/plugins/admin/systems/terminal.tpl b/plugins/admin/systems/terminal.tpl
index ac34098da..4e4ec532b 100644
--- a/plugins/admin/systems/terminal.tpl
+++ b/plugins/admin/systems/terminal.tpl
@@ -8,16 +8,16 @@
      {if $cn eq 'default'}
      <td colspan=2>{t}Terminal template{/t}</td>
      {else}
-     <td>{t}Terminal name{/t}{$must}</td>
+     <td><LABEL for="cn">{t}Terminal name{/t}</LABEL>{$must}</td>
      <td>
-      <input name="cn" size=18 maxlength=60 value="{$cn}">
+      <input name="cn" id="cn" size=18 maxlength=60 value="{$cn}">
      </td>
      {/if}
     </tr>
     <tr>
-     <td>{t}Base{/t}{$must}</td>
+     <td><LABEL for="base">{t}Base{/t}</LABEL>{$must}</td>
      <td>
-      <select size="1" name="base" title="{t}Choose subtree to place terminal in{/t}">
+      <select size="1" id="base" name="base" title="{t}Choose subtree to place terminal in{/t}">
        {html_options options=$bases selected=$base_select}
       </select>
     </tr>
@@ -33,9 +33,9 @@
 
    <table summary="">
     <tr>
-     <td>{t}Mode{/t}</td>
+     <td><LABEL for="gotoMode">{t}Mode{/t}</LABEL></td>
      <td>
-      <select name="gotoMode" title="{t}Select terminal mode{/t}" {$gotoModeACL}>
+      <select id="gotoMode" name="gotoMode" title="{t}Select terminal mode{/t}" {$gotoModeACL}>
        {html_options options=$modes selected=$gotoMode_select}
       </select>
      </td>
@@ -49,17 +49,17 @@
    <table summary="">
     <tr><td colspan=2><div style="height:15px;"></div></td></tr>
     <tr>
-     <td>{t}Root server{/t}</td>
+     <td><LABEL for="gotoTerminalPath">{t}Root server{/t}<LABEL></td>
      <td>
-      <select name="gotoTerminalPath" title="{t}Select NFS root filesystem to use{/t}" {$gotoTerminalPathACL}>
+      <select name="gotoTerminalPath" id="gotoTerminalPath" title="{t}Select NFS root filesystem to use{/t}" {$gotoTerminalPathACL}>
        {html_options values=$nfsservers output=$nfsservers selected=$gotoTerminalPath_select}
       </select>
      </td>
     </tr>
     <tr>
-     <td>{t}Swap server{/t}</td>
+     <td><LABEL for="gotoSwapServer">{t}Swap server{/t}</LABEL></td>
      <td>
-      <select name="gotoSwapServer" title="{t}Choose NFS filesystem to place swap files on{/t}" {$gotoSwapServerACL}>
+      <select name="gotoSwapServer" id="gotoSwapServer" title="{t}Choose NFS filesystem to place swap files on{/t}" {$gotoSwapServerACL}>
        {html_options values=$nfsservers output=$nfsservers selected=$gotoSwapServer_select}
       </select>
      </td>
@@ -71,17 +71,17 @@
    <table summary="">
     <tr><td colspan=2><div style="height:15px;"></div></td></tr>
     <tr>
-     <td>{t}Syslog server{/t}</td>
+     <td><LABEL for="gotoSyslogServer">{t}Syslog server{/t}</LABEL></td>
      <td>
-      <select name="gotoSyslogServer" title="{t}Choose server to use for logging{/t}" {$gotoSyslogServerACL}>
+      <select name="gotoSyslogServer" id="gotoSyslogServer" title="{t}Choose server to use for logging{/t}" {$gotoSyslogServerACL}>
        {html_options values=$syslogservers output=$syslogservers selected=$gotoSyslogServer_select}
       </select>
      </td>
     </tr>
     <tr>
-     <td>{t}NTP server{/t}</td>
+     <td><LABEL for="gotoNtpServer">{t}NTP server{/t}</LABEL></td>
      <td>
-      <select name="gotoNtpServer" title="{t}Choose server to use for synchronizing time{/t}" {$gotoNtpServerACL}>
+      <select name="gotoNtpServer" id="gotoNtpServer" title="{t}Choose server to use for synchronizing time{/t}" {$gotoNtpServerACL}>
        {html_options values=$ntpservers output=$ntpservers selected=$gotoNtpServer_select}
       </select>
      </td>
diff --git a/plugins/admin/systems/wingeneric.tpl b/plugins/admin/systems/wingeneric.tpl
index a3f5f091e..3b58f19c6 100644
--- a/plugins/admin/systems/wingeneric.tpl
+++ b/plugins/admin/systems/wingeneric.tpl
@@ -3,16 +3,16 @@
   <td style="vertical-align:top; width:50%;">
 	<table summary="">
 	 <tr>
-	  <td>{t}Machine name{/t}{$must}</td>
-	  <td><input name="cn" size=20 maxlength=60 value="{$cn}"></td>
+	  <td><LABEL for="cn">{t}Machine name{/t}</LABEL>{$must}</td>
+	  <td><input id="cn" name="cn" size=20 maxlength=60 value="{$cn}"></td>
 	 </tr>
 	 <tr>
           <td colspan=2>&nbsp;</td>
 	 </tr>
  	 <tr>
-	  <td>{t}Base{/t}{$must}</td>
+	  <td><LABEL for="base">{t}Base{/t}</LABEL>{$must}</td>
 	  <td>
-	   <select size="1" name="base" title="{t}Choose subtree to place terminal in{/t}">
+	   <select size="1" id="base" name="base" title="{t}Choose subtree to place terminal in{/t}">
 	    {html_options options=$bases selected=$base_select}
 	   </select>
 	  </tr>
@@ -21,8 +21,8 @@
   <td style="vertical-align:top">
 	<table summary="">
 	 <tr>
-	  <td>{t}Description{/t}</td>
-	  <td><input name="description" size=25 maxlength=80 value="{$description}"></td>
+	  <td><LABEL for="description">{t}Description{/t}</LABEL></td>
+	  <td><input id="description" name="description" size=25 maxlength=80 value="{$description}"></td>
 	 </tr>
 	</table>
   </td>
diff --git a/plugins/admin/systems/workstation.tpl b/plugins/admin/systems/workstation.tpl
index c58eea6f1..385a9e766 100644
--- a/plugins/admin/systems/workstation.tpl
+++ b/plugins/admin/systems/workstation.tpl
@@ -8,16 +8,16 @@
      {if $cn eq 'wdefault'}
      <td colspan=2>{t}Workstation template{/t}</td>
      {else}
-     <td>{t}Workstation name{/t}{$must}</td>
+     <td><LABEL for="cn">{t}Workstation name{/t}</LABEL>{$must}</td>
      <td>
-      <input name="cn" size=18 maxlength=60 value="{$cn}">
+      <input name="cn" id="cn" size=18 maxlength=60 value="{$cn}">
      </td>
      {/if}
     </tr>
     <tr>
-     <td>{t}Base{/t}{$must}</td>
+     <td><LABEL for="base">{t}Base{/t}</LABEL>{$must}</td>
      <td>
-      <select size="1" name="base" title="{t}Choose subtree to place terminal in{/t}">
+      <select size="1" id="base" name="base" title="{t}Choose subtree to place terminal in{/t}">
        {html_options options=$bases selected=$base_select}
       </select>
     </tr>
@@ -71,17 +71,17 @@
    <table summary="">
     <tr><td colspan=2><div style="height:15px;"></div></td></tr>
     <tr>
-     <td>{t}Syslog server{/t}</td>
+     <td><LABEL for="gotoSyslogServer">{t}Syslog server{/t}</LABEL></td>
      <td>
-      <select name="gotoSyslogServer" title="{t}Choose server to use for logging{/t}" {$gotoSyslogServerACL}>
+      <select id="gotoSyslogServer" name="gotoSyslogServer" title="{t}Choose server to use for logging{/t}" {$gotoSyslogServerACL}>
        {html_options values=$syslogservers output=$syslogservers selected=$gotoSyslogServer_select}
       </select>
      </td>
     </tr>
     <tr>
-     <td>{t}NTP server{/t}</td>
+     <td><LABEL for="gotoNtpServer">{t}NTP server{/t}</LABEL></td>
      <td>
-      <select name="gotoNtpServer" title="{t}Choose server to use for synchronizing time{/t}" {$gotoNtpServerACL}>
+      <select id="gotoNtpServer" name="gotoNtpServer" title="{t}Choose server to use for synchronizing time{/t}" {$gotoNtpServerACL}>
        {html_options values=$ntpservers output=$ntpservers selected=$gotoNtpServer_select}
       </select>
      </td>