Corrected VM cancellation email templates
This commit is contained in:
		
					parent
					
						
							
								0d4c40cfa2
							
						
					
				
			
			
				commit
				
					
						a32c8ea467
					
				
			
		
					 3 changed files with 18 additions and 142 deletions
				
			
		|  | @ -3,12 +3,10 @@ | ||||||
| {% block email_head %}{{page_header}}{% endblock %} | {% block email_head %}{{page_header}}{% endblock %} | ||||||
| {% block email_body %} | {% block email_body %} | ||||||
| {% url 'hosting:virtual_machines' as my_virtual_machines_url %} | {% url 'hosting:virtual_machines' as my_virtual_machines_url %} | ||||||
|  | {% url 'hosting:orders' order.id as vm_order_url %} | ||||||
| {% blocktrans with vm.name as vm_name %}You're receiving this mail because your virtual machine [{{vm_name}}] has been cancelled.<br/> | {% blocktrans with vm.name as vm_name %}You're receiving this mail because your virtual machine [{{vm_name}}] has been cancelled.<br/> | ||||||
| You can see your order status by clicking [my VM page] below. | You can see your order status by clicking <a href="{{base_url}}{{vm_order_url}}">here</a>.<br/> | ||||||
| If you want to order a new virtual machine, you can do it by clicking this link []. | If you want to order a new virtual machine, you can do it by clicking <a href="{{base_url}}{{my_virtual_machines_url}}">this link</a>.<br/> | ||||||
| 
 |  | ||||||
| Visit [my VM page] Now |  | ||||||
| 
 |  | ||||||
