From 92b7f31d54b51bce9715599fd784167433376fc8 Mon Sep 17 00:00:00 2001
From: janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 25 Nov 2005 15:31:31 +0000
Subject: [PATCH] Made some style improvements.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2073 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/gofax/faxaccount/generic.tpl          | 18 +++---
 plugins/gofon/phoneaccount/generic.tpl        | 10 ++--
 plugins/personal/environment/environment.tpl  | 32 +++++-----
 plugins/personal/generic/generic.tpl          | 12 ++--
 plugins/personal/mail/generic.tpl             | 32 +++++-----
 plugins/personal/nagios/nagios.tpl            | 24 ++++----
 plugins/personal/posix/generic.tpl            | 20 +++----
 plugins/personal/samba/samba2.tpl             | 24 ++++----
 plugins/personal/samba/samba3.tpl             | 60 +++++++++----------
 .../personal/samba/samba3_workstations.tpl    |  4 +-
 10 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/plugins/gofax/faxaccount/generic.tpl b/plugins/gofax/faxaccount/generic.tpl
index e35352bf2..a6bf16a25 100644
--- a/plugins/gofax/faxaccount/generic.tpl
+++ b/plugins/gofax/faxaccount/generic.tpl
@@ -1,19 +1,19 @@
-<table summary="" 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 style="width:50%; vertical-align:top;">
-     <h2><img alt="" align="middle" src="images/rightarrow.png"> {t}Generic{/t}</h2>
+     <h2><p class="center"><img class="center" alt="" align="middle" src="images/rightarrow.png" />&nbsp;{t}Generic{/t}</p></h2>
 
      <table summary="">
        <tr>
-         <td><LABEL for="facsimileTelephoneNumber">{t}Fax{/t}</LABEL>{$must}</td>
+         <td><label for="facsimileTelephoneNumber">{t}Fax{/t}</label>{$must}</td>
          <td>
            <input name="facsimileTelephoneNumber" id="facsimileTelephoneNumber" size=20 maxlength=65 {$facsimileTelephoneNumberACL} value="{$facsimileTelephoneNumber}" title="{t}Fax number for GOfax to trigger on{/t}">
          </td>
        </tr>
        <tr>
-         <td><LABEL for="goFaxLanguage">{t}Language{/t}</LABEL></td>
+         <td><label for="goFaxLanguage">{t}Language{/t}</label></td>
 	 <td>
            <select size="1" name="goFaxLanguage" id="goFaxLanguage" {$goFaxLanguageACL} title="{t}Specify the GOfax communication language for fax to mail gateway{/t}">
 	    {html_options values=$languages output=$languages selected=$goFaxLanguage}
@@ -21,7 +21,7 @@
          </td>
        </tr>
        <tr>
-         <td><LABEL for="goFaxFormat">{t}Delivery format{/t}</LABEL></td>
+         <td><label for="goFaxFormat">{t}Delivery format{/t}</label></td>
          <td>
            <select id="goFaxFormat" size="1" name="goFaxFormat" {$goFaxFormatACL} title="{t}Specify delivery format for fax to mail gateway{/t}">
 	    {html_options values=$formats output=$formats selected=$goFaxFormat}
@@ -35,14 +35,14 @@
     &nbsp;
    </td>
    <td style="vertical-align:top; width:100%">
-     <h2><img alt="" align="middle" src="images/printer.png"> {t}Delivery methods{/t}</h2>
+     <h2><p class="center"><img class="center" alt="" align="middle" src="images/printer.png" />&nbsp;{t}Delivery methods{/t}</p></h2>
 
      <input type=checkbox name="goFaxIsEnabled" value="1" {$goFaxIsEnabled} {$goFaxIsEnabledACL}>
      {t}Temporary disable fax usage{/t}<br>
 
      {if $has_mailaccount eq "false"}
      <input type=checkbox name="fax_to_mail" value="1" {$fax_to_mail} {$goFaxDeliveryModeACL}>
-      <LABEL for="mail">{t}Deliver fax as mail to{/t}</LABEL>&nbsp;
+      <label for="mail">{t}Deliver fax as mail to{/t}</label>&nbsp;
       <input name="mail" id="mail" size=25 maxlength=65 {$goFaxDeliveryModeACL} value="{$mail}">
      {else}
      <input type=checkbox name="fax_to_mail" value="1" {$fax_to_mail} {$goFaxDeliveryModeACL}>
@@ -66,7 +66,7 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
   <tr>
     <td style="width:50%; border-right:1px solid #A0A0A0">
-    <h2><img alt="" align="middle" src="images/fax_small.png"> {t}Alternate fax numbers{/t}</h2>
+    <h2><p class="center"<img class="center" alt="" align="middle" src="images/fax_small.png">&nbsp;{t}Alternate fax numbers{/t}</p></h2>
     <select style="width:100%" name="alternate_list[]" size="10" multiple {$facsimileAlternateTelephoneNumberACL}>
 			{html_options values=$facsimileAlternateTelephoneNumber output=$facsimileAlternateTelephoneNumber}
 			<option disabled>&nbsp;</option>
@@ -78,7 +78,7 @@
     <input type=submit value="{t}Delete{/t}" name="delete_alternate" {$facsimileAlternateTelephoneNumberACL}>
    </td>
    <td style="vertical-align:top; width:50%">
-      <h2><img alt="" align="middle" src="images/false.png"> {t}Blocklists{/t}</h2>
+      <h2><p class="center"><img class="center" alt="" align="middle" src="images/false.png" />&nbsp;{t}Blocklists{/t}</p></h2>
       <table summary="" style="width:100%">
         <tr>
           <td>{t}Blocklists for incoming fax{/t}</td>
diff --git a/plugins/gofon/phoneaccount/generic.tpl b/plugins/gofon/phoneaccount/generic.tpl
index ccec2b5de..dce10b4d3 100644
--- a/plugins/gofon/phoneaccount/generic.tpl
+++ b/plugins/gofon/phoneaccount/generic.tpl
@@ -1,7 +1,7 @@
 <table summary="{t}Phone numbers{/t}" style="width:100%">
  <tr>
   <td style="vertical-align:top; border-right:1px solid #A0A0A0; width:50%">
-   <h2><img alt="" align="middle" src="images/banana.png"> {t}Phone numbers{/t}</h2>
+   <h2><p class="center"><img class="center" alt="" align="middle" src="images/banana.png" />&nbsp;{t}Phone numbers{/t}</p></h2>
       <select style="width:100%;" name="phonenumber_list[]" size=7 multiple {$telephoneNumberACL}>
        {html_options options=$phoneNumbers}
 		<option disabled>
