X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/3be2d7d8c9405cac6abdee1ec44f53d2bcdecac8..ff9cf41fc82917f82e95d99eae1dd0077c1fa32b:/forum/settings/email.py

diff --git a/forum/settings/email.py b/forum/settings/email.py
index 5e8a4a2..b83631e 100644
--- a/forum/settings/email.py
+++ b/forum/settings/email.py
@@ -1,9 +1,17 @@
 from base import Setting, SettingSet
 from django.utils.translation import ugettext_lazy as _
 from django.forms.widgets import PasswordInput
+from django.forms.widgets import RadioSelect
+from forms import TestEmailSettingsWidget
 
 EMAIL_SET = SettingSet('email', _('Email settings'), _("Email server and other email related settings."), 50)
 
+TEST_EMAIL_SETTINGS = Setting('TEST_EMAIL_SETTINGS', '', EMAIL_SET, dict(
+label = _("E-Mail settings test"),
+help_text = _("Test the current E-Mail configuration."),
+required=False,
+widget=TestEmailSettingsWidget))
+
 EMAIL_HOST = Setting('EMAIL_HOST', '', EMAIL_SET, dict(
 label = _("Email Server"),
 help_text = _("The SMTP server through which your application will be sending emails."),
@@ -27,22 +35,39 @@ widget=PasswordInput))
 
 EMAIL_USE_TLS = Setting('EMAIL_USE_TLS', False, EMAIL_SET, dict(
 label = _("Use TLS"),
-help_text = _("Does your SMTP server usFes TLS for authentication."),
+help_text = _("Whether to use TLS for authentication with your SMTP server."),
 required=False))
 
 DEFAULT_FROM_EMAIL = Setting('DEFAULT_FROM_EMAIL', '', EMAIL_SET, dict(
-label = _("Site 'from' email address"),
+label = _("Site 'from' Email Address"),
 help_text = _("The address that will show up on the 'from' field on emails sent by your website."),
 required=False))
 
 EMAIL_SUBJECT_PREFIX = Setting('EMAIL_SUBJECT_PREFIX', '', EMAIL_SET, dict(
-label = _("Email subject prefix"),
-help_text = _("Every email sent through your website will have the subject prefixed by this string. It's usually a good idea to have such a prefix so your users can easilly set up a filter on theyr email clients."),
+label = _("Email Subject Prefix"),
+help_text = _("Every email sent through your website will have the subject prefixed by this string. It's usually a good idea to have such a prefix so your users can easily set up a filter on theyr email clients."),
 required=False))
 
 EMAIL_FOOTER_TEXT = Setting(u'EMAIL_FOOTER_TEXT', '', EMAIL_SET, dict(
 label = _("Email Footer Text"),
-help_text = _("Email footer text, usually the Can Spam compliance, or the phisical address of the organization running the website. See <a href=\"http://en.wikipedia.org/wiki/CAN-SPAM_Act_of_2003\">http://en.wikipedia.org/wiki/CAN-SPAM_Act_of_2003</a> for more info."),
+help_text = _("Email footer text, usually \"CAN SPAM\" compliance, or the physical address of the organization running the website. See <a href=\"http://en.wikipedia.org/wiki/CAN-SPAM_Act_of_2003\">this Wikipedia article</a> for more info."),
+required=False))
+
+EMAIL_BORDER_COLOR = Setting('EMAIL_BORDER_COLOR', '#e5ebf8', EMAIL_SET, dict(
+label = _("Email Border Color"),
+help_text = _("The outter border color of the email base template"),
+required=False))
+
+EMAIL_PARAGRAPH_STYLE = Setting('EMAIL_PARAGRAPH_STYLE', "color:#333333;font-family:'helvetica neue', arial, Helvetica, sans-serif;line-height:18px;font-size:14px;margin-top:10px;", EMAIL_SET, dict(
+label = _("Email Paragraph Style"),
+help_text = _("A valid css string to be used to style email paragraphs (the P tag)."),
+required=False))
+
+EMAIL_ANCHOR_STYLE = Setting('EMAIL_ANCHOR_STYLE', "text-decoration:none;color:#3060a8;font-weight:bold;", EMAIL_SET, dict(
+label = _("Email Link Style"),
+help_text = _("A valid css string to be used to style email links (the A tag)."),
 required=False))
 
-EMAIL_DIGEST_CONTROL = Setting('EMAIL_DIGEST_CONTROL', None)
+
+
+EMAIL_DIGEST_FLAG = Setting('EMAIL_DIGEST_FLAG', None)