From 560cc8462329fa3fb27d44a4cdac8c5307d1f15b Mon Sep 17 00:00:00 2001 From: Blaine Jester Date: Thu, 27 Jan 2022 12:11:48 -0800 Subject: [PATCH] Formatting and copy tweaks --- .../registration/activation_email.html | 2 +- .../registration_welcome_new_user_email.html | 321 +++++++++--------- .../contentcuration/views/users.py | 4 +- 3 files changed, 172 insertions(+), 155 deletions(-) diff --git a/contentcuration/contentcuration/templates/registration/activation_email.html b/contentcuration/contentcuration/templates/registration/activation_email.html index 6958865735..bd9b23a497 100644 --- a/contentcuration/contentcuration/templates/registration/activation_email.html +++ b/contentcuration/contentcuration/templates/registration/activation_email.html @@ -89,7 +89,7 @@ {% autoescape off %}

{% trans "Hello" %} {{ user.first_name }},

-

{% trans "Welcome to Kolibri! Here is the link to activate your account:" %}

+

{% trans "Welcome to Kolibri Studio! Here is the link to activate your account:" %}

diff --git a/contentcuration/contentcuration/templates/registration/registration_welcome_new_user_email.html b/contentcuration/contentcuration/templates/registration/registration_welcome_new_user_email.html index 0cbb5e947b..117338a2bb 100644 --- a/contentcuration/contentcuration/templates/registration/registration_welcome_new_user_email.html +++ b/contentcuration/contentcuration/templates/registration/registration_welcome_new_user_email.html @@ -2,155 +2,172 @@ {% load i18n %} {% load static %} - - - - - - - {% autoescape off %} -
-
-

Welcome to Kolibri Studio !

-
-
- We’re delighted to introduce you to - Kolibri Studio, - our curricular tool to add, organize, and manage your own resources or those - from the Kolibri Content Library. -
-
-
- Using Kolibri Studio, you can explore pre-organized collections of open educational - resources (OER), and bundle, tag, differentiate, re-order, and distribute them into - custom channels. Using an admin account, you can then publish and import these custom - channels--either your own or those shared with you -- into Kolibri with a unique - “token” generated for each channel. -
-
-
- Our public channels are available under “Content Library”, whose offerings continue - to grow. Email content@learningequality.org - with any recommendations that you would like to see included in the Library for public use. -
-
-
- Browse through the list of resources below* to learn more about Kolibri Studio and to - begin creating your own custom channels: - -
-
- If you need support with Kolibri Studio, please reach out to us on our - Community Forum. -

- Thank You !
- The Learning Equality Team
-
-

- - - The Learning Equality Team - -

-

*resources are presented in English

-
-
-
- {% endautoescape %} - - \ No newline at end of file + + + + + + +{% autoescape off %} +
+
+

Welcome to Kolibri Studio !

+
+
+ We're delighted to introduce you to + Kolibri Studio, + our curricular tool to add, organize, and manage your own resources or those + from the Kolibri Content Library. +
+
+
+ Using Kolibri Studio, you can explore pre-organized collections of open educational + resources (OER), and bundle, tag, differentiate, re-order, and distribute them into + custom channels. Using an admin account, you can then publish and import these custom + channels--either your own or those shared with you -- into Kolibri with a unique + "token" generated for each channel. +
+
+
+ Our public channels are available under "Content Library", whose offerings continue + to grow. Email content@learningequality.org + with any recommendations that you would like to see included in the Library for public use. +
+
+
+ Browse through the list of resources below* to learn more about Kolibri Studio and to + begin creating your own custom channels: + +
+
+ If you need support with Kolibri Studio, please reach out to us on our + Community Forum. +

+ Thank You!
+ The Learning Equality Team
+
+

+ + + The Learning Equality Team + +

+

*resources are presented in English

+
+
+
+{% endautoescape %} + + diff --git a/contentcuration/contentcuration/views/users.py b/contentcuration/contentcuration/views/users.py index b1b68fbfb6..ad7b9a6752 100644 --- a/contentcuration/contentcuration/views/users.py +++ b/contentcuration/contentcuration/views/users.py @@ -254,13 +254,13 @@ def activate(self, *args, **kwargs): [settings.REGISTRATION_INFORMATION_EMAIL], ) # Send email to welcome new user - subject = "Welcome to Kolibri Studio. !" + subject = "Thank you for activating your Kolibri Studio account! Let's get started..." message = render_to_string("registration/registration_welcome_new_user_email.html", {}) user.email_user( subject, message, settings.DEFAULT_FROM_EMAIL, - html_message = message + html_message=message ) return user