@@ -21,7 +21,7 @@
  <tr>
 
   <td tyle="vertical-align:top;">
-   <h2><img alt="" align="middle" src="images/hardware.png"> {t}Telephone hardware{/t}</h2>
+   <h2><p class="center"><img class="center" alt="" align="middle" src="images/hardware.png" />&nbsp;{t}Telephone hardware{/t}</p></h2>
 
    <table summary="{t}Telephone{/t}" border=0>
     <tr>
@@ -30,7 +30,7 @@
     </tr>
 			<tr>
 				<td>
-					<LABEL for="goFonVoicemailPIN">{t}Voicemail PIN{/t}{$must}</LABEL>
+					<label for="goFonVoicemailPIN">{t}Voicemail PIN{/t}{$must}</label>
 				</td>
 				<td>
 					<input type="password" id="goFonVoicemailPIN" name="goFonVoicemailPIN" value="{$goFonVoicemailPIN}" {$goFonVoicemailPINACL}>
@@ -38,7 +38,7 @@
 			</tr>
 			<tr>
 				<td>
-					<LABEL for="goFonPIN">{t}Phone PIN{/t}{$must}</LABEL>
+					<label for="goFonPIN">{t}Phone PIN{/t}{$must}</label>
 				</td>
 				<td>
 					<input type="password" id="goFonPIN" name="goFonPIN" value="{$goFonPIN}" {$goFonPINACL}>
@@ -56,7 +56,7 @@
  </tr>
  <tr style="vertical-align:top; border-top:1px solid #A0A0A0;">
 	<td colspan=2 style="vertical-align:top;width:50%">
-		<h2><img alt="" src="images/select_macro.png" align="middle">&nbsp;{t}Phone macro{/t}</h2>
+		<h2><p class="center"><img class="center" alt="" src="images/select_macro.png" align="middle" />&nbsp;{t}Phone macro{/t}</p></h2>
 		<table summary="{t}Phone macro{/t}">
 			<tr>
 				<td colspan=2>
diff --git a/plugins/personal/environment/environment.tpl b/plugins/personal/environment/environment.tpl
index 05786327b..afe8ae64b 100644
--- a/plugins/personal/environment/environment.tpl
+++ b/plugins/personal/environment/environment.tpl
@@ -4,18 +4,18 @@
 {else}
 <input type="hidden" name="iamposted" value="1">
 
-<h2><img alt="" src="images/fai_profile.png" align="middle">&nbsp;{t}Profiles{/t}</h2>
+<h2><p class="center"><img class="center" alt="" src="images/fai_profile.png" align="middle" /> {t}Profiles{/t}</p></h2>
 <table summary="{t}Environment managment settings{/t}" width="100%">
   <tr>
    <td style="width:50%;border-right:1px solid #B0B0B0;vertical-align:top;">
 			<table summary="{t}Profile managment{/t}">
 				<tr>
 					<td style="vertical-align:top">
-						<input type="checkbox" value="1" {$useProfileCHK} name="useProfile" {$useProfileACL} id="useProfile"
+						<input class="center" type="checkbox" value="1" {$useProfileCHK} name="useProfile" {$useProfileACL} id="useProfile"
 									onclick="changeState('gotoProfileServer');changeState('gotoProfileFlag_C');">
 					</td>
-					<td valign="top">
-						<LABEL for="useProfile">{t}Use profile managment{/t}</LABEL>
+					<td style="vertical-align:middle;">
+						<label for="useProfile">{t}Use profile managment{/t}</label>
 					</td>
 				</tr>
 				<tr>
@@ -25,7 +25,7 @@
 						<table summary="{t}Profile server managment{/t}">
 							<tr>
 								<td>	
-									<LABEL for="gotoProfileServer">{t}Profil path{/t}</LABEL>
+									<label for="gotoProfileServer">{t}Profil path{/t}</label>
 								</td>
 								<td>
 									<select id="gotoProfileServer" 
@@ -37,9 +37,9 @@
 							</tr>
 							<tr>
 								<td colspan=2>	
-									<input type="checkbox" name="gotoProfileFlag_C" value="C" 
+									<input class="center" type="checkbox" name="gotoProfileFlag_C" value="C" 
 										id="gotoProfileFlag_C" {$gotoProfileACL} {$gotoProfileFlag_CCHK}>&nbsp;
-									<LABEL for="gotoProfileFlag_C">{t}Cache profile localy{/t}</LABEL>
+									<label for="gotoProfileFlag_C">{t}Cache profile localy{/t}</label>
 								</td>
 							</tr>
 						</table>
@@ -51,7 +51,7 @@
 			<table summary="{t}Kiosk profile settings{/t}">
 				<tr>
 					<td>
-						<LABEL for="gotoKioskProfile">{t}Kiosk profile{/t}</LABEL>
+						<label for="gotoKioskProfile">{t}Kiosk profile{/t}</label>
 					</td>
 					<td>
 						<select name="gotoKioskProfile" {$gotoKioskProfileACL} id="gotoKioskProfile">
@@ -62,7 +62,7 @@
 				</tr>
 				<tr>
 					<td>
-						<LABEL for="gotoProfileQuota">{t}Quota{/t}</LABEL> 
+						<label for="gotoProfileQuota">{t}Quota{/t}</label> 
 						<br>
 						<br>
 					</td>
@@ -76,12 +76,12 @@
 				<tr>
 					<td colspan=2>
 						<input type="checkbox" name="gotoProfileFlag_L" id="gotoProfileFlag_L" value="L" {$gotoProfileACL} {$gotoProfileFlag_LCHK}>
-						<LABEL for="gotoProfileFlag_L">{t}Resolution changeable on runtime{/t}</LABEL>
+						<label for="gotoProfileFlag_L">{t}Resolution changeable on runtime{/t}</label>
 					</td>
 				</tr>
 				<tr>
 					<td>
-						<LABEL for="gotoXResolution">{t}Resolution{/t}</LABEL>
+						<label for="gotoXResolution">{t}Resolution{/t}</label>
 					</td>
 					<td>
 						<select name="gotoXResolution" {$gotoXResolutionACL} id="gotoXResolution">
@@ -100,7 +100,7 @@
 <table summary="{t}Environment managment settings{/t}" width="100%">
   <tr>
    <td style="width:50%;border-right:1px solid #B0B0B0">
