diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.html b/datacenterlight/templates/datacenterlight/emails/user_activation.html index 0836d1cd..2cc75d80 100644 --- a/datacenterlight/templates/datacenterlight/emails/user_activation.html +++ b/datacenterlight/templates/datacenterlight/emails/user_activation.html @@ -11,7 +11,7 @@ - +
diff --git a/datacenterlight/templates/datacenterlight/emails/welcome_user.html b/datacenterlight/templates/datacenterlight/emails/welcome_user.html index 573fe2ef..7e35ac59 100644 --- a/datacenterlight/templates/datacenterlight/emails/welcome_user.html +++ b/datacenterlight/templates/datacenterlight/emails/welcome_user.html @@ -11,7 +11,7 @@ -
@@ -28,7 +28,7 @@ {% blocktrans %}You can activate your Data Center Light account by clicking here.{% endblocktrans %}
{% blocktrans %}You can also copy and paste the following link into the address bar of your browser to activate your Data Center Light account.{% endblocktrans %}

-

+

{{base_url}}{{activation_link}}

+
diff --git a/hosting/templates/hosting/emails/new_booked_vm.html b/hosting/templates/hosting/emails/new_booked_vm.html index f3a0af01..7ed963c6 100644 --- a/hosting/templates/hosting/emails/new_booked_vm.html +++ b/hosting/templates/hosting/emails/new_booked_vm.html @@ -11,7 +11,7 @@ - +
diff --git a/hosting/templates/hosting/emails/password_reset_email.html b/hosting/templates/hosting/emails/password_reset_email.html index 1ef685da..03f4c065 100644 --- a/hosting/templates/hosting/emails/password_reset_email.html +++ b/hosting/templates/hosting/emails/password_reset_email.html @@ -11,7 +11,7 @@ - +
@@ -29,7 +29,7 @@ {% trans "If you didn't make this request you can safely ignore this email." %}
{% trans "Otherwise, click here to reset your password." %}

-

+

{% url 'hosting:reset_password_confirm' uidb64=uid token=token as password_reset_url %} {{base_url}}{{ password_reset_url }}

diff --git a/hosting/templates/hosting/emails/vm_canceled.html b/hosting/templates/hosting/emails/vm_canceled.html index fa090636..cc133156 100644 --- a/hosting/templates/hosting/emails/vm_canceled.html +++ b/hosting/templates/hosting/emails/vm_canceled.html @@ -11,7 +11,7 @@ - +
diff --git a/hosting/views.py b/hosting/views.py index 51a90e1d..f81e6c5a 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -267,7 +267,7 @@ class SignupValidatedView(SignupValidateView): section_title = _('Account activation') user = CustomUser.objects.filter( validation_slug=self.kwargs['validate_slug']).first() - pre_valid = user.validated + # pre_valid = user.validated if validated: message = '{account_activation_string}
{login_string} {lurl}.'.format( account_activation_string=_( @@ -276,7 +276,7 @@ class SignupValidatedView(SignupValidateView): lurl=login_url) email_data = { 'subject': _('Welcome to Data Center Light!'), - 'to': self.request.user.email, + 'to': user.email, 'context': { 'base_url': "{0}://{1}".format( self.request.scheme,