ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

outline removed

Browse source
This commit is contained in:
Arvind Tiwari 2017-09-27 03:09:43 +05:30
commit 5747468c21
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
datacenterlight/templates/datacenterlight/emails/user_activation.html
View file

@ -11,7 +11,7 @@
</head>
<body style="margin: 0; padding: 20px 0;">
<table style="width: 100%; margin: auto; border-spacing: 0; border-collapse: collapse; max-width: 560px; border: 1px solid #aaa;">
<table style="width: 100%; margin: auto; border-spacing: 0; border-collapse: collapse; max-width: 560px;">
<tr>
<td style="padding-top: 25px; padding-left: 29px; padding-right: 30px; font-family: Lato, Arial, sans-serif;">
<img src="{{ base_url }}{% static 'datacenterlight/img/logo_black.png' %}" style="width: 200px; height: 50px;">
@ -28,7 +28,7 @@
{% blocktrans %}You can activate your Data Center Light account by clicking <a href="{{base_url}}{{activation_link}}" style="text-decoration: none; color: #4382c8; font-weight: 400;">here</a>.{% endblocktrans %}<br>
{% 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 %}<br>
</p>
<p style="color: #4382c8; line-height: 1.2; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
<p style="color: #4382c8; line-height: 1.4; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
{{base_url}}{{activation_link}}
</p>
</td>

2
datacenterlight/templates/datacenterlight/emails/welcome_user.html
View file

@ -11,7 +11,7 @@
</head>
<body style="margin: 0; padding: 20px 0;">
<table style="width: 100%; margin: auto; border-spacing: 0; border-collapse: collapse; max-width: 560px; border: 1px solid #aaa;">
<table style="width: 100%; margin: auto; border-spacing: 0; border-collapse: collapse; max-width: 560px;">
<tr>
<td style="padding-top: 25px; padding-left: 29px; padding-right: 30px; font-family: Lato, Arial, sans-serif;">
<img src="{{ base_url }}{% static 'datacenterlight/img/logo_black.png' %}" style="width: 200px; height: 50px;">

2
hosting/templates/hosting/emails/new_booked_vm.html
View file

@ -11,7 +11,7 @@
</head>
<body style="margin: 0; padding: 20px 0;">
<table style="width: 100%; margin: auto; border-spacing: 0; border-collapse: collapse; max-width: 560px; border: 1px solid #aaa;">
<table style="width: 100%; margin: auto; border-spacing: 0; border-collapse: collapse; max-width: 560px;">
<tr>
<td style="padding-top: 25px; padding-left: 29px; padding-right: 30px; font-family: Lato, Arial, sans-serif;">
<img src="{{ base_url }}{% static 'datacenterlight/img/logo_black.png' %}" style="width: 200px; height: 50px;">

4
hosting/templates/hosting/emails/password_reset_email.html
View file

@ -11,7 +11,7 @@
</head>
<body style="margin: 0; padding: 20px 0;">
<table style="width: 100%; margin: auto; border-spacing: 0; border-collapse: collapse; max-width: 560px; border: 1px solid #aaa;">
<table style="width: 100%; margin: auto; border-spacing: 0; border-collapse: collapse; max-width: 560px;">
<tr>
<td style="padding-top: 25px; padding-left: 29px; padding-right: 30px; font-family: Lato, Arial, sans-serif;">
<img src="{{base_url}}{% static 'datacenterlight/img/logo_black.png' %}" style="width: 200px; height: 50px;">
@ -29,7 +29,7 @@
{% trans "If you didn't make this request you can safely ignore this email." %}<br>
{% trans "Otherwise, click here to reset your password." %}
</p>
<p style="color: #4382c8; line-height: 1.2; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
<p style="color: #4382c8; line-height: 1.4; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
{% url 'hosting:reset_password_confirm' uidb64=uid token=token as password_reset_url %}
{{base_url}}{{ password_reset_url }}
</p>

2
hosting/templates/hosting/emails/vm_canceled.html
View file

@ -11,7 +11,7 @@
</head>
<body style="margin: 0; padding: 20px 0;">
<table style="width: 100%; margin: auto; border-spacing: 0; border-collapse: collapse; max-width: 560px; border: 1px solid #aaa;">
<table style="width: 100%; margin: auto; border-spacing: 0; border-collapse: collapse; max-width: 560px;">
<tr>
<td style="padding-top: 25px; padding-left: 29px; padding-right: 30px; font-family: Lato, Arial, sans-serif;">
<img src="{{ base_url }}{% static 'datacenterlight/img/logo_black.png' %}" style="width: 200px; height: 50px;">

4
hosting/views.py
View file

@ -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} <br /> {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,