-	<h2><img alt="" src="images/fai_partitionTable.png" align="middle">&nbsp;<LABEL for="gotoShare">{t}Shares{/t}</LABEL></h2>
+	<h2><p class="center"><img class="center" alt="" src="images/fai_partitionTable.png" align="middle" />&nbsp;<label for="gotoShare">{t}Shares{/t}</label></p></h2>
 	<table summary="" style="width:100%">
 		<tr>
 			<td>
@@ -121,7 +121,7 @@
 	</table>
    </td>
    <td>
-	<h2><img alt="" src="images/fai_script.png" align="middle">&nbsp;<LABEL for="gotoLogonScript">{t}Logon scripts{/t}</LABEL></h2>
+	<h2><p class="center"><img class="center" alt="" src="images/fai_script.png" align="middle" />&nbsp;<label for="gotoLogonScript">{t}Logon scripts{/t}</label></p></h2>
 	<table summary="{t}Logon script management{/t}" style="width:100%">
 		<tr>
 			<td>
@@ -131,7 +131,7 @@
 				</select>
 	
 				<br>
-				<input type="submit" {$gotoLogonScriptACL} name="gotoLogonScriptNew"		value="{t}Add{/t}">
+				<input type="submit" {$gotoLogonScriptACL} name="gotoLogonScriptNew"	value="{t}Add{/t}">
 				<input type="submit" {$gotoLogonScriptACL} name="gotoLogonScriptDel" 	value="{t}Delete{/t}"> 
 				<input type="submit" {$gotoLogonScriptACL} name="gotoLogonScriptEdit" 	value="{t}Edit{/t}"> 
 			</td>
@@ -146,7 +146,7 @@
 <table summary="{t}Environment managment settings{/t}" width="100%">
   <tr>
    <td style="border-right:1px solid #B0B0B0; width:50%">
-	<h2><img alt="" src="images/hotplug.png" align="middle">&nbsp;<LABEL for="gotoHotplugDevice">{t}Hotplug devices{/t}</LABEL></h2>	
+	<h2><p class="center"><img alt="" src="images/hotplug.png" align="middle" class="center" />&nbsp;<label for="gotoHotplugDevice">{t}Hotplug devices{/t}</label></p></h2>	
 	<table style="width:100%" summary="{t}Hotplug device settings{/t}">
 		<tr>
 			<td>
@@ -165,7 +165,7 @@
 	</table>
    </td>
    <td>
-    <h2><img alt="" src="images/select_printer.png" align="middle">&nbsp;<LABEL for="gotoPrinter">{t}Printer{/t}</LABEL></h2>
+    <h2><p class="center"<img alt="" src="images/select_printer.png" align="middle" class="center" />&nbsp;<label for="gotoPrinter">{t}Printer{/t}</label></p></h2>
     <table style="width:100%" summary="{t}Printer settings{/t}">
 	<tr>
 	    <td>
diff --git a/plugins/personal/generic/generic.tpl b/plugins/personal/generic/generic.tpl
index 8d2bae472..6d18c916d 100644
--- a/plugins/personal/generic/generic.tpl
+++ b/plugins/personal/generic/generic.tpl
@@ -1,9 +1,9 @@
-<table summary="" 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">
 
  <!-- Headline container -->
  <tr>
-  <td colspan=4>
-   <h2><img alt="" align="middle" src="images/head.png"> {t}Personal information{/t}</h2>
+  <td colspan="4">
+   <h2><p class="center"><img alt="" align="middle" src="images/head.png" class="center"> {t}Personal information{/t}</p></h2>
   </td>
  </tr>
 
@@ -170,12 +170,12 @@
 
 <p class="seperator">&nbsp;</p>
 
-<table summary="" class="line" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
+<table summary="" class="line" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
 
  <!-- Headline container -->
  <tr>
-  <td colspan=3>
-   <h2><img alt="" align="middle" src="images/house.png"> {t}Organizational information{/t}</h2>
+  <td colspan="3">
+   <h2><p class="center"><img alt="" align="middle" src="images/house.png" class="center"> {t}Organizational information{/t}</p></h2>
   </td>
  </tr>
 
diff --git a/plugins/personal/mail/generic.tpl b/plugins/personal/mail/generic.tpl
index cd4da4ffa..43c92d712 100644
--- a/plugins/personal/mail/generic.tpl
+++ b/plugins/personal/mail/generic.tpl
@@ -1,14 +1,14 @@
-<table summary="" 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="width:50%; vertical-align:top;">
-   <h2><img alt="" align="middle" src="images/rightarrow.png"> {t}Generic{/t}</h2>
+   <h2><p class="center"><img class="center" alt="" align="middle" src="images/rightarrow.png" />&nbsp;{t}Generic{/t}</p></h2>
    <table summary="">
     <tr>
-     <td><LABEL for="mail">{t}Primary address{/t}</LABEL>{$must}</td>
+     <td><label for="mail">{t}Primary address{/t}</label>{$must}</td>
      <td><input id="mail" name="mail" size=35 maxlength=65 {$mailACL} value="{$mail}"></td>
     </tr>
     <tr>
-     <td><LABEL for="gosaMailServer">{t}Server{/t}</LABEL></td>
+     <td><label for="gosaMailServer">{t}Server{/t}</label></td>
      <td>
       <select size="1" id="gosaMailServer" name="gosaMailServer" {$gosaMailServerACL} title="{t}Specify the mail server where the user will be hosted on{/t}">
 		    {html_options values=$mailServers output=$mailServers selected=$gosaMailServer}
@@ -31,7 +31,7 @@
      </td>
     </tr>
     <tr>
-     <td><LABEL for="gosaMailQuota">{t}Quota size{/t}</LABEL></td>
+     <td><label for="gosaMailQuota">{t}Quota size{/t}</label></td>
      <td>
       <input id="gosaMailQuota" name="gosaMailQuota" size="6" align="middle" maxlength="30" {$gosaMailQuotaACL}
 		value="{$gosaMailQuota}"> KB
@@ -45,13 +45,13 @@
   </td>
 
   <td style="vertical-align:top;">
