X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2FgoImapServer.tpl;h=17c40092dc0a9029953edd93eae11e8a018ce055;hb=d6a17677f5553b6ccef1e49bf600d67e02c2773d;hp=41b6331ab73ae63b605c25b7f237a81c82f55213;hpb=c815d75c2305b6174ab257590e945423e2f2c9bf;p=gosa.git

diff --git a/plugins/admin/systems/goImapServer.tpl b/plugins/admin/systems/goImapServer.tpl
index 41b6331ab..17c40092d 100644
--- a/plugins/admin/systems/goImapServer.tpl
+++ b/plugins/admin/systems/goImapServer.tpl
@@ -1,37 +1,51 @@
-<b>{t}Generic{/t}</b>
-<br>
+<h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}Generic{/t}</h2>
 <table width="100%">
 	<tr>
 		<td style='width:50%;'>
 			<table summary="">
 				<tr>
-					<td>{t}Server identifier{/t}
+					<td>{t}Server identifier{/t}{$must}
 					</td>
-					<td><input name="goImapName" id="goImapName" size=40 maxlength=60 {$goImapNameACL} value="{$goImapName}" >
+					<td>
+{render acl=$goImapNameACL}
+						<input name="goImapName" id="goImapName" size=40 maxlength=60 value="{$goImapName}" >
+{/render}
 					</td>
 				</tr>
 				<tr>
-					<td>{t}Connect URL{/t}
+					<td>{t}Connect URL{/t}{$must}
 					</td>
-					<td><input name="goImapConnect" id="goImapConnect" size=40 maxlength=60 {$goImapConnectACL} value="{$goImapConnect}" >
+					<td>
+{render acl=$goImapConnectACL}
+						<input name="goImapConnect" id="goImapConnect" size=40 maxlength=60 value="{$goImapConnect}" >
+{/render}
 					</td>
 				</tr>
 				<tr>
-					<td>{t}Admin user{/t}
+					<td>{t}Admin user{/t}{$must}
 					</td>
-					<td><input name="goImapAdmin" id="goImapAdmin" size=30 maxlength=60 {$goImapAdminACL} value="{$goImapAdmin}" >
+					<td>
+{render acl=$goImapAdminACL}
+						<input name="goImapAdmin" id="goImapAdmin" size=30 maxlength=60 value="{$goImapAdmin}" >
+{/render}
 					</td>
 				</tr>
 				<tr>
-					<td>{t}Password{/t}
+					<td>{t}Password{/t}{$must}
 					</td>
-					<td><input type=password name="goImapPassword" id="goImapPassword" size=30 maxlength=60 {$goImapPasswordACL} value="{$goImapPassword}" >
+					<td>
+{render acl=$goImapPasswordACL}
+					<input type=password name="goImapPassword" id="goImapPassword" size=30 maxlength=60 value="{$goImapPassword}" >
+{/render}
 					</td>
 				</tr>
 				<tr>
-					<td>{t}Sieve port{/t}
+					<td>{t}Sieve port{/t}{$must}
 					</td>
-					<td><input name="goImapSievePort" id="goImapSievePort" size=10 maxlength=30 {$goImapSievePortACL} value="{$goImapSievePort}">
+					<td>
+{render acl=$goImapSievePortACL}
+						<input name="goImapSievePort" id="goImapSievePort" size=10 maxlength=30 value="{$goImapSievePort}">
+{/render}
 					</td>
 				</tr>
 			</table>
@@ -39,31 +53,39 @@
 		<td style="border-left:1px solid #A0A0A0;vertical-align:top;">
 			<table>
 				<tr>
-					<td>{t}Start IMAP service{/t}
-					</td>
 					<td>
-						<input type='checkbox' name='cyrusImap' value=1 {if $cyrusImap} checked {/if} {$cyrusImapACL}> 
+{render acl=$cyrusImapACL}
+						<input type='checkbox' name='cyrusImap' value=1 {if $cyrusImap} checked {/if} > 
+{/render}
+					</td>
+					<td>{t}Start IMAP service{/t}
 					</td>
 				</tr>
 				<tr>
-					<td>{t}Start IMAP SSL service{/t}
-					</td>
 					<td>
-						<input type='checkbox' name='cyrusImapSSL' value=1 {if $cyrusImapSSL} checked {/if} {$cyrusImapSSLACL}> 
+{render acl=$cyrusImapSSLACL}
+						<input type='checkbox' name='cyrusImapSSL' value=1 {if $cyrusImapSSL} checked {/if}> 
+{/render}
+					</td>
+					<td>{t}Start IMAP SSL service{/t}
 					</td>
 				</tr>
 				<tr>
-					<td>{t}Start POP3 service{/t}
-					</td>
 					<td>
-						<input type='checkbox' name='cyrusPop3' value=1 {if $cyrusPop3} checked {/if} {$cyrusPop3ACL}> 
+{render acl=$cyrusPop3ACL}
+						<input type='checkbox' name='cyrusPop3' value=1 {if $cyrusPop3} checked {/if} > 
+{/render}
+					</td>
+					<td>{t}Start POP3 service{/t}
 					</td>
 				</tr>
 				<tr>
-					<td>{t}Start POP3 SSL service{/t}
-					</td>
 					<td>
-						<input type='checkbox' name='cyrusPop3SSL' value=1 {if $cyrusPop3SSL} checked {/if} {$cyrusPop3SSLACL}> 
+{render acl=$cyrusPop3SSLACL}
+						<input type='checkbox' name='cyrusPop3SSL' value=1 {if $cyrusPop3SSL} checked {/if} > 
+{/render}
+					</td>
+					<td>{t}Start POP3 SSL service{/t}
 					</td>
 				</tr>
 			</table>
@@ -72,22 +94,27 @@
 </table>
 <p class='seperator'>&nbsp;</p>
 <br>
+<h2><img class="center" alt="" src="images/rocket.png" align="middle"> Action</h2>
 {if $is_new == "new"}
     {t}The server must be saved before you can use the status flag.{/t}
+{elseif !$is_acc}
+    {t}The service must be saved before you can use the status flag.{/t}
 {/if}
 <br>
-<select name="action" title='{t}{/t}' {if $is_new =="new"} disabled {/if}>
+<select name="action" title='{t}Set new status{/t}' 
+	{if $is_new =="new" || !$is_acc} disabled {/if}
+>
 	<option value="none">&nbsp;</option>
     {html_options options=$Actions}
 </select>
-<input type='submit' name='ExecAction' title='{t}Set status{/t}' value='{t}Execute{/t}' {if $is_new == "new"} disabled {/if}>
+<input type='submit' name='ExecAction' title='{t}Set status{/t}' value='{t}Execute{/t}' 
+	{if $is_new == "new" | !$is_acc} disabled {/if}
+>
 
 <p class="seperator">&nbsp;</p>
-<p>
-<div style="width:100%; text-align:right;">
+<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>
-</p>
 <input type="hidden" name="goImapServerPosted" value="1">