From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 19 May 2005 11:12:30 +0000 (+0000)
Subject: Updated layout - it's not complete yet, though
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c5e8df3e584f692da6d8af94e81183119a364c11;p=gosa.git

Updated layout - it's not complete yet, though


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

diff --git a/plugins/admin/systems/servkolab.tpl b/plugins/admin/systems/servkolab.tpl
index a68749a10..78d29d4f5 100644
--- a/plugins/admin/systems/servkolab.tpl
+++ b/plugins/admin/systems/servkolab.tpl
@@ -11,7 +11,7 @@
 			<input name="cyrus_pop3" value="1" type="checkbox" {$cyrus_pop3Check}>
 		</td>
 		<td>
-			POP3 Service  	
+			{t}POP3 service{/t}
 		</td>
 	</tr>
 	<tr>
@@ -19,7 +19,7 @@
             <input name="cyrus_pop3s" value="1" type="checkbox" {$cyrus_pop3sCheck}>
         </td>
 		<td>
-			POP3/SSL service (TCP port 995) 	
+			{t}POP3/SSL service{/t}
         </td>
     </tr>
     <tr>
@@ -27,7 +27,7 @@
             <input name="cyrus_imap" value="1" type="checkbox" {$cyrus_imapCheck}>
         </td>
         <td>
-			IMAP Service 	
+			{t}IMAP service{/t}
         </td>
     </tr>
     <tr>
@@ -35,7 +35,7 @@
             <input name="cyrus_imaps" value="1" type="checkbox" {$cyrus_imapsCheck}>
         </td>
         <td>
-			IMAP/SSL Service (TCP port 993) 	
+			{t}IMAP/SSL service{/t}
         </td>
     </tr>
     <tr>
@@ -43,7 +43,7 @@
             <input name="cyrus_sieve" value="1" type="checkbox" {$cyrus_sieveCheck}>
         </td>
         <td>
-			Sieve service (TCP port 2000) 	
+			{t}Sieve service{/t}
         </td>
     </tr>
     <tr>
@@ -51,7 +51,7 @@
             <input name="proftpd_ftp" value="1" type="checkbox" {$proftpd_ftpCheck}>
         </td>	
         <td>
-			FTP FreeBusy Service (Legacy, not interoperable with Kolab2 FreeBusy) 	
+			{t}FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy){/t}
         </td>
     </tr>
     <tr>
@@ -59,7 +59,7 @@
             <input name="apache_http" value="1" type="checkbox" {$apache_httpCheck}>
         </td>
         <td>
-			HTTP FreeBusy Service (Legacy) 	
+			{t}HTTP FreeBusy service (legacy){/t}
         </td>
     </tr>
     <tr>
@@ -67,41 +67,13 @@
             <input name="postfix_enable_virus_scan" value="1" type="checkbox" {$postfix_enable_virus_scanCheck}>
         </td>
         <td>
-			Amavis Email Scanning (Virus/Spam)
+			{t}Amavis email scanning (virus/spam){/t}
 		</td>
 	</tr>
    </table>
 
-
-
-
-<p class="seperator">&nbsp;</p>
-<br>
-
-	
-   <table>
-	<tr>
-		<td colspan="2" >
-			<b>{t}Kolab Hosts{/t}</b>
-		</td>
-	</tr>
-    <tr>
-     <td>
-        <select style="width:350px;" size="6"  name="kolabHost">
-            {html_options values=$kolabHost output=$kolabHost}
-        </select>
-    <br>
-        <input type="text"      name="NewkolabHost">
-        <input type="submit"    value="{t}Add{/t}"      name="NewHost">
-        <input type="submit"    value="{t}Delete{/t}"   name="DelHost">
-    </td>
-	</tr>
-	</table>	
-
-
-  </td>
-  <td style="vertical-align:top" width="50%">
-
+   <p class="seperator">&nbsp;</p>
+   <br>
 
    <table>
     <tr>
@@ -119,10 +91,8 @@
 	</tr>
    </table>
   
-
-<p class="seperator">&nbsp;</p>
-<br>
-
+  </td>
+  <td style="vertical-align:top" width="50%">
 
    <table>
     <tr>
@@ -132,41 +102,30 @@
     </tr>
     <tr>
         <td>
-            <input name="apache_allow_unauthenticated_fb" value="1" type="checkbox" {$apache_allow_unauthenticated_fbCheck}>
-        </td>
-        <td>
-            Allow unauthenticated downloading of Free/Busy information 
+            <input name="apache_allow_unauthenticated_fb" value="1" type="checkbox" {$apache_allow_unauthenticated_fbCheck}> {t}Allow unauthenticated downloading of Free/Busy information{/t}
         </td>
 	 </tr>
 	 <tr>
         <td>
         	<input name="" value="" type="text" maxlength="2" size="3">
-		</td>
-        <td>
 			When creating free/busy lists, include data from x days in the past
 		</td>
      </tr>
-
    </table>
 
-
 <p class="seperator">&nbsp;</p>
 <br>
-
-
    <table>
     <tr>
-        <td colspan="2">
-        	<b>{t}Privileged Networks{/t}</b>
+        <td>
+        	<b>{t}SMTP privileged networks{/t}</b>
 		</td>
     </tr>
     <tr>
-        <td>
-            <input name="postfix_mynetworks" value="{$postfix_mynetworks}" type="text">
-        </td>
-        <td>
-			Networks allowed to relay and send mail through unauthenticated SMTP connections to the Kolab server (comma separated networks in x.x.x.x/y format)
-		</td>
+	  <td>
+	    {t}Hosts/networks allowed to relay{/t}&nbsp;
+        <input name="postfix_mynetworks" size="35" maxlength="120" value="{$postfix_mynetworks}" type="text">
+	</td>
      </tr>
    </table>
 
@@ -177,26 +136,22 @@
 
    <table>
     <tr>
-        <td colspan="2">
-        	<b>{t}SMTP "smarthost/relayhost"{/t}</b>
+        <td>
+        	<b>{t}SMTP smarthost/relayhost{/t}</b>
 		</td>
     </tr>
-	<tr>	
-		<td>
-			<input name="postfix_relayhost" value="{$postfix_relayhost}" type="text">
-		</td>
-		<td>
-			Smarthost to use to send outgoing mail (host.domain.tld). Leave empty for no relayhost.
-		</td>
-	</tr>
     <tr>
         <td>
             <input name="" value="1" type="checkbox" >
-        </td>
-        <td>
-			Enable MX lookup for relayhost (if in doubt, leave it off)
+			{t}Enable MX lookup for relayhost{/t}
 		</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">
+		</td>
+	</tr>
    </table>
 
 
@@ -206,26 +161,19 @@
 
    <table>
     <tr>
-        <td colspan="2">
+        <td>
         	<b>{t}Accept Internet Mail{/t}</b>
 		</td>
     </tr>
     <tr>
         <td>
             <input name="" value="1" type="checkbox" >
-        </td>
-        <td>
-        	Accept mail from other domains over non-authenticated SMTP. This must be enabled if you want to use the Kolab server to receive mail from other internet domains.
+        	{t}Accept mail from other domains over non-authenticated SMTP{/t}
 		</td>
      </tr>
    </table>
 
 
-
-
-
-
-
   </td>
  </tr>
 </table>