Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert pull request #22042

Browse Source 
Revert "Fix code quality test failures"

This reverts commit 8c55e11d1f.

Revert "Fix celery send_activation_email task failure"

This reverts commit 810eea0e51.

Revert "Convert Account Activation Emails to edx-ACE"

This reverts commit 7984c37a4f.
This commit is contained in:
Ned Batchelder
2019-10-18 15:29:02 -04:00
parent 05ab349c88
commit ea30aba6fc
19 changed files with 228 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
common/templates/student/edx_ace/accountactivation/email/body.html
View File

@@ -1,69 +0,0 @@
{% extends 'ace_common/edx_ace/common/base_body.html' %}
{% load django_markup %}
{% load i18n %}
{% load static %}
{% block content %}
<table width="100%" align="left" border="0" cellpadding="0" cellspacing="0" role="presentation">
{% if route_enabled %}
<tr>
<td>
<p style="color: rgba(0,0,0,.75);">
{% filter force_escape %}
{% blocktrans %}This is a routed Account Activation email for {{ routed_user }} ({{ routed_user_email }}): {{ routed_profile_name }}{% endblocktrans %}
{% endfilter %}
<br />
</p>
</td>
</tr>
{% endif %}
<tr>
<td>
<h1>
{% trans "Account Activation" as header_msg %}{{ header_msg | force_escape }}
</h1>
<p style="color: rgba(0,0,0,.75);">
{% filter force_escape %}
{% blocktrans %}You're almost there! Use the link below to activate your account to access engaging, high-quality {{ platform_name }} courses. Note that you will not be able to log back into your account until you have activated it.{% endblocktrans %}
{% endfilter %}
<br />
</p>
{% trans "Activate Your Account" as course_cta_text %}{{ course_cta_text | force_escape }}
{% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=confirm_activation_link %}
</td>
</tr>
<tr>
<td>
<p style="color: rgba(0,0,0,.75);">
{% filter force_escape %}
{% blocktrans %}Enjoy learning with {{ platform_name }}.{% endblocktrans %}
{% endfilter %}
<br />
</p>
</td>
</tr>
<td>
<p style="color: rgba(0,0,0,.75);">
{% blocktrans trimmed asvar assist_msg %}
If you need help, please use our web form at {start_anchor_web}{{ support_url }}{end_anchor} or email {start_anchor_email}{{ support_email }}{end_anchor}.
{% endblocktrans %}
{% interpolate_html assist_msg start_anchor_web='<a href="'|add:support_url|add:'">'|safe start_anchor_email='<a href="mailto:'|add:support_email|add:'">'|safe end_anchor='</a>'|safe %}
<br />
</p>
</td>
<tr>
</tr>
<tr>
<td>
<p style="color: rgba(0,0,0,.75);">
{% filter force_escape %}
{% blocktrans %}This email message was automatically sent by {{ lms_url }} because someone attempted to create an account on {{ platform_name }} using this email address.{% endblocktrans %}
{% endfilter %}
<br />
</p>
</td>
</tr>
</table>
{% endblock %}

11
common/templates/student/edx_ace/accountactivation/email/body.txt
View File

@@ -1,11 +0,0 @@
{% load i18n %}{% autoescape off %}
{% blocktrans %}You're almost there! Use the link below to activate your account to access engaging, high-quality {{ platform_name }} courses. Note that you will not be able to log back into your account until you have activated it.{% endblocktrans %}
{{ confirm_activation_link }}
{% blocktrans %}Enjoy learning with {{ platform_name }}.{% endblocktrans %}
{% blocktrans %}If you need help, please use our web form at {{ support_url }} or email {{ support_email }}.{% endblocktrans %}
{% blocktrans %}This email message was automatically sent by {{ lms_url }} because someone attempted to create an account on {{ platform_name }} using this email address.{% endblocktrans %}
{% endautoescape %}

1
common/templates/student/edx_ace/accountactivation/email/from_name.txt
View File

@@ -1 +0,0 @@
{{ platform_name }}

1
common/templates/student/edx_ace/accountactivation/email/head.html
View File

@@ -1 +0,0 @@
{% extends 'ace_common/edx_ace/common/base_head.html' %}

4
common/templates/student/edx_ace/accountactivation/email/subject.txt
View File

@@ -1,4 +0,0 @@
{% load i18n %}
{% autoescape off %}
{% blocktrans trimmed %}Action Required: Activate your {{ platform_name }} account{% endblocktrans %}
{% endautoescape %}