| {% endblocktrans %} | {% endblocktrans %} | ||||||
| {% endblock %} | {% endblock %} | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,136 +1,13 @@ | ||||||
| {% load static from staticfiles %} | {% extends "datacenterlight/emails/base_email_datacenterlight.txt" %} | ||||||
| <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b --> | {% load i18n %} | ||||||
| <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> | {% block email_head %}{{page_header}}{% endblock %} | ||||||
| <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> | {% block email_body %} | ||||||
| <head> | {% url 'hosting:virtual_machines' as my_virtual_machines_url %} | ||||||
| <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> | {% url 'hosting:orders' order.id as vm_order_url %} | ||||||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | {% blocktrans with vm.name as vm_name %}{% blocktrans with vm.name as vm_name %}You're receiving this mail because your virtual machine [{{vm_name}}] has been cancelled. | ||||||
| <title>Oxygen Invoice</title> | You can see your order status by clicking | ||||||
| </head> | {{base_url}}{{vm_order_url}} | ||||||
| <body bgcolor="#f7f7f7" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; color: white; margin: 0;"> | If you want to order a new virtual machine, you can do it by clicking this link. | ||||||
| <style type="text/css"> | {{base_url}}{{my_virtual_machines_url}} | ||||||
| @media only screen and (max-width: 480px) { | {% endblocktrans %} | ||||||
|   table[class*="container-for-gmail-android"] { | {% endblock %} | ||||||
|     min-width: 290px !important; width: 100% !important; |  | ||||||
|   } |  | ||||||
|   img[class="force-width-gmail"] { |  | ||||||
|     display: none !important; width: 0 !important; height: 0 !important; |  | ||||||
|   } |  | ||||||
|   table[class="w320"] { |  | ||||||
|     width: 320px !important; |  | ||||||
|   } |  | ||||||
|   td[class*="mobile-header-padding-left"] { |  | ||||||
|     width: 160px !important; padding-left: 0 !important; |  | ||||||
|   } |  | ||||||
|   td[class*="mobile-header-padding-right"] { |  | ||||||
|     width: 160px !important; padding-right: 0 !important; |  | ||||||
|   } |  | ||||||
|   td[class="header-lg"] { |  | ||||||
|     font-size: 24px !important; padding-bottom: 5px !important; |  | ||||||
|   } |  | ||||||
|   td[class="content-padding"] { |  | ||||||
|     padding: 5px 0 5px !important; |  | ||||||
|   } |  | ||||||
|   td[class="button"] { |  | ||||||
|     padding: 5px 5px 30px !important; |  | ||||||
|   } |  | ||||||
|   td[class*="free-text"] { |  | ||||||
|     padding: 10px 18px 30px !important; |  | ||||||
|   } |  | ||||||
|   td[class~="mobile-hide-img"] { |  | ||||||
|     display: none !important; height: 0 !important; width: 0 !important; line-height: 0 !important; |  | ||||||
|   } |  | ||||||
|   td[class~="item"] { |  | ||||||
|     width: 140px !important; vertical-align: top !important; |  | ||||||
|   } |  | ||||||
|   td[class~="quantity"] { |  | ||||||
|     width: 50px !important; |  | ||||||
|   } |  | ||||||
|   td[class~="price"] { |  | ||||||
|     width: 90px !important; |  | ||||||
|   } |  | ||||||
|   td[class="item-table"] { |  | ||||||
|     padding: 30px 20px !important; |  | ||||||
|   } |  | ||||||
|   td[class="mini-container-left"] { |  | ||||||
|     padding: 0 15px 15px !important; display: block !important; width: 290px !important; |  | ||||||
|   } |  | ||||||
|   td[class="mini-container-right"] { |  | ||||||
|     padding: 0 15px 15px !important; display: block !important; width: 290px !important; |  | ||||||
|   } |  | ||||||
| } |  | ||||||
| </style> |  | ||||||
| <table align="center" cellpadding="0" cellspacing="0" class="container-for-gmail-android" width="100%" style="border-collapse: collapse !important; min-width: 600px; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
| <tr style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
| <td align="left" valign="top" width="100%" style="border-collapse: collapse; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #f7f7f7 url(http://s3.amazonaws.com/swu-filepicker/4E687TRe69Ld95IDWyEg_bg_top_02.jpg) repeat-x;" bgcolor="#ffffff"> |  | ||||||
|       <center style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
|   <table cellspacing="0" cellpadding="0" width="100%" bgcolor="#ffffff" background="http://s3.amazonaws.com/swu-filepicker/4E687TRe69Ld95IDWyEg_bg_top_02.jpg" style="border-collapse: collapse !important; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; background: transparent;"><tr style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
| <td width="100%" height="80" valign="top" style="text-align: center; vertical-align: middle; border-collapse: collapse; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; line-height: 21px;" align="center"> |  | ||||||
|             <!--[if gte mso 9]> |  | ||||||
|             <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="mso-width-percent:1000;height:80px; v-text-anchor:middle;"> |  | ||||||
|               <v:fill type="tile" src="http://s3.amazonaws.com/swu-filepicker/4E687TRe69Ld95IDWyEg_bg_top_02.jpg" color="#ffffff" /> |  | ||||||
|               <v:textbox inset="0,0,0,0"> |  | ||||||
|             <![endif]--> |  | ||||||
|               <center style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
|                 <table cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
| <td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 10px;" align="left" valign="middle"> |  | ||||||
|                       <a href="{{base_url}}" style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; color: #676767; text-decoration: none !important;"><img width="137" src="{{base_url}}{% static "hosting/img/logo_black.png" %}" alt="logo" style="max-width: 600px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; border: none;"></a> |  | ||||||
|                     </td> |  | ||||||
|                     <td class="pull-right mobile-header-padding-right" style="color: #4d4d4d; border-collapse: collapse; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; text-align: right; line-height: 21px; width: 290px; padding-left: 10px;" align="right"> |  | ||||||
|                     </td> |  | ||||||
|                   </tr></table> |  | ||||||
| </center> |  | ||||||
|               <!--[if gte mso 9]> |  | ||||||
|               </v:textbox> |  | ||||||
|             </v:rect> |  | ||||||
|             <![endif]--> |  | ||||||
|             </td> |  | ||||||
|           </tr></table> |  | ||||||
| </center> |  | ||||||
|     </td> |  | ||||||
|   </tr> |  | ||||||
| <tr style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
| <td align="center" valign="top" width="100%" style="border-collapse: collapse; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #f7f7f7; padding: 20px 0 5px;" class="content-padding" bgcolor="#f7f7f7"> |  | ||||||
|       <center style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
|         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
| <tr style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
| <td class="header-lg" style="border-collapse: collapse; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: center; line-height: normal; font-weight: 700; padding: 35px 0 0;" align="center"> |  | ||||||
|                Your virtual machine {{vm.name}} status has been updated to {{vm.get_status_display}} |  | ||||||
|             </td> |  | ||||||
|           </tr> |  | ||||||
| <tr style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
| <td class="free-text" style="border-collapse: collapse; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; width: 100% !important; padding: 10px 60px 0px;" align="center"> |  | ||||||
|               You can manage your vm clicking on the button below |  | ||||||
|             </td> |  | ||||||
|           </tr> |  | ||||||
| <tr style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
| <td class="button" style="border-collapse: collapse; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; padding: 30px 0;" align="center"> |  | ||||||
|               <div style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
| <!--[if mso]> |  | ||||||
|                 <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="http://" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f"> |  | ||||||
|                   <w:anchorlock/> |  | ||||||
|                   <center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">My Account</center> |  | ||||||
|                 </v:roundrect> |  | ||||||
|               <![endif]--><a href="{{base_url}}{% url 'hosting:virtual_machines' vm.id %}" style="border-radius: 5px; color: #ffffff; display: inline-block; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: regular; line-height: 45px; text-align: center; text-decoration: none !important; width: 155px; -webkit-text-size-adjust: none; mso-hide: all; background: #ff6f6f;">VM Dashboard</a> |  | ||||||
| </div> |  | ||||||
|             </td> |  | ||||||
|           </tr> |  | ||||||
| </table> |  | ||||||
| </center> |  | ||||||
|     </td> |  | ||||||
|   </tr> |  | ||||||
| <tr style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
| <td align="center" valign="top" width="100%" style="height: 100px; border-collapse: collapse; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #f7f7f7;" bgcolor="#f7f7f7"> |  | ||||||
|       <center style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
|         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
| <td style="border-collapse: collapse; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; padding: 25px 0;" align="center"> |  | ||||||
|               <strong style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">ungleich</strong><br style="font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"> |  | ||||||
| </td> |  | ||||||
|           </tr></table> |  | ||||||
| </center> |  | ||||||
|     </td> |  | ||||||
|   </tr> |  | ||||||
| </table> |  | ||||||
| </body> |  | ||||||
| </html> |  | ||||||
| 
 |  | ||||||
|  | @ -891,9 +891,10 @@ class VirtualMachineView(LoginRequiredMixin, View): | ||||||
|                 'Error terminating VM %s' % (opennebula_vm_id) |                 'Error terminating VM %s' % (opennebula_vm_id) | ||||||
|             ) |             ) | ||||||
|             return HttpResponseRedirect(self.get_success_url()) |             return HttpResponseRedirect(self.get_success_url()) | ||||||
| 
 |         order = HostingOrder.objects.filter(vm_id=vm.id).first() | ||||||
|         context = { |         context = { | ||||||
|             'vm': vm, |             'vm': vm, | ||||||
|  |             'order': order, | ||||||
|             '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') | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue