X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fservkolab.tpl;h=57231d2fa4618c26e7d54ca809887620232c7637;hb=7f51b7c557fe5fb3c73b5bde15856fbfdb08efbb;hp=7aca512311397ef26078d775c4f401919d720af4;hpb=c3e79a40de16c90069c620dc6447df2655f2371f;p=gosa.git

diff --git a/plugins/admin/systems/servkolab.tpl b/plugins/admin/systems/servkolab.tpl
index 7aca51231..57231d2fa 100644
--- a/plugins/admin/systems/servkolab.tpl
+++ b/plugins/admin/systems/servkolab.tpl
@@ -1,73 +1,99 @@
-<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}Generic{/t}</b></td>
+	</tr>
+	<tr>
+		<td>{t}Postfix mydomain{/t}
+		</td>
+		<td>
+			<input type="text" name="postfix_mydomain" value="{$postfix_mydomain}" {$postfix_mydomainACL}>
+		</td>
+	</tr>
+	<tr>
+		<td>{t}Postfix mydestination{/t}
+		</td>
+		<td>
+			<input type="text" name="postfix_mydestination" value="{$postfix_mydestination}" {$postfix_mydestinationACL}>
+		</td>
+	</tr>
+	<tr>
+		<td>{t}Cyrus admins{/t}
+		</td>
+		<td>
+			<input type="text" name="cyrus_admins" value="{$cyrus_admins}" {$cyrus_adminsACL}>
+		</td>
+	</tr>
+   </table>	
+   <p class="seperator" >&nbsp;</p>
+   <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} {$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>
@@ -75,19 +101,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="3" size="4" {$cyrus_quotawarnACL}>%
-
-		</td>
-		<td>
-			Percentage to warn users
+			{$quotastr}
 		</td>
 	</tr>
    </table>
@@ -95,7 +117,7 @@
   </td>
   <td style="vertical-align:top" width="50%">
 
-   <table>
+   <table summary="">
     <tr>
         <td colspan="2">
             <b>{t}Free/Busy settings{/t}</b>
@@ -108,15 +130,14 @@
 	 </tr>
 	 <tr>
         <td>
-        	<input name="kolabFreeBusyFuture" value="{$kolabFreeBusyFuture}" {$kolabFreeBusyFutureACL} type="text" maxlength="3" size="4">
-			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>
@@ -124,8 +145,10 @@
     </tr>
     <tr>
 	  <td>
-	    {t}Hosts/networks allowed to relay{/t}&nbsp;
-        <input name="postfix_mynetworks" size="35" maxlength="120" 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>
      </tr>
    </table>
@@ -135,7 +158,7 @@
 <br>
 
 
-   <table>
+   <table summary="">
     <tr>
         <td>
         	<b>{t}SMTP smarthost/relayhost{/t}</b>
@@ -143,14 +166,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>
@@ -160,7 +183,7 @@
 <br>
 
 
-   <table>
+   <table summary="">
     <tr>
         <td>
         	<b>{t}Accept Internet Mail{/t}</b>
@@ -168,8 +191,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>
@@ -178,3 +201,5 @@
   </td>
  </tr>
 </table>
+
+<input type="hidden" name="kolabtab">