diff --git a/server/core/settings.py b/server/core/settings.py index 0914091b..6dcc476a 100644 --- a/server/core/settings.py +++ b/server/core/settings.py @@ -362,10 +362,13 @@ WAGTAIL_SITE_NAME = 'skillbox' GRAPHQL_QUERIES_DIR = os.path.join(BASE_DIR, '..', 'client', 'src', 'graphql', 'gql') GRAPHQL_MUTATIONS_DIR = os.path.join(GRAPHQL_QUERIES_DIR, 'mutations') -EMAIL_BACKEND = 'sendgrid_backend.SendgridBackend' +# Sendgrid Config + +# EMAIL_BACKEND = 'sendgrid_backend.SendgridBackend' +# +# SENDGRID_API_KEY = os.environ.get("SENDGRID_API_KEY") +# SENDGRID_SANDBOX_MODE_IN_DEBUG = False -SENDGRID_API_KEY = os.environ.get("SENDGRID_API_KEY") -SENDGRID_SANDBOX_MODE_IN_DEBUG = False DEFAULT_FROM_EMAIL = 'myskillbox ' # Taskbase @@ -375,6 +378,15 @@ TASKBASE_SUPERUSER = os.environ.get("TASKBASE_SUPERUSER") TASKBASE_SUPERPASSWORD = os.environ.get("TASKBASE_SUPERPASSWORD") TASKBASE_BASEURL = os.environ.get("TASKBASE_BASEURL") +# Metanet Config +EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' + +EMAIL_HOST = os.environ.get("EMAIL_HOST") +EMAIL_PORT = os.environ.get("EMAIL_PORT") +EMAIL_HOST_PASSWORD = os.environ.get("EMAIL_HOST_PASSWORD") +EMAIL_HOST_USER = os.environ.get("EMAIL_HOST_USER") +EMAIL_USE_TLS = True +EMAIL_USE_SSL = False ALLOW_BETA_LOGIN = True diff --git a/server/core/templates/registration/password_reset_email.html b/server/core/templates/registration/password_reset_email.html index 41f235c8..a8204a5d 100644 --- a/server/core/templates/registration/password_reset_email.html +++ b/server/core/templates/registration/password_reset_email.html @@ -1,15 +1,21 @@ {% load i18n %} {% load core_tags %} {% autoescape off %} +

+{% blocktrans %}Sie erhalten diese E-Mail, weil Ihr Passwort auf {{ site_name }} zurückgesetzt wurde.{% endblocktrans %} +

-{% blocktrans %}Du erhältst dieses E-Mail, weil dein Passwort auf {{ site_name }} zurückgesetzt wurde.{% endblocktrans %} - +

{% trans "Bitte öffnen Sie folgende Seite, um Ihr neues Passwort einzugeben:" %} +

{% block reset_link %} +

{% reset_link 'password_reset_confirm' protocol domain token uid %} +

{% endblock %} +

{% trans "Ihr Benutzername lautet:" %} {{ user.get_username }} - +

{% trans "Ihr Skillbox Team" %} {% endautoescape %} diff --git a/server/core/templates/registration/registration_set_password_email.html b/server/core/templates/registration/registration_set_password_email.html index f848abd9..c40669be 100644 --- a/server/core/templates/registration/registration_set_password_email.html +++ b/server/core/templates/registration/registration_set_password_email.html @@ -1,15 +1,26 @@ {% load i18n %} {% load core_tags %} {% autoescape off %} - +

{% blocktrans %}Sie erhalten diese E-Mail, um Ihr Passwort auf mySkillbox initial zu setzen.{% endblocktrans %} +

+

{% trans "Bitte öffnen Sie folgende Seite, um Ihr neues Passwort einzugeben:" %} +

+ +

{% block reset_link %} {% reset_link 'set_password_confirm' protocol domain token uid %} +

{% endblock %} -{% trans "Ihr Benutzername lautet:" %} {{ user.get_username }} +

+{% trans "Ihr Benutzername lautet:" %} {{ user.get_username }} +

+ +

{% trans "Ihr mySkillbox Team" %} +

{% endautoescape %} diff --git a/server/core/urls.py b/server/core/urls.py index 206b27ef..6a95b795 100644 --- a/server/core/urls.py +++ b/server/core/urls.py @@ -13,7 +13,6 @@ from core import views urlpatterns = [ # django admin url(r'^guru/', admin.site.urls), - url(r'^accounts/', include('django.contrib.auth.urls')), url(r'^statistics/', include('statistics.urls', namespace='statistics')), # wagtail diff --git a/server/core/views.py b/server/core/views.py index bf84cb84..5a47cb2a 100644 --- a/server/core/views.py +++ b/server/core/views.py @@ -31,7 +31,6 @@ def home(request): class ConfirmationKeyDisplayView(TemplateView): - template_name = 'confirmation_key.html' def get_context_data(self, *args, **kwargs):