-   <h2><img alt="" align="middle" src="images/alternatemail.png"><LABEL for="alternates_list"> {t}Alternative addresses{/t}</LABEL></h2>
-   <select id="alternates_list" style="width:100%;height:100px;" name="alternates_list[]" size=15
+   <h2><p class="center"<img class="center" alt="" align="middle" src="images/alternatemail.png" /><label for="alternates_list"> {t}Alternative addresses{/t}</label></p></h2>
+   <select id="alternates_list" style="width:100%;height:100px;" name="alternates_list[]" size="15"
 	 multiple title="{t}List of alternative mail addresses{/t}">
             {html_options values=$gosaMailAlternateAddress output=$gosaMailAlternateAddress}
 			<option disabled>&nbsp;</option>
    </select>
-   <br>
+   <br />
    <input name="alternate_address" size=30 align="middle" maxlength="65" {$gosaMailAlternateAddressACL} value="">
    <input type=submit value="{t}Add{/t}" name="add_alternate"
 	{$gosaMailAlternateAddressACL}>&nbsp;
@@ -63,7 +63,7 @@
 
 <p class="seperator">&nbsp;</p>
 
-<h2><img alt="" align="middle" src="images/envelope.png"> {t}Mail options{/t}</h2>
+<h2><p class="center"><img class="center" alt="" align="middle" src="images/envelope.png" />&nbsp;{t}Mail options{/t}</p></h2>
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
  <tr style="padding-bottom:0px;">
   <td style="width:50%">
@@ -78,19 +78,19 @@
   </td>
   <td style="vertical-align:top;">
    <input type=checkbox name="use_spam_filter" value="1" {$use_spam_filter}
-	{$gosaSpamSortLevelACL} title="{t}Select if you want to filter this mails through spamassassin{/t}"> <LABEL for="gosaSpamSortLevel">{t}Move mails tagged with spam level greater than{/t}</LABEL>
+	{$gosaSpamSortLevelACL} title="{t}Select if you want to filter this mails through spamassassin{/t}"> <label for="gosaSpamSortLevel">{t}Move mails tagged with spam level greater than{/t}</label>
 	
    <select id="gosaSpamSortLevel" size="1" name="gosaSpamSortLevel" {$gosaSpamSortLevelACL} title="{t}Choose spam level - smaller values are more sensitive{/t}">
         {html_options values=$spamlevel output=$spamlevel selected=$gosaSpamSortLevel}
    </select>
-   <LABEL for="gosaSpamMailbox">{t}to folder{/t}</LABEL>
+   <label for="gosaSpamMailbox">{t}to folder{/t}</label>
    <select size="1" id="gosaSpamMailbox" name="gosaSpamMailbox" {$gosaSpamMailboxACL}>
         	{html_options values=$spambox output=$spambox selected=$gosaSpamMailbox}
 			<option disabled>&nbsp;</option>
    </select>
    <br>
    <input type=checkbox name="use_mailsize_limit" value="1" {$use_mailsize_limit}
-	{$gosaMailMaxSizeACL}> <LABEL for="gosaMailMaxSize">{t}Reject mails bigger than{/t}</LABEL> 
+	{$gosaMailMaxSizeACL}> <label for="gosaMailMaxSize">{t}Reject mails bigger than{/t}</label> 
    <input id="gosaMailMaxSize" name="gosaMailMaxSize" size=6 align="middle" maxlength="30" {$gosaMailMaxSizeACL}
 	value="{$gosaMailMaxSize}"> {t}MB{/t}
   </td>
@@ -98,7 +98,7 @@
  <tr>
   <td style="vertical-align:top; width:45%">
    <p style="margin-bottom:0px;">
-    <b><LABEL for="gosaVacationMessage">{t}Vacation message{/t}</LABEL></b>
+    <b><label for="gosaVacationMessage">{t}Vacation message{/t}</label></b>
    </p>
    <textarea id="gosaVacationMessage" style="width:99%; height:100px;" name="gosaVacationMessage" rows="4" cols="512"
 	{$gosaVacationMessageACL}>{$gosaVacationMessage}</textarea>
@@ -115,7 +115,7 @@
   </td>
   <td>
    <p style="margin-bottom:0px;">
-    <b><LABEL for="forwarder_list">{t}Forward messages to{/t}</LABEL></b>
+    <b><label for="forwarder_list">{t}Forward messages to{/t}</label></b>
    </p>
    <select id="gosaMailForwardingAddress" style="width:100%; height:100px;" name="forwarder_list[]" size=15 multiple>
 			{html_options values=$gosaMailForwardingAddress output=$gosaMailForwardingAddress selected=$template}        
@@ -136,9 +136,9 @@
 
 <p class="seperator">&nbsp;</p>
 
-<h2><img alt="" align="middle" src="images/false.png"> {t}Advanced mail options{/t}</h2>
+<h2><p class="center"><img class="center" alt="" align="middle" src="images/false.png" />&nbsp;{t}Advanced mail options{/t}</p></h2>
 
-<table summary="" 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>
    <input type=checkbox name="only_local" value="1" {$only_local} {$only_localACL} title="{t}Select if user can only send and receive inside his own domain{/t}">
diff --git a/plugins/personal/nagios/nagios.tpl b/plugins/personal/nagios/nagios.tpl
index 93319d650..814e416e5 100644
--- a/plugins/personal/nagios/nagios.tpl
+++ b/plugins/personal/nagios/nagios.tpl
@@ -1,20 +1,20 @@
-<table summary="" 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="width:50%; vertical-align:top;">
-   <h2><img alt="" align="middle" src="images/rightarrow.png"> {t}Nagios Account{/t}</h2>
+   <h2><p class="center"><img class="center" alt="" align="middle" src="images/rightarrow.png" />&nbsp;{t}Nagios Account{/t}</p></h2>
    <table summary="">
     <tr>
-     <td><LABEL for="NagiosAlias">{t}Alias{/t}</LABEL>{$must}</td>
+     <td><label for="NagiosAlias">{t}Alias{/t}</label>{$must}</td>
      <td><input id="NagiosAlias" name="NagiosAlias" size=25 maxlength=65 {$NagiosAliasACL} value="{$NagiosAlias}"></td>
     </tr>
 
     <tr>
-     <td><LABEL for="NagiosMail">{t}Mail address{/t}</LABEL>{$must}</td>
+     <td><label for="NagiosMail">{t}Mail address{/t}</label>{$must}</td>
      <td><input id="NagiosMail" name="NagiosMail" size=25 maxlength=65 {$NagiosMailACL} value="{$NagiosMail}"></td>
     </tr>
 
 	<tr>
-	<td><LABEL for="HostNotificationPeriod">{t}Host notification period{/t}</LABEL>{$must}</td>
+	<td><label for="HostNotificationPeriod">{t}Host notification period{/t}</label>{$must}</td>
 	<td><select name="HostNotificationPeriod" id="HostNotificationPeriod" {$HostNotificationPeriodACL}>
 	{html_options options=$HostNotificationPeriodValues values=$HostNotificationPeriodValues selected=$HostNotificationPeriod }
 	</select>
@@ -22,14 +22,14 @@
 	</tr>
 
 	<tr>
-	<td><LABEL for="ServiceNotificationPeriod">{t}Service notification period{/t}</LABEL>{$must}</td>
+	<td><label for="ServiceNotificationPeriod">{t}Service notification period{/t}</label>{$must}</td>
 	<td><select name="ServiceNotificationPeriod" id="ServiceNotificationPeriod" {$ServiceNotificationPeriodACL}>
 	{html_options options=$ServiceNotificationPeriodValues values=$ServiceNotificationPeriodValues selected=$ServiceNotificationPeriod}
 	</select>
 	</td>
 	</tr>
 	<tr>
-	<td><LABEL for="ServiceNotificationOptions">{t}Service notification options{/t}</LABEL>{$must}</td>
+	<td><label for="ServiceNotificationOptions">{t}Service notification options{/t}</label>{$must}</td>
 	<td><select name="ServiceNotificationOptions" id="ServiceNotificationOptions" {$ServiceNotificationOptionsACL}>
 	{html_options options=$ServiceNotificationOptionsValues values=$ServiceNotificationOptionsValues selected=$ServiceNotificationOptions}
 	</select>
@@ -38,23 +38,23 @@
 
 
 	<tr>
-	<td><LABEL for="HostNotificationOptions">{t}Host notification options{/t}</LABEL>{$must}</td>
+	<td><label for="HostNotificationOptions">{t}Host notification options{/t}</label>{$must}</td>
 	<td><select name="HostNotificationOptions" id="HostNotificationOptions" {$HostNotificationOptionsACL}>
 	{html_options options=$HostNotificationOptionsValues values=$HostNotificationOptionsValues selected=$HostNotificationOptions }
 	</select>
 	</td>
 	</tr>
     <tr>
-     <td><LABEL for="NagiosPager">{t}Pager{/t}</LABEL></td>
+     <td><label for="NagiosPager">{t}Pager{/t}</label></td>
      <td><input id="NagiosPager" name="NagiosPager" size=25 maxlength=65 {$NagiosPagerACL} value="{$NagiosPager}"></td>
     </tr>
 
     <tr>
-     <td><LABEL for="ServiceNotificationCommands">{t}Service notification commands{/t}</LABEL></td>
+     <td><label for="ServiceNotificationCommands">{t}Service notification commands{/t}</label></td>
      <td><input id="ServiceNotificationCommands" disabled name="ServiceNotificationCommands" size=25 maxlength=65 {$ServiceNotificationCommandsACL} value="{$ServiceNotificationCommands}"></td>
     </tr>
     <tr>
-     <td><LABEL for="HostNotificationCommands">{t}Host notification commands{/t}</LABEL></td>
+     <td><label for="HostNotificationCommands">{t}Host notification commands{/t}</label></td>
      <td><input id="HostNotificationCommands" disabled name="HostNotificationCommands" size=25 maxlength=65 {$HostNotificationCommandsACL} value="{$HostNotificationCommands}"></td>
     </tr>
 </table>
@@ -63,7 +63,7 @@
    &nbsp;
   </td>
 <td style="width:100%; vertical-align:top;">
-   <h2><img alt="" align="middle" src="images/rightarrow.png"> {t}Nagios authentification{/t}</h2>
+   <h2><p align="center"><img class="center" alt="" align="middle" src="images/rightarrow.png" />&nbsp;{t}Nagios authentification{/t}</p></h2>
    <table summary="">
 	<tr><td><input type="checkbox" name="AuthorizedSystemInformation" value="1" {$AuthorizedSystemInformationACL}  
 {$AuthorizedSystemInformationCHK}>{t}view system informations{/t}</td></tr>
diff --git a/plugins/personal/posix/generic.tpl b/plugins/personal/posix/generic.tpl
index 98c66e4c7..a01cd95c6 100644
--- a/plugins/personal/posix/generic.tpl
+++ b/plugins/personal/posix/generic.tpl
@@ -1,16 +1,16 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
  <tr>
   <td style="width:50%; vertical-align:top;">
-   <h2><img alt="" align="middle" src="images/rightarrow.png"> {t}Generic{/t}</h2>
+   <h2><p class="center"><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}Generic{/t}</p></h2>
    <table summary="">
     <tr>
-     <td><LABEL for="homeDirectory">{t}Home directory{/t}</LABEL>{$must}</td>
+     <td><label for="homeDirectory">{t}Home directory{/t}</label>{$must}</td>
      <td>
       <input id="homeDirectory" name="homeDirectory" size=40 maxlength=120 {$homeDirectoryACL} value="{$homeDirectory}">
      </td>
     </tr>
     <tr>
-     <td><LABEL for="loginShell">{t}Shell{/t}</LABEL></td>
+     <td><label for="loginShell">{t}Shell{/t}</label></td>
      <td>
       <select id="loginShell" size="1" name="loginShell" {$loginShellACL}>
        {html_options values=$shells output=$shells selected=$loginShell}
@@ -18,7 +18,7 @@
      </td>
     </tr>
     <tr>
-     <td><LABEL for="">{t}Primary group{/t}</LABEL></td>
+     <td><label for="">{t}Primary group{/t}</label></td>
      <td>
       <select id="primaryGroup" size="1" name="primaryGroup" {$gidNumberACL}>
        {html_options options=$secondaryGroups selected=$primaryGroup}
@@ -36,11 +36,11 @@
       <input id="force_ids" type=checkbox name="force_ids" value="1" {$force_ids} {$force_idsACL} onclick="changeState('uidNumber'); changeState('gidNumber');">
 					</td>
 					<td>
-      <LABEL for="force_ids">{t}Force UID/GID{/t}</LABEL>
+      <label for="force_ids">{t}Force UID/GID{/t}</label>
      </td>
 					<td style="width:20px;"></td>
 					<td>
-						<LABEL for="uidNumber">{t}UID{/t}</LABEL>
+						<label for="uidNumber">{t}UID{/t}</label>
 					</td>
 					<td>
 						<input id="uidNumber" name="uidNumber" size=5 maxlength=5 {$forceMode} {$uidNumberACL} value="{$uidNumber}">
@@ -49,7 +49,7 @@
 				<tr>
 					<td colspan="3"></td>
 					<td>
-						<LABEL for="gidNumber">{t}GID{/t}</LABEL>
+						<label for="gidNumber">{t}GID{/t}</label>
 					</td>
      <td>
 						<input id="gidNumber" name="gidNumber" size=5 maxlength=5 {$forceMode} {$gidNumberACL} value="{$gidNumber}">
@@ -61,7 +61,7 @@
     &nbsp;
   </td>
   <td style="vertical-align:top;">
-   <h2><img alt="" align="middle" src="images/members.png"> {t}Group membership{/t}</h2>
+   <h2><p class="center"><img alt="" class="center" align="middle" src="images/members.png" /> {t}Group membership{/t}</p></h2>
    {if $groups eq "too_many_for_nfs"}
     <b style="color:red">{t}(Warning: more than 16 groups are not supported by NFS!){/t}</b>
     <br>
@@ -81,14 +81,14 @@
 <table summary="" style="width:100% ; vertical-align:top; text-align:left;" cellpadding=0 border=0>
  <tr>
   <td style='width:50%;vertical-align:top'>
-   <h2><img alt="" align="middle" src="images/terminal_small.png"> {t}Account{/t}</h2>
+   <h2><p class="center"><img alt="" class="center" align="middle" src="images/terminal_small.png" /> {t}Account{/t}</p></h2>
    {include file="$pwmode.tpl"}
   </td>
   <td style="border-left:1px solid #A0A0A0">
     &nbsp;
   </td>
   <td style="vertical-align:top;">
-   <h2><img alt="" align="middle" src="images/closedlock.png" style="margin-bottom:10px;"> {t}System trust{/t}</h2>
+   <h2><p class="center"><img alt="" class="center" align="middle" src="images/closedlock.png" /> {t}System trust{/t}</p></h2>
     {t}Trust mode{/t}&nbsp;<select name="trustmode" id="trustmode" size=1 onchange="changeSelectState('trustmode', 'wslist'); changeSelectState('trustmode', 'add_ws'); changeSelectState('trustmode', 'del_ws');" {$trustmodeACL}>
       {html_options options=$trustmodes selected=$trustmode}
     </select>
diff --git a/plugins/personal/samba/samba2.tpl b/plugins/personal/samba/samba2.tpl
index bdbae4a06..dc30ae2c6 100644
--- a/plugins/personal/samba/samba2.tpl
+++ b/plugins/personal/samba/samba2.tpl
@@ -1,16 +1,16 @@
-<table summary="" 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><p class="center"><img class="center" alt="" align="middle" src="images/rightarrow.png" />&nbsp;{t}Generic{/t}</p></h2>
   </td>
  </tr>
  <tr>
   <td style="vertical-align:top;">
    <table summary="">
     <tr>
-     <td><LABEL for="smbHome">{t}Samba home{/t}</LABEL></td>
+     <td><label for="smbHome">{t}Samba home{/t}</label></td>
      <td>
       <input id="smbHome" name="smbHome" size=30 maxlength=60 {$smbHomeACL} value="{$smbHome}">
       <select size="1" name="homeDrive" {$homeDriveACL}>
@@ -27,13 +27,13 @@
   <td style="vertical-align:top;">
    <table summary="">
     <tr>
-     <td><LABEL for="scriptPath">{t}Script path{/t}</LABEL></td>
+     <td><label for="scriptPath">{t}Script path{/t}</label></td>
      <td>
       <input id="scriptPath" name="scriptPath" size=35 maxlength=60 {$scriptPathACL} value="{$scriptPath}">
      </td>
     </tr>
     <tr>
-     <td><LABEL for="profilePath">{t}Profile path{/t}</LABEL></td>
+     <td><label for="profilePath">{t}Profile path{/t}</label></td>
      <td>
       <input id="profilePath" name="profilePath" size=35 maxlength=60 {$profilePathACL} value="{$profilePath}">
      </td>
@@ -45,19 +45,19 @@
 
 <p class="seperator">&nbsp;</p>
 
-<h2><img  alt="" align="middle" src="images/certs.png"> {t}Access options{/t}</h2>
+<h2><p class="center"><img class="center" alt="" align="middle" src="images/certs.png" />&nbsp;{t}Access options{/t}</p></h2>
 
-<table summary="" 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%;">
    <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>
+   <label for="allow_pwchange">{t}Allow user to change password from client{/t}</label>
    <br>
    <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>
+   <label for="no_password_required">{t}Login from windows client requires no password{/t}</label>
    <br>
    <input id="temporary_disable" type=checkbox name="temporary_disable" value="1" {$flagsD} {$temporary_disableACL}>
-   <LABEL for="temporary_disable">{t}Temporary disable samba account{/t}</LABEL>
+   <label for="temporary_disable">{t}Temporary disable samba account{/t}</label>
    <br>
   </td>
   <td style="border-left:1px solid #A0A0A0">
@@ -65,7 +65,7 @@
   </td>
   <td style="vertical-align:top; width:50%">
    <input type=checkbox name="password_expires" value="1" {$flagsC} {$password_expiresACL}>
-   <LABEL for="day">{t}Password expires on{/t}</LABEL>
+   <label for="day">{t}Password expires on{/t}</label>
    <select id="day" name=day onChange="createResult(this.form,this.form.sambaPwdMustChange);" {$sambaPwdMustChangeACL}>
     {html_options values=$days output=$days selected=$day}
    </select>
diff --git a/plugins/personal/samba/samba3.tpl b/plugins/personal/samba/samba3.tpl
index c079647d9..7191386ee 100644
--- a/plugins/personal/samba/samba3.tpl
+++ b/plugins/personal/samba/samba3.tpl
@@ -1,16 +1,16 @@
-<table summary="" 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><p class="center"><img class="center" alt="" align="middle" src="images/rightarrow.png"/>&nbsp;{t}Generic{/t}</p></h2>
   </td>
  </tr>
  <tr>
   <td style="vertical-align:top;">
    <table summary="">
     <tr>
-     <td><LABEL for="sambaHomePath">{t}Home directory{/t}</LABEL></td>
+     <td><label for="sambaHomePath">{t}Home directory{/t}</label></td>
      <td>
       <input id="sambaHomePath" name="sambaHomePath" size=30 maxlength=60 {$sambaHomePathACL} value="{$sambaHomePath}">
       <select size="1" name="sambaHomeDrive" {$sambaHomeDriveACL}>
@@ -20,7 +20,7 @@
      </td>
     </tr>
     <tr>
-     <td><LABEL for="sambaDomainName">{t}Domain{/t}</LABEL></td>
+     <td><label for="sambaDomainName">{t}Domain{/t}</label></td>
      <td>
       <select id="sambaDomainName" size="1" name="sambaDomainName" {$sambaDomainNameACL}>
        {html_options values=$domains output=$domains selected=$sambaDomainName}
@@ -35,13 +35,13 @@
   <td style="vertical-align:top;">
    <table summary="">
     <tr>
-     <td><LABEL for="">{t}Script path{/t}</LABEL></td>
+     <td><label for="">{t}Script path{/t}</label></td>
      <td>
       <input id="sambaLogonScript" name="sambaLogonScript" size=35 maxlength=60 {$sambaLogonScriptACL} value="{$sambaLogonScript}">
      </td>
     </tr>
     <tr>
-     <td><LABEL for="">{t}Profile path{/t}</LABEL></td>
+     <td><label for="">{t}Profile path{/t}</label></td>
      <td>
       <input id="sambaProfilePath" name="sambaProfilePath" size=35 maxlength=60 {$sambaProfilePathACL} value="{$sambaProfilePath}">
      </td>
@@ -53,7 +53,7 @@
 
 <p class="seperator">&nbsp;</p>
 
-<h2><img alt="" align="middle" src="images/display.png"> {t}Terminal Server{/t}</h2>
+<h2><p class="center"><img class="center" alt="" align="middle" src="images/display.png" />&nbsp;{t}Terminal Server{/t}</p></h2>
 
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
  <tr>
@@ -82,7 +82,7 @@
    <i>{t}Allow login on terminal server{/t}</i>
    <table summary="">
     <tr>
-     <td><LABEL for="CtxWFHomeDir">{t}Home directory{/t}</LABEL></td>
+     <td><label for="CtxWFHomeDir">{t}Home directory{/t}</label></td>
      <td>
       <input id="CtxWFHomeDir" name="CtxWFHomeDir" size=30 maxlength=60 {$CtxWFHomeDirACL} value="{$CtxWFHomeDir}" {$tsloginstate}>
       <select size="1" id="CtxWFHomeDirDrive" name="CtxWFHomeDirDrive" {$CtxWFHomeDirDriveACL} {$tsloginstate}>
@@ -92,7 +92,7 @@
      </td>
     </tr>
     <tr>
-     <td><LABEL for="CtxWFProfilePath">{t}Profile path{/t}</LABEL></td>
+     <td><label for="CtxWFProfilePath">{t}Profile path{/t}</label></td>
      <td>
       <input id="CtxWFProfilePath" name="CtxWFProfilePath" size=35 maxlength=60 {$CtxWFProfilePathACL} value="{$CtxWFProfilePath}" {$tsloginstate}>
      </td>
@@ -107,13 +107,13 @@
    <i>{t}Inherit client config{/t}</i>
    <table summary="">
     <tr>
-     <td><LABEL for="CtxInitialProgram">{t}Initial program{/t}</LABEL></td>
+     <td><label for="CtxInitialProgram">{t}Initial program{/t}</label></td>
      <td>
       <input id="CtxInitialProgram" name="CtxInitialProgram" size=35 maxlength=60 {if $CtxInitialProgramACL==""}{$CtxInitialProgramMode}{/if} value="{$CtxInitialProgram}" {$CtxInitialProgramACL} {$tsloginstate} {$inheritstate}>
      </td>
     </tr>
     <tr>
-     <td><LABEL for="CtxWorkDirectory">{t}Working directory{/t}</LABEL></td>
+     <td><label for="CtxWorkDirectory">{t}Working directory{/t}</label></td>
      <td>
       <input id="CtxWorkDirectory" name="CtxWorkDirectory" size=35 maxlength=60 {if $CtxWorkDirectoryACL==""}{$CtxInitialProgramMode}{/if} value="{$CtxWorkDirectory}" {$CtxInitialProgramACL} {$tsloginstate} {$inheritstate}>
      </td>
@@ -133,7 +133,7 @@
     <tr>
      <td>
       <input id="CtxMaxConnectionTimeF" type=checkbox name="CtxMaxConnectionTimeF" value="1" {$CtxMaxConnectionTimeF} {$CtxMaxConnectionTimeACL} onclick="changeSubselectState('CtxMaxConnectionTimeF','CtxMaxConnectionTime')" {$tsloginstate}>
-      <LABEL for="CtxMaxConnectionTimeF">{t}Connection{/t}</LABEL>
+      <label for="CtxMaxConnectionTimeF">{t}Connection{/t}</label>
      </td>
      <td>
       <input name="CtxMaxConnectionTime" id="CtxMaxConnectionTime" size=5 maxlength=5 {if $CtxMaxConnectionTimeACL==""}{$CtxMaxConnectionTimeMode}{/if} value="{$CtxMaxConnectionTime}" {$CtxMaxConnectionTimeACL} {$tsloginstate}>
@@ -142,7 +142,7 @@
     <tr>
      <td>
       <input id="CtxMaxDisconnectionTimeF" type=checkbox name="CtxMaxDisconnectionTimeF" value="1" {$CtxMaxDisconnectionTimeF} {$CtxMaxDisconnectionTimeACL} onclick="changeState('CtxMaxDisconnectionTime')" {$tsloginstate}>
-      <LABEL for="CtxMaxDisconnectionTimeF">{t}Disconnection{/t}</LABEL>
+      <label for="CtxMaxDisconnectionTimeF">{t}Disconnection{/t}</label>
      </td>
      <td>
       <input name="CtxMaxDisconnectionTime" id="CtxMaxDisconnectionTime" size=5 maxlength=5 {if $CtxMaxDisconnectionTimeACL ==""}{$CtxMaxDisconnectionTimeMode}{/if} value="{$CtxMaxDisconnectionTime}" {$CtxMaxDisconnectionTimeACL} {$tsloginstate}>
@@ -151,7 +151,7 @@
     <tr>
      <td>
       <input id="CtxMaxIdleTimeF" type=checkbox name="CtxMaxIdleTimeF" value="1" {$CtxMaxIdleTimeF} {$CtxMaxIdleTimeACL} onclick="changeState('CtxMaxIdleTime')" {$tsloginstate}>
-      <LABEL for="CtxMaxIdleTimeF">{t}IDLE{/t}</LABEL>
+      <label for="CtxMaxIdleTimeF">{t}IDLE{/t}</label>
      </td>
      <td>
       <input name="CtxMaxIdleTime" id="CtxMaxIdleTime" size=5 maxlength=5 {if $CtxMaxIdleTimeACL==""}{$CtxMaxIdleTimeMode}{/if} value="{$CtxMaxIdleTime}" {$CtxMaxIdleTimeACL} {$tsloginstate}>
@@ -169,19 +169,19 @@
     <tr>
      <td>
       <input id="connectclientdrives" type=checkbox name="connectclientdrives" value="1" {$connectclientdrives} {$connectclientdrivesACL} {$tsloginstate}>
-      <LABEL for="connectclientdrives">{t}Connect client drives at logon{/t}</LABEL>
+      <label for="connectclientdrives">{t}Connect client drives at logon{/t}</label>
      </td>
     </tr>
     <tr>
      <td>
       <input id="connectclientprinters" type=checkbox name="connectclientprinters" value="1" {$connectclientprinters} {$connectclientprintersACL} {$tsloginstate}>
-      <LABEL for="connectclientprinters">{t}Connect client printers at logon{/t}</LABEL>
+      <label for="connectclientprinters">{t}Connect client printers at logon{/t}</label>
      </td>
     </tr>
     <tr>
      <td>
       <input id="defaultprinter" type=checkbox name="defaultprinter" value="1" {$defaultprinter} {$defaultprinterACL} {$tsloginstate}>
-      <LABEL for="defaultprinter">{t}Default to main client printer{/t}</LABEL>
+      <label for="defaultprinter">{t}Default to main client printer{/t}</label>
      </td>
     </tr>
    </table>
@@ -195,7 +195,7 @@
    <table summary="">
     <tr>
      <td>
-      <LABEL for="shadow">{t}Shadowing{/t}</LABEL>
+      <label for="shadow">{t}Shadowing{/t}</label>
      </td>
      <td>
       <select id="shadow" size="1" name="shadow" {$shadowACL} {$tsloginstate}>
@@ -204,7 +204,7 @@
      </td>
     </tr>
     <tr>
-     <td><LABEL for="brokenconn">{t}On broken or timed out{/t}</LABEL></td>
+     <td><label for="brokenconn">{t}On broken or timed out{/t}</label></td>
      <td>
       <select id="brokenconn" size="1" name="brokenconn" {$brokenconnACL} {$tsloginstate}>
        {html_options options=$brokenconn selected=$brokenconnmode}
@@ -212,7 +212,7 @@
      </td>
     </tr>
     <tr>
-     <td><LABEL for="reconn">{t}Reconnect if disconnected{/t}</LABEL></td>
+     <td><label for="reconn">{t}Reconnect if disconnected{/t}</label></td>
      <td>
       <select id="reconn" size="1" name="reconn" {$reconnACL} {$tsloginstate}>
        {html_options options=$reconn selected=$reconnmode}
@@ -227,22 +227,22 @@
 
 <p class="seperator">&nbsp;</p>
 
-<h2><img alt="" align="middle" src="images/certs.png"> {t}Access options{/t}</h2>
+<h2><p class="center"><img class="center" alt="" align="middle" src="images/certs.png" />&nbsp;{t}Access options{/t}</p></h2>
 
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
  <tr>
   <td style="width:50%; vertical-align:top;">
    <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>
+   <label for="allow_pwchange">{t}Allow user to change password from client{/t}</label>
    <br>
    <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>
+   <label for="no_password_required">{t}Login from windows client requires no password{/t}</label>
    <br>
    <input id="temporary_disable" type=checkbox name="temporary_disable" value="1" {$flagsD} {$temporary_disableACL}>
-   <LABEL for="temporary_disable">{t}Lock samba account{/t}</LABEL>
+   <label for="temporary_disable">{t}Lock samba account{/t}</label>
    <br>
    <input id="password_expires" type=checkbox name="password_expires" value="1" {$flagsC} {$password_expiresACL}>
-   <LABEL for="password_expires">{t}Password expires on{/t}</LABEL>
+   <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>
@@ -254,7 +254,7 @@
    </select>
    <br>
    <input id="logon_time_set" type=checkbox name="logon_time_set" value="1" {$flagsT} {$logon_time_setACL}>
-   <LABEL for="logon_time_set">{t}Limit Logon Time{/t}</LABEL>
+   <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>
@@ -266,7 +266,7 @@
    </select>
    <br>
    <input id="logoff_time_set" type=checkbox name="logoff_time_set" value="1" {$flagsO} {$logoff_time_setACL}>
-   <LABEL for="logoff_time_set">{t}Limit Logoff Time{/t}</LABEL>
+   <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>
@@ -278,7 +278,7 @@
    </select>
    <br>
    <input id="kickoff_time_set" type=checkbox name="kickoff_time_set" value="1" {$flagsK} {$kickoff_time_setACL}>
-   <LABEL for="kickoff_time_set">{t}Account expires after{/t}</LABEL>
+   <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>
@@ -298,7 +298,7 @@
    &nbsp;
   </td>
   <td style="vertical-align:top;">
-   <LABEL for="workstation_list">{t}Allow connection from these workstations only{/t}</LABEL>
+   <label for="workstation_list">{t}Allow connection from these workstations only{/t}</label>
    <br>
    <select id="workstation_list" style="width:100%;" name="workstation_list[]" size=10 multiple {$sambaUserWorkstationACL}>
     {html_options values=$workstations output=$workstations}
diff --git a/plugins/personal/samba/samba3_workstations.tpl b/plugins/personal/samba/samba3_workstations.tpl
index 0bb0e3fee..52bb67994 100644
--- a/plugins/personal/samba/samba3_workstations.tpl
+++ b/plugins/personal/samba/samba3_workstations.tpl
@@ -1,9 +1,9 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
+<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4">
 <tr>
   <td style="vertical-align:top;width:600px">
    <div class="contentboxh" style="height:20px;">
     <p class="contentboxh" style="font-size:12px">
-     <b><LABEL for="wslist">{t}Select workstations to add{/t}</LABEL> {$hint}</b><br>
+     <b><label for="wslist">{t}Select workstations to add{/t}</label> {$hint}</b><br />
     </p>
    </div>
    <div class="contentboxb">
-- 
2.30.2