Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
de072f8d
Unverified
Commit
de072f8d
authored
Oct 18, 2017
by
Tyler Hallada
Committed by
Gabe Mulley
Oct 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update upgrade_reminder template for multi-course
parent
97248433
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
71 additions
and
9 deletions
+71
-9
openedx/core/djangoapps/schedules/tasks.py
+8
-2
openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html
+35
-4
openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.txt
+18
-1
openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/from_name.txt
+5
-1
openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/subject.txt
+5
-1
No files found.
openedx/core/djangoapps/schedules/tasks.py
View file @
de072f8d
...
...
@@ -232,8 +232,14 @@ def _upgrade_reminder_schedules_for_bin(site, current_datetime, target_datetime,
'student_name'
:
user
.
profile
.
name
,
'user_personal_address'
:
user
.
profile
.
name
if
user
.
profile
.
name
else
user
.
username
,
'course_name'
:
first_schedule
.
enrollment
.
course
.
display_name
,
'course_url'
:
absolute_url
(
site
,
reverse
(
'course_root'
,
args
=
[
str
(
first_schedule
.
enrollment
.
course_id
)])),
'course_links'
:
[
{
'url'
:
absolute_url
(
site
,
reverse
(
'course_root'
,
args
=
[
str
(
s
.
enrollment
.
course_id
)])),
'name'
:
s
.
enrollment
.
course
.
display_name
}
for
s
in
user_schedules
],
'first_course_name'
:
first_schedule
.
enrollment
.
course
.
display_name
,
# This is used by the bulk email optout policy
'course_ids'
:
course_id_strs
,
...
...
openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.html
View file @
de072f8d
...
...
@@ -3,12 +3,23 @@
{% load static %}
{% block preview_text %}
{% if course_ids|length > 1 %}
{% blocktrans trimmed %}
We hope you are enjoying learning with us so far in {{ course
_name }}! A verified certificate
We hope you are enjoying learning with us so far on {{ platform
_name }}! A verified certificate
will allow you to highlight your new knowledge and skills. It's official, and easily shareable.
Upgrade by {{ user_schedule_upgrade_deadline_time }}.
{% endblocktrans %}
{% else %}
{% blocktrans trimmed %}
We hope you are enjoying learning with us so far in {{ first_course_name }}! A verified certificate
will allow you to highlight your new knowledge and skills. It's official, and easily shareable.
Upgrade by {{ user_schedule_upgrade_deadline_time }}.
{% endblocktrans %}
{% endif %}
{% blocktrans trimmed %}
{% endblocktrans %}
{% endblock %}
{% block content %}
...
...
@@ -18,11 +29,19 @@
<h1>
{% trans "Upgrade now" %}
</h1>
<p>
{% if course_ids|length > 1 %}
{% blocktrans trimmed %}
We hope you are enjoying learning with us so far in
<strong>
{{ course
_name }}
</strong>
! A
We hope you are enjoying learning with us so far on
<strong>
{{ platform
_name }}
</strong>
! A
verified certificate will allow you to highlight your new knowledge and skills. It's official,
and easily shareable.
{% endblocktrans %}
{% else %}
{% blocktrans trimmed %}
We hope you are enjoying learning with us so far in
<strong>
{{ first_course_name }}
</strong>
! A
verified certificate will allow you to highlight your new knowledge and skills. It's official,
and easily shareable.
{% endblocktrans %}
{% endif %}
</p>
<p>
{% blocktrans trimmed %}
...
...
@@ -30,7 +49,16 @@
{% endblocktrans %}
</p>
<a
href=
"{{ upsell_link }}"
>
{% if course_ids|length > 1 and course_ids|length
<
10
%}
<
ul
style=
"margin-bottom: 30px;"
>
{% for course_link in course_links %}
<li>
<a
href=
"{{ course_link.url }}"
>
{{ course_link.name }}
</a>
</li>
{% endfor %}
</ul>
{% endif %}
<img
src=
"{{ cert_image }}"
alt=
"{% trans 'Example print-out of a verified certificate' %}"
...
...
@@ -45,12 +73,15 @@
border-right: 3px solid lightgray;
border-left: 1px solid lightgray;
"
/>
</a>
<p>
{# email client support for style sheets is pretty spotty, so we have to inline all of these styles #}
<a
{%
if
course_ids
|
length =
=
1
%}
href=
"{{ upsell_link }}"
{%
else
%}
href=
"{{ dashboard_url }}"
{%
endif
%}
style=
"
color: #ffffff;
text-decoration: none;
...
...
openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/body.txt
View file @
de072f8d
{% load i18n %}
{% if course_ids|length > 1 %}
{% blocktrans trimmed %}
We hope you are enjoying learning with us so far in {{ course_name }}! A verified certificate
We hope you are enjoying learning with us so far on {{ platform_name }}! A verified certificate
will allow you to highlight your new knowledge and skills. It's official, and easily shareable.
Upgrade by {{ user_schedule_upgrade_deadline_time }}.
{% endblocktrans %}
{% if course_ids|length > 1 and course_ids|length < 10 %}
{% for course_link in course_links %}
* {{ course_link.name }} <{{ course_link.url }}>
{% endfor %}
{% endif %}
{% trans "Upgrade now at" %} <{{ dashboard_url }}>
{% else %}
{% blocktrans trimmed %}
We hope you are enjoying learning with us so far in {{ first_course_name }}! A verified certificate
will allow you to highlight your new knowledge and skills. It's official, and easily shareable.
Upgrade by {{ user_schedule_upgrade_deadline_time }}.
{% endblocktrans %}
{% trans "Upgrade now at" %} <{{ upsell_link }}>
{% endif %}
openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/from_name.txt
View file @
de072f8d
{{ course_name }}
{% if course_ids|length > 1 %}
{{ platform_name }}
{% else %}
{{ first_course_name }}
{% endif %}
openedx/core/djangoapps/schedules/templates/schedules/edx_ace/upgradereminder/email/subject.txt
View file @
de072f8d
{% load i18n %}
{% blocktrans %}Upgrade to earn a verified certificate in {{ course_name }}{% endblocktrans %}
{% if course_ids|length > 1 %}
{% blocktrans %}Upgrade to earn a verified certificate on {{ platform_name }}{% endblocktrans %}
{% else %}
{% blocktrans %}Upgrade to earn a verified certificate in {{ first_course_name }}{% endblocktrans %}
{% endif %}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment