X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fservkolab.tpl;h=c43aa90c1c154f6865fd1fcfcfaca2d5bdf3f251;hb=38e36135b451936d249b671857b133a7d55b7360;hp=01b133f9c7a3109df90aae3d90418696b753f716;hpb=0020ad2e0a158e8580ac1b450e0aa11ced1d956f;p=gosa.git

diff --git a/plugins/admin/systems/servkolab.tpl b/plugins/admin/systems/servkolab.tpl
index 01b133f9c..c43aa90c1 100644
--- a/plugins/admin/systems/servkolab.tpl
+++ b/plugins/admin/systems/servkolab.tpl
@@ -1,73 +1,73 @@
-<table style="width:100%">
+<table summary="" style="width:100%">
  <tr>
   <td style="vertical-align:top; border-right:1px solid #A0A0A0; padding-right:5px;" width="50%">
 
-   <table>
+   <table summary="">
     <tr>
 	 <td colspan="2"><b>{t}Services{/t}</b></td>
 	</tr>
 	<tr>
 		<td>
-			<input name="cyrus_pop3" value="1" type="checkbox" {$cyrus_pop3Check}>
+			<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}>
+            <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}>
+            <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}>
+            <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}>
+            <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}>
+            <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}>
+            <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}>
+			<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>
@@ -75,18 +75,15 @@
    <p class="seperator">&nbsp;</p>
    <br>
 
-   <table>
+   <table summary="">
     <tr>
-		<td colspan="2"> 
+		<td> 
 			<b>{t}Quota settings{/t}</b>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<input name="cyrus_quotawarn" value="{$cyrus_quotawarn}" type="text" maxlength="2" size="3">%
-		</td>
-		<td>
-			Percentage to warn users
+			{$quotastr}
 		</td>
 	</tr>
    </table>
@@ -94,7 +91,7 @@
   </td>
   <td style="vertical-align:top" width="50%">
 
-   <table>
+   <table summary="">
     <tr>
         <td colspan="2">
             <b>{t}Free/Busy settings{/t}</b>
@@ -102,20 +99,19 @@
     </tr>
     <tr>
         <td>
-            <input name="apache_allow_unauthenticated_fb" value="1" type="checkbox" {$apache_allow_unauthenticated_fbCheck}> {t}Allow unauthenticated downloading of Free/Busy information{/t}
+            <input name="apache_allow_unauthenticated_fb" value="1" type="checkbox" {$apache_allow_unauthenticated_fbCheck} {$apache_allow_unauthenticated_fbACL}> {t}Allow unauthenticated downloading of Free/Busy information{/t}
         </td>
 	 </tr>
 	 <tr>
         <td>
-        	<input name="kolabFreeBusyFuture" value="{$kolabFreeBusyFuture}" type="text" maxlength="2" size="3">
-			When creating free/busy lists, include data from x days in the past
-		</td>
+		{$fbfuture}
+	</td>
      </tr>
    </table>
 
 <p class="seperator">&nbsp;</p>
 <br>
-   <table>
+   <table summary="">
     <tr>
         <td>
         	<b>{t}SMTP privileged networks{/t}</b>
@@ -123,8 +119,10 @@
     </tr>
     <tr>
 	  <td>
-	    {t}Hosts/networks allowed to relay{/t}&nbsp;
-        <input name="postfix_mynetworks" size="35" maxlength="120" value="{$postfix_mynetworks}" 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>
      </tr>
    </table>
@@ -134,7 +132,7 @@
 <br>
 
 
-   <table>
+   <table summary="">
     <tr>
         <td>
         	<b>{t}SMTP smarthost/relayhost{/t}</b>
@@ -142,14 +140,14 @@
     </tr>
     <tr>
         <td>
-            <input name="" value="1" type="checkbox" >
-			{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}" 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>
@@ -159,7 +157,7 @@
 <br>
 
 
-   <table>
+   <table summary="">
     <tr>
         <td>
         	<b>{t}Accept Internet Mail{/t}</b>
@@ -167,8 +165,8 @@
     </tr>
     <tr>
         <td>
-            <input name="" value="1" type="checkbox" >
-        	{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>
@@ -177,3 +175,5 @@
   </td>
  </tr>
 </table>
+
+<input type="hidden" name="kolabtab">