moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

font-size reduced, vm cancel and vm create email data fixed

Browse source
This commit is contained in:
Arvind Tiwari 2017-09-27 02:07:52 +05:30
parent 050f750322
commit 21660f8d00
9 changed files with 95 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
datacenterlight/locale/de/LC_MESSAGES/django.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-23 02:19+0530\n" "POT-Creation-Date: 2017-09-27 02:06+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

21
datacenterlight/tasks.py
View file

@ -5,6 +5,7 @@ from celery.utils.log import get_task_logger
from celery import current_task from celery import current_task
from django.conf import settings from django.conf import settings
from django.core.mail import EmailMessage from django.core.mail import EmailMessage
from django.core.urlresolvers import reverse
from django.utils import translation from django.utils import translation
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@ -52,7 +53,8 @@ def create_vm_task(self, vm_template_id, user, specs, template,
stripe_customer_id, billing_address_data, stripe_customer_id, billing_address_data,
billing_address_id, billing_address_id,
charge, cc_details): charge, cc_details):
logger.debug("Running create_vm_task on {}".format(current_task.request.hostname)) logger.debug("Running create_vm_task on {}".format(
current_task.request.hostname))
vm_id = None vm_id = None
try: try:
final_price = specs.get('price') final_price = specs.get('price')
@ -126,9 +128,9 @@ def create_vm_task(self, vm_template_id, user, specs, template,
'storage': specs.get('disk_size'), 'storage': specs.get('disk_size'),
'price': specs.get('price'), 'price': specs.get('price'),
'template': template.get('name'), 'template': template.get('name'),
'vm.name': vm['name'], 'vm_name': vm['name'],
'vm.id': vm['vm_id'], 'vm_id': vm['vm_id'],
'order.id': order.id 'order_id': order.id
} }
email_data = { email_data = {
'subject': settings.DCL_TEXT + " Order from %s" % context['email'], 'subject': settings.DCL_TEXT + " Order from %s" % context['email'],
@ -142,20 +144,21 @@ def create_vm_task(self, vm_template_id, user, specs, template,
email.send() email.send()
if 'pass' in user: if 'pass' in user:
lang = 'en-us' lang = 'en-us'
if user.get('language') is not None: if user.get('language') is not None:
logger.debug("Language is set to {}".format(user.get('language'))) logger.debug("Language is set to {}".format(
user.get('language')))
lang = user.get('language') lang = user.get('language')
translation.activate(lang) translation.activate(lang)
# Send notification to the user as soon as VM has been booked # Send notification to the user as soon as VM has been booked
context = { context = {
'vm': vm,
'order': order,
'base_url': "{0}://{1}".format(user.get('request_scheme'), 'base_url': "{0}://{1}".format(user.get('request_scheme'),
user.get('request_host')), user.get('request_host')),
'order_url': reverse('hosting:orders',
kwargs={'pk': order.id}),
'page_header': _( 'page_header': _(
'Your New VM %(vm_name)s at Data Center Light') % { 'Your New VM %(vm_name)s at Data Center Light') % {
'vm_name': vm.get('name')} 'vm_name': vm.get('name')}
} }
email_data = { email_data = {
'subject': context.get('page_header'), 'subject': context.get('page_header'),

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

@ -6,7 +6,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% trans "Data Center Light Account Activation" %}</title> <title>{% trans "Data Center Light Account Activation" %}</title>
<link rel="shortcut icon" href="{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon"> <link rel="shortcut icon" href="{{ base_url }}{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400">
</head> </head>
@ -14,7 +14,7 @@
<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; border: 1px solid #aaa;">
<tr> <tr>
<td style="padding-top: 25px; padding-left: 22px; padding-right: 30px; font-family: Lato, Arial, sans-serif;"> <td style="padding-top: 25px; padding-left: 22px; padding-right: 30px; font-family: Lato, Arial, sans-serif;">
<img src="{{base_url}}{% static 'datacenterlight/img/logo_black.svg' %}" style="vertical-align: middle; width: 200px; height: 50px;"> <img src="{{base_url}}{% static 'datacenterlight/img/logo_black.svg' %}" style="width: 200px; height: 50px;">
</td> </td>
</tr> </tr>
<tr> <tr>
@ -35,7 +35,7 @@
</tr> </tr>
<tr> <tr>
<td style="padding-top: 40px; padding-left: 30px; padding-right: 30px; padding-bottom: 25px;"> <td style="padding-top: 40px; padding-left: 30px; padding-right: 30px; padding-bottom: 25px;">
<h3 style="font-family: Lato, Arial, sans-serif; margin: 0; font-weight: 400; font-size: 18px;">{% trans "Your Data Center Light Team" %}</h3> <h3 style="font-family: Lato, Arial, sans-serif; margin: 0; font-weight: 400; font-size: 16px;">{% trans "Your Data Center Light Team" %}</h3>
</td> </td>
</tr> </tr>
</table> </table>

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

@ -6,7 +6,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% trans "Welcome to Data Center Light!" %}</title> <title>{% trans "Welcome to Data Center Light!" %}</title>
<link rel="shortcut icon" href="{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon"> <link rel="shortcut icon" href="{{ base_url }}{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400">
</head> </head>
@ -14,7 +14,7 @@
<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; border: 1px solid #aaa;">
<tr> <tr>
<td style="padding-top: 25px; padding-left: 22px; padding-right: 30px; font-family: Lato, Arial, sans-serif;"> <td style="padding-top: 25px; padding-left: 22px; padding-right: 30px; font-family: Lato, Arial, sans-serif;">
<img src="{{base_url}}{% static 'datacenterlight/img/logo_black.svg' %}" style="vertical-align: middle; width: 200px; height: 50px;"> <img src="{{base_url}}{% static 'datacenterlight/img/logo_black.svg' %}" style="width: 200px; height: 50px;">
</td> </td>
</tr> </tr>
<tr> <tr>
@ -37,7 +37,7 @@
</tr> </tr>
<tr> <tr>
<td style="padding-top: 40px; padding-left: 30px; padding-right: 30px; padding-bottom: 25px;"> <td style="padding-top: 40px; padding-left: 30px; padding-right: 30px; padding-bottom: 25px;">
<h3 style="font-family: Lato, Arial, sans-serif; margin: 0; font-weight: 400; font-size: 18px;">{% trans "Your Data Center Light Team" %}</h3> <h3 style="font-family: Lato, Arial, sans-serif; margin: 0; font-weight: 400; font-size: 16px;">{% trans "Your Data Center Light Team" %}</h3>
</td> </td>
</tr> </tr>
</table> </table>

181
hosting/locale/de/LC_MESSAGES/django.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-24 12:34+0000\n" "POT-Creation-Date: 2017-09-27 02:06+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -221,7 +221,9 @@ msgid "We received a request to reset your password."
msgstr "Wir haben eine Anfrage erhalten, um Dein Passwort zurückzusetzen." msgstr "Wir haben eine Anfrage erhalten, um Dein Passwort zurückzusetzen."
msgid "If you didn't make this request you can safely ignore this email." msgid "If you didn't make this request you can safely ignore this email."
msgstr "Falls Du kein neues Passwort angefragt hast, kannst Du diese E-mail ignorieren." msgstr ""
"Falls Du kein neues Passwort angefragt hast, kannst Du diese E-mail "
"ignorieren."
msgid "Otherwise, click here to reset your password." msgid "Otherwise, click here to reset your password."
msgstr "Andernfalls klicke hier, um Dein Passwort zurückzusetzen." msgstr "Andernfalls klicke hier, um Dein Passwort zurückzusetzen."
@ -232,50 +234,18 @@ msgstr "Dankeschön!"
msgid "Virtual Machine Cancellation" msgid "Virtual Machine Cancellation"
msgstr "VM Kündigung" msgstr "VM Kündigung"
#, python-format
msgid ""
"\n"
"You're receiving this email because you requested a password reset for your "
"user account at %(site_name)s.<br/>\n"
"Please go to the following page and choose a new password: %(base_url)s"
"%(password_reset_url)s<br/>\n"
"If you didn't request a new password, ignore this e-mail.<br/>\n"
"Thank you!\n"
msgstr ""
"\n"
"Du erhälst diese E-Mail da Du Dein Passwort für Deinen Account bei "
"%(site_name)s zurücksetzen möchtest.<br/>\n"
"Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s"
"%(password_reset_url)s Solltest Du kein neues Passwort angefordert haben, "
"dann ignoriere diese E-Mail.<br/>\n"
"Dankeschön!\n"
#, python-format
msgid ""
"You're receiving this email because you requested a password reset for your "
"user account at %(site_name)s.\n"
"Please go to the following page and choose a new password: %(base_url)s"
"%(password_reset_url)s\n"
"If you didn't request a new password, ignore this e-mail.\n"
"Thank you!\n"
msgstr ""
"Du erhälst diese E-Mail da Du Dein Passwort für Deinen Account bei "
"%(site_name)s zurücksetzen möchtest.\n"
"Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s"
"%(password_reset_url)s Solltest Du kein neues Passwort angefordert haben, "
"dann ignoriere diese E-Mail.\n"
"Dankeschön!\n"
#, python-format #, python-format
msgid "" msgid ""
"You are receiving this email because your virutal machine [%(vm_name)s] has " "You are receiving this email because your virutal machine [%(vm_name)s] has "
"been cancelled." "been cancelled."
msgstr "" msgstr ""
"Du erhälst diese E-Mail, da deine virtuelle Maschine [%(vm_name)s] " "Du erhälst diese E-Mail, da deine virtuelle Maschine [%(vm_name)s] gekündigt "
"gekündigt wurde." "wurde."
msgid "You can always order a new VM by clicking the button below." msgid "You can always order a new VM by clicking the button below."
msgstr "Du kannst einfach eine neue VM bestellen, indem Du den Knopf weiter unten drückst." msgstr ""
"Du kannst einfach eine neue VM bestellen, indem Du den Knopf weiter unten "
"drückst."
msgid "CREATE VM" msgid "CREATE VM"
msgstr "NEUE VM" msgstr "NEUE VM"
@ -283,24 +253,6 @@ msgstr "NEUE VM"
msgid "You can always order a new VM by following the link below." msgid "You can always order a new VM by following the link below."
msgstr "" msgstr ""
#, python-format
msgid ""
"You're receiving this mail because your virtual machine [%(vm_name)s] has "
"been cancelled.\n"
"You can see your order status by clicking here\n"
"%(base_url)s%(vm_order_url)s\n"
"If you want to order a new virtual machine, you can do it by clicking this "
"link.\n"
"%(base_url)s%(my_virtual_machines_url)s\n"
msgstr ""
"Du erhälst diese E-Mail, da Deine virtuelle Maschine [%(vm_name)s] gekündigt "
"wurde.\n"
"Um Deinen Auftragsstatus zu sehen, klicke hier.\n"
"%(base_url)s%(vm_order_url)s\n"
"Falls Du eine neue virtuelle Maschine bestellen möchtest, kannst Du dies "
"tun, indem Du diesen Link klickst.\n"
"%(base_url)s%(my_virtual_machines_url)s\n"
msgid "Toggle navigation" msgid "Toggle navigation"
msgstr "Umschalten" msgstr "Umschalten"
@ -620,8 +572,8 @@ msgid ""
"Your Virtual Machine <strong>%(machine_name)s</strong> is successfully " "Your Virtual Machine <strong>%(machine_name)s</strong> is successfully "
"terminated!" "terminated!"
msgstr "" msgstr ""
"Deine Virtuelle Machine (VM) <strong>%(machine_name)s</strong> wurde erfolgreich " "Deine Virtuelle Machine (VM) <strong>%(machine_name)s</strong> wurde "
"beendet!" "erfolgreich beendet!"
msgid "Virtual Machines" msgid "Virtual Machines"
msgstr "Virtuelle Maschinen" msgstr "Virtuelle Maschinen"
@ -704,25 +656,67 @@ msgid ""
"contact Data Center Light Support." "contact Data Center Light Support."
msgstr "Kontaktiere den Data Center Light Support." msgstr "Kontaktiere den Data Center Light Support."
#, python-format
msgid "VM %(VM_ID)s terminated successfully"
msgstr "VM %(VM_ID)s erfolgreich beendet"
msgid "Terminated" msgid "Terminated"
msgstr "Beendet" msgstr "Beendet"
msgid "Error terminating VM" msgid "Error terminating VM"
msgstr "Fehler beenden VM" msgstr "Fehler beenden VM"
msgid "Virtual Machine Cancellation" #~ msgid ""
msgstr "VM Kündigung" #~ "\n"
#~ "You're receiving this email because you requested a password reset for "
#~ "your user account at %(site_name)s.<br/>\n"
#~ "Please go to the following page and choose a new password: %(base_url)s"
#~ "%(password_reset_url)s<br/>\n"
#~ "If you didn't request a new password, ignore this e-mail.<br/>\n"
#~ "Thank you!\n"
#~ msgstr ""
#~ "\n"
#~ "Du erhälst diese E-Mail da Du Dein Passwort für Deinen Account bei "
#~ "%(site_name)s zurücksetzen möchtest.<br/>\n"
#~ "Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s"
#~ "%(password_reset_url)s Solltest Du kein neues Passwort angefordert haben, "
#~ "dann ignoriere diese E-Mail.<br/>\n"
#~ "Dankeschön!\n"
#~ msgid "Close" #~ msgid ""
#~ msgstr "Schliessen" #~ "You're receiving this email because you requested a password reset for "
#~ "your user account at %(site_name)s.\n"
#~ "Please go to the following page and choose a new password: %(base_url)s"
#~ "%(password_reset_url)s\n"
#~ "If you didn't request a new password, ignore this e-mail.\n"
#~ "Thank you!\n"
#~ msgstr ""
#~ "Du erhälst diese E-Mail da Du Dein Passwort für Deinen Account bei "
#~ "%(site_name)s zurücksetzen möchtest.\n"
#~ "Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s"
#~ "%(password_reset_url)s Solltest Du kein neues Passwort angefordert haben, "
#~ "dann ignoriere diese E-Mail.\n"
#~ "Dankeschön!\n"
#~ msgid ""
#~ "You're receiving this mail because your virtual machine [%(vm_name)s] has "
#~ "been cancelled.\n"
#~ "You can see your order status by clicking here\n"
#~ "%(base_url)s%(vm_order_url)s\n"
#~ "If you want to order a new virtual machine, you can do it by clicking "
#~ "this link.\n"
#~ "%(base_url)s%(my_virtual_machines_url)s\n"
#~ msgstr ""
#~ "Du erhälst diese E-Mail, da Deine virtuelle Maschine [%(vm_name)s] "
#~ "gekündigt wurde.\n"
#~ "Um Deinen Auftragsstatus zu sehen, klicke hier.\n"
#~ "%(base_url)s%(vm_order_url)s\n"
#~ "Falls Du eine neue virtuelle Maschine bestellen möchtest, kannst Du dies "
#~ "tun, indem Du diesen Link klickst.\n"
#~ "%(base_url)s%(my_virtual_machines_url)s\n"
#~ msgid "VM %(VM_ID)s terminated successfully" #~ msgid "VM %(VM_ID)s terminated successfully"
#~ msgstr "VM %(VM_ID)s erfolgreich beendet" #~ msgstr "VM %(VM_ID)s erfolgreich beendet"
#~ msgid "Close"
#~ msgstr "Schliessen"
#~ msgid "days" #~ msgid "days"
#~ msgstr "Tage" #~ msgstr "Tage"
@ -762,55 +756,6 @@ msgstr "VM Kündigung"
#~ "tun, indem du <a href=\"%(base_url)s%(my_virtual_machines_url)s\">diesen " #~ "tun, indem du <a href=\"%(base_url)s%(my_virtual_machines_url)s\">diesen "
#~ "Link klickst</a>.<br/>\n" #~ "Link klickst</a>.<br/>\n"
#~ msgid ""
#~ "You're receiving this mail because your virtual machine [%(vm_name)s] has "
#~ "been cancelled.\n"
#~ "You can see your order status by clicking here\n"
#~ "%(base_url)s%(vm_order_url)s\n"
#~ "If you want to order a new virtual machine, you can do it by clicking "
#~ "this link.\n"
#~ "%(base_url)s%(my_virtual_machines_url)s\n"
#~ msgstr ""
#~ "Du erhälst diese E-Mail, da deine virtuelle Maschine [%(vm_name)s] "
#~ "gekündigt wurde.\n"
#~ "Um deinen Auftragsstatus zu sehen, klicke hier.\n"
#~ "%(base_url)s%(vm_order_url)s\n"
#~ "Falls du eine neue virtuelle Maschine bestellen möchtest, kannst du dies "
#~ "tun, indem du diesen Link klickst.\n"
#~ "%(base_url)s%(my_virtual_machines_url)s\n"
#~ msgid ""
#~ "\n"
#~ "You're receiving this email because you requested a password reset for "
#~ "your user account at %(site_name)s.<br/>\n"
#~ "Please go to the following page and choose a new password: %(base_url)s"
#~ "%(password_reset_url)s<br/>\n"
#~ "If you didn't request a new password, ignore this e-mail.<br/>\n"
#~ "Thank you!\n"
#~ msgstr ""
#~ "\n"
#~ "Du erhälst diese E-Mail da du dein Passwort für deinen Account bei "
#~ "%(site_name)s zurücksetzen möchtest.<br/>\n"
#~ "Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s"
#~ "%(password_reset_url)s Solltest du kein neues Passwort angefordert haben, "
#~ "dann ignoriere diese E-Mail.<br/>\n"
#~ "Dankeschön!\n"
#~ msgid ""
#~ "You're receiving this email because you requested a password reset for "
#~ "your user account at %(site_name)s.\n"
#~ "Please go to the following page and choose a new password: %(base_url)s"
#~ "%(password_reset_url)s\n"
#~ "If you didn't request a new password, ignore this e-mail.\n"
#~ "Thank you!\n"
#~ msgstr ""
#~ "Du erhälst diese E-Mail da du dein Passwort für deinen Account bei "
#~ "%(site_name)s zurücksetzen möchtest.\n"
#~ "Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s"
#~ "%(password_reset_url)s Solltest du kein neues Passwort angefordert haben, "
#~ "dann ignoriere diese E-Mail.\n"
#~ "Dankeschön!\n"
#~ msgid "Finish Configuration" #~ msgid "Finish Configuration"
#~ msgstr "Konfiguration beenden" #~ msgstr "Konfiguration beenden"
@ -917,5 +862,5 @@ msgstr "VM Kündigung"
#~ "Your SSH private key was already generated and downloaded, if you lost " #~ "Your SSH private key was already generated and downloaded, if you lost "
#~ "it, contact us. " #~ "it, contact us. "
#~ msgstr "" #~ msgstr ""
#~ "Dein privater SSH Key wurde bereits generiert und heruntergeladen. " #~ "Dein privater SSH Key wurde bereits generiert und heruntergeladen. Falls "
#~ "Falls Du ihn verloren hast, kontaktiere uns." #~ "Du ihn verloren hast, kontaktiere uns."

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

@ -6,7 +6,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% blocktrans %}Your New VM {{vm_name}}{% endblocktrans %}</title> <title>{% blocktrans %}Your New VM {{vm_name}}{% endblocktrans %}</title>
<link rel="shortcut icon" href="{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon"> <link rel="shortcut icon" href="{{ base_url }}{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400">
</head> </head>
@ -14,7 +14,7 @@
<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; border: 1px solid #aaa;">
<tr> <tr>
<td style="padding-top: 25px; padding-left: 22px; padding-right: 30px; font-family: Lato, Arial, sans-serif;"> <td style="padding-top: 25px; padding-left: 22px; padding-right: 30px; font-family: Lato, Arial, sans-serif;">
<img src="{{base_url}}{% static 'datacenterlight/img/logo_black.svg' %}" style="vertical-align: middle; width: 200px; height: 50px;"> <img src="{{ base_url }}{% static 'datacenterlight/img/logo_black.svg' %}" style="width: 200px; height: 50px;">
</td> </td>
</tr> </tr>
<tr> <tr>
@ -26,7 +26,7 @@
<td style="padding-top: 25px; padding-left: 30px; padding-right: 30px;"> <td style="padding-top: 25px; padding-left: 30px; padding-right: 30px;">
<p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;"> <p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
{% blocktrans %}You have ordered a new virtual machine!{% endblocktrans %}<br> {% blocktrans %}You have ordered a new virtual machine!{% endblocktrans %}<br>
{% blocktrans %}Your order of [{{vm_name}}] has been charged.{% endblocktrans %}<br> {% blocktrans %}Your order of [{{ vm_name }}] has been charged.{% endblocktrans %}<br>
{% blocktrans %}You can view your VM detail by clicking the button below.{% endblocktrans %} {% blocktrans %}You can view your VM detail by clicking the button below.{% endblocktrans %}
</p> </p>
</td> </td>
@ -38,7 +38,7 @@
</tr> </tr>
<tr> <tr>
<td style="padding-top: 40px; padding-left: 30px; padding-right: 30px; padding-bottom: 25px;"> <td style="padding-top: 40px; padding-left: 30px; padding-right: 30px; padding-bottom: 25px;">
<h3 style="font-family: Lato, Arial, sans-serif; margin: 0; font-weight: 400; font-size: 18px;">{% trans "Your Data Center Light Team" %}</h3> <h3 style="font-family: Lato, Arial, sans-serif; margin: 0; font-weight: 400; font-size: 16px;">{% trans "Your Data Center Light Team" %}</h3>
</td> </td>
</tr> </tr>
</table> </table>

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

@ -6,7 +6,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% trans "Password Reset" %}</title> <title>{% trans "Password Reset" %}</title>
<link rel="shortcut icon" href="{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon"> <link rel="shortcut icon" href="{{ base_url }}{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400">
</head> </head>
@ -14,7 +14,7 @@
<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; border: 1px solid #aaa;">
<tr> <tr>
<td style="padding-top: 25px; padding-left: 22px; padding-right: 30px; font-family: Lato, Arial, sans-serif;"> <td style="padding-top: 25px; padding-left: 22px; padding-right: 30px; font-family: Lato, Arial, sans-serif;">
<img src="{{base_url}}{% static 'datacenterlight/img/logo_black.svg' %}" style="vertical-align: middle; width: 200px; height: 50px;"> <img src="{{base_url}}{% static 'datacenterlight/img/logo_black.svg' %}" style="width: 200px; height: 50px;">
</td> </td>
</tr> </tr>
<tr> <tr>
@ -40,7 +40,7 @@
</tr> </tr>
<tr> <tr>
<td style="padding-top: 40px; padding-left: 30px; padding-right: 30px; padding-bottom: 25px;"> <td style="padding-top: 40px; padding-left: 30px; padding-right: 30px; padding-bottom: 25px;">
<h3 style="font-family: Lato, Arial, sans-serif; margin: 0; font-weight: 400; font-size: 18px;">{% trans "Your Data Center Light Team" %}</h3> <h3 style="font-family: Lato, Arial, sans-serif; margin: 0; font-weight: 400; font-size: 16px;">{% trans "Your Data Center Light Team" %}</h3>
</td> </td>
</tr> </tr>
</table> </table>

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

@ -6,7 +6,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% trans "Virtual Machine Cancellation" %}</title> <title>{% trans "Virtual Machine Cancellation" %}</title>
<link rel="shortcut icon" href="{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon"> <link rel="shortcut icon" href="{{ base_url }}{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400">
</head> </head>
@ -14,7 +14,7 @@
<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; border: 1px solid #aaa;">
<tr> <tr>
<td style="padding-top: 25px; padding-left: 22px; padding-right: 30px; font-family: Lato, Arial, sans-serif;"> <td style="padding-top: 25px; padding-left: 22px; padding-right: 30px; font-family: Lato, Arial, sans-serif;">
<img src="{{base_url}}{% static 'datacenterlight/img/logo_black.svg' %}" style="vertical-align: middle; width: 200px; height: 50px;"> <img src="{{ base_url }}{% static 'datacenterlight/img/logo_black.svg' %}" style="width: 200px; height: 50px;">
</td> </td>
</tr> </tr>
<tr> <tr>
@ -25,19 +25,19 @@
<tr> <tr>
<td style="padding-top: 25px; padding-left: 30px; padding-right: 30px;"> <td style="padding-top: 25px; padding-left: 30px; padding-right: 30px;">
<p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;"> <p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
{% blocktrans %}You are receiving this email because your virutal machine [{{vm_name}}] has been cancelled.{% endblocktrans %}<br> {% blocktrans %}You are receiving this email because your virutal machine [{{ vm_name }}] has been cancelled.{% endblocktrans %}<br>
{% blocktrans %}You can always order a new VM by clicking the button below.{% endblocktrans %} {% blocktrans %}You can always order a new VM by clicking the button below.{% endblocktrans %}
</p> </p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="padding-top: 30px; padding-left: 30px; padding-right: 30px;"> <td style="padding-top: 30px; padding-left: 30px; padding-right: 30px;">
<a class="btn" href="{{ base_url }}{% url 'hosting:create_virtual_machine' %}" style="font-family: Lato, Arial, sans-serif; text-decoration: none; background-color: #1596da; color: #fff; padding-top: 10px; padding-bottom: 10px; padding-left: 40px; padding-right: 30px; letter-spacing: 0.5px; border-radius: 3px; display: inline-block; position: relative;"><span style="font-size: 24px; position: absolute; top: 5px; left: 20px;">+</span> {% trans "CREATE VM" %}</a> <a class="btn" href="{{ base_url }}{% url 'hosting:create_virtual_machine' %}" style="font-family: Lato, Arial, sans-serif; text-decoration: none; background-color: #1596da; color: #fff; padding-top: 10px; padding-bottom: 10px; padding-left: 40px; padding-right: 30px; letter-spacing: 0.5px; border-radius: 3px; display: inline-block; position: relative;">{% trans "CREATE VM" %}</a>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="padding-top: 40px; padding-left: 30px; padding-right: 30px; padding-bottom: 25px;"> <td style="padding-top: 40px; padding-left: 30px; padding-right: 30px; padding-bottom: 25px;">
<h3 style="font-family: Lato, Arial, sans-serif; margin: 0; font-weight: 400; font-size: 18px;">{% trans "Your Data Center Light Team" %}</h3> <h3 style="font-family: Lato, Arial, sans-serif; margin: 0; font-weight: 400; font-size: 16px;">{% trans "Your Data Center Light Team" %}</h3>
</td> </td>
</tr> </tr>
</table> </table>

2
hosting/views.py
View file

@ -1079,7 +1079,7 @@ class VirtualMachineView(LoginRequiredMixin, View):
else: else:
sleep(2) sleep(2)
context = { context = {
'vm': vm_data, 'vm_name': vm_data.name,
'base_url': "{0}://{1}".format(self.request.scheme, 'base_url': "{0}://{1}".format(self.request.scheme,
self.request.get_host()), self.request.get_host()),
'page_header': _('Virtual Machine Cancellation') 'page_header': _('Virtual Machine Cancellation')