X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fadmin%2Fsystems%2Fservkolab.tpl;h=ec83b7801ca6feca72f58a33c67466077bc0d96a;hb=6ae7a3503964fb97587cf21b9c1b4276b9db23fc;hp=df206561c33a4fa1d89d4e50ff6c497553072a8c;hpb=59705031adc1505aab0ff75f4084b0211c6f2373;p=gosa.git

diff --git a/plugins/admin/systems/servkolab.tpl b/plugins/admin/systems/servkolab.tpl
index df206561c..ec83b7801 100644
--- a/plugins/admin/systems/servkolab.tpl
+++ b/plugins/admin/systems/servkolab.tpl
@@ -1,73 +1,121 @@
-<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>
+{render acl=$postfixmydomainACL}
+			<input type="text" name="postfix_mydomain" value="{$postfix_mydomain}">
+{/render}
+		</td>
+	</tr>
+	<tr>
+		<td>{t}Postfix mydestination{/t}
+		</td>
+		<td>
+{render acl=$postfixmydestinationACL}
+			<input type="text" name="postfix_mydestination" value="{$postfix_mydestination}">
+{/render}
+		</td>
+	</tr>
+	<tr>
+		<td>{t}Cyrus admins{/t}
+		</td>
+		<td>
+{render acl=$cyrusadminsACL}
+			<input type="text" name="cyrus_admins" value="{$cyrus_admins}">
+{/render}
+		</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}>
+{render acl=$cyruspop3ACL}
+			<input id="cyrus_pop3" name="cyrus_pop3" value="1" type="checkbox" {$cyrus_pop3Check}>
+{/render}
 		</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}>
+{render acl=$cyruspop3sACL}
+            <input id="cyrus_pop3s" name="cyrus_pop3s" value="1" type="checkbox" {$cyrus_pop3sCheck}>
+{/render}
         </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}>
+{render acl=$cyrusimapACL}
+            <input id="cyrus_imap" name="cyrus_imap" value="1" type="checkbox" {$cyrus_imapCheck}>
+{/render}
         </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}>
+{render acl=$cyrusimapsACL}
+            <input id="cyrus_imaps" name="cyrus_imaps" value="1" type="checkbox" {$cyrus_imapsCheck}>
+{/render}
         </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}>
+{render acl=$cyrussieveACL}
+            <input id="cyrus_sieve" name="cyrus_sieve" value="1" type="checkbox" {$cyrus_sieveCheck}>
+{/render}
         </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}>
+{render acl=$proftpdftpACL}
+            <input id="proftpd_ftp" name="proftpd_ftp" value="1" type="checkbox" {$proftpd_ftpCheck}>
+{/render}
         </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}>
+{render acl=$apachehttpACL}
+            <input id="apache_http" name="apache_http" value="1" type="checkbox" {$apache_httpCheck}>
+{/render}
         </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}>
+{render acl=$postfixenablevirusscanACL}
+			<input id="postfix_enable_virus_scan" name="postfix_enable_virus_scan" value="1" type="checkbox" {$postfix_enable_virus_scanCheck}>
+{/render}
         </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,7 +123,7 @@
    <p class="seperator">&nbsp;</p>
    <br>
 
-   <table>
+   <table summary="">
     <tr>
 		<td> 
 			<b>{t}Quota settings{/t}</b>
@@ -83,7 +131,9 @@
 	</tr>
 	<tr>
 		<td>
+{render acl=$cyrusquotawarnACL}
 			{$quotastr}
+{/render}
 		</td>
 	</tr>
    </table>
@@ -91,7 +141,7 @@
   </td>
   <td style="vertical-align:top" width="50%">
 
-   <table>
+   <table summary="">
     <tr>
         <td colspan="2">
             <b>{t}Free/Busy settings{/t}</b>
@@ -99,19 +149,23 @@
     </tr>
     <tr>
         <td>
-            <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}
+{render acl=$apacheallowunauthenticatedfbACL}
+            <input name="apache_allow_unauthenticated_fb" value="1" type="checkbox" {$apache_allow_unauthenticated_fbCheck}> {t}Allow unauthenticated downloading of Free/Busy information{/t}
+{/render}
         </td>
 	 </tr>
 	 <tr>
         <td>
+{render acl=$kolabFreeBusyFutureACL}
 		{$fbfuture}
+{/render}
 	</td>
      </tr>
    </table>
 
 <p class="seperator">&nbsp;</p>
 <br>
-   <table>
+   <table summary="">
     <tr>
         <td>
         	<b>{t}SMTP privileged networks{/t}</b>
@@ -119,8 +173,12 @@
     </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>
+{render acl=$postfixmynetworksACL}
+        <input id="postfix_mynetworks" name="postfix_mynetworks" size="60" maxlength="220" value="{$postfix_mynetworks}" type="text">
+{/render}
+		<br>
+		( {t}Enter multiple values, seperated with{/t} , )
 	</td>
      </tr>
    </table>
@@ -130,7 +188,7 @@
 <br>
 
 
-   <table>
+   <table summary="">
     <tr>
         <td>
         	<b>{t}SMTP smarthost/relayhost{/t}</b>
@@ -138,14 +196,18 @@
     </tr>
     <tr>
         <td>
-            <input name="RelayMxSupport" value="1" type="checkbox" {$RelayMxSupportCheck} {$postfix_relayhostACL}>
-			{t}Enable MX lookup for relayhost{/t}
+{render acl=$postfixrelayhostACL}
+            <input id="RelayMxSupport" name="RelayMxSupport" value="1" type="checkbox" {$RelayMxSupportCheck}>
+{/render}
+			<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;
+{render acl=$postfixrelayhostACL}
+			<input id="postfix_relayhost" name="postfix_relayhost" size="35" maxlength="120" value="{$postfix_relayhost}" type="text">
+{/render}
 		</td>
 	</tr>
    </table>
@@ -155,7 +217,7 @@
 <br>
 
 
-   <table>
+   <table summary="">
     <tr>
         <td>
         	<b>{t}Accept Internet Mail{/t}</b>
@@ -163,8 +225,10 @@
     </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}
+{render acl=$postfixallowunauthenticatedACL}
+            <input id="postfix_allow_unauthenticated" name="postfix_allow_unauthenticated" value="1" type="checkbox" {$postfix_allow_unauthenticatedCheck}>
+{/render}
+        	<LABEL for="postfix_allow_unauthenticated">{t}Accept mail from other domains over non-authenticated SMTP{/t}</LABEL>
 		</td>
      </tr>
    </table>
@@ -173,3 +237,13 @@
   </td>
  </tr>
 </table>
+
+<input type="hidden" name="kolabtab">
+
+<p class="seperator">&nbsp;</p>
+<div style="width:100%; text-align:right;padding-top:10px;padding-bottom:3px;">
+    <input type='submit' name='SaveService' value='{t}Save{/t}'>
+    &nbsp;
+    <input type='submit' name='CancelService' value='{t}Cancel{/t}'>
+</div>
+