summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Bos <richard@radoeka.nl>2009-02-16 19:44:25 (GMT)
committerRichard Bos <richard@radoeka.nl>2009-02-16 19:44:25 (GMT)
commit432d2e506c9776cdb1119b576de9e9f397d1dbfc (patch)
tree4707e6308d71e2415a457471e714c0a3903fcc60
parent3a993dfc91ac2635446e6b6d4255dbbbf11d44e8 (diff)
downloadkolab-webadmin-432d2e506c9776cdb1119b576de9e9f397d1dbfc.tar.gz
improved layout, kolab/issue3404
-rw-r--r--ChangeLog5
-rwxr-xr-xphp/admin/templates/settings.tpl19
2 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b90d134..b1b4f76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-16 Richard Bos <richard@radoeka.nl>
+
+ * php/admin/templates/settings.tpl: improved layout,
+ kolab/issue3404
+
2009-02-14 Richard Bos <richard@radoeka.nl>
* php/admin/locale/nl/LC_MESSAGES/messages.po: improved translation
diff --git a/php/admin/templates/settings.tpl b/php/admin/templates/settings.tpl
index a0192ee..734a8b8 100755
--- a/php/admin/templates/settings.tpl
+++ b/php/admin/templates/settings.tpl
@@ -149,12 +149,21 @@
{tr msg="Use the Sender header instead of From for the above checks if Sender is present."}
<br />
<h4>{tr msg="Action to take for messages that fail the check:"}</h4>
-<input type="radio" name="kolabfilterrejectforgedfrom" value="FALSE" {if $kolabfilterrejectforgedfrom == 'false' }checked="checked"{/if} />
-{tr msg="Reject the message, except if it originates from the outside and the From header matches one of Kolab server's domains. In that case rewrite the From header so the recipient can see the potential forgery."}<br/>
-<input type="radio" name="kolabfilterrejectforgedfrom" value="TRUE" {if $kolabfilterrejectforgedfrom == 'true' }checked="checked"{/if} />
-{tr msg="Always reject the message."}
+<table border="0">
+ <tr>
+ <td valign="top"><input type="radio" name="kolabfilterrejectforgedfrom" value="FALSE" {if $kolabfilterrejectforgedfrom == 'false' }checked="checked"{/if} />
+ </td>
+ <td>{tr msg="Reject the message, except if it originates from the outside and the From header matches one of Kolab server's domains. In that case rewrite the From header so the recipient can see the potential forgery."}<br/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top"><input type="radio" name="kolabfilterrejectforgedfrom" value="TRUE" {if $kolabfilterrejectforgedfrom == 'true' }checked="checked"{/if} />
+ </td>
+ <td>{tr msg="Always reject the message."}
{tr msg="Note that enabling this setting will make the server reject any mail with non-matching sender and From header if the sender is an account on this server. This is known to cause trouble for example with mailinglists."}
-<br />
+ </td>
+ </tr>
+</table>
<div class="align_right"><input type="submit" name="submitkolabfilter" value="{tr msg="Update"}" /></div>
</div>
</form>