diff --git a/contentcuration/contentcuration/production_settings.py b/contentcuration/contentcuration/production_settings.py index e314ec98bb..da6a199125 100644 --- a/contentcuration/contentcuration/production_settings.py +++ b/contentcuration/contentcuration/production_settings.py @@ -12,8 +12,6 @@ MEDIA_ROOT = base_settings.STORAGE_ROOT -SITE_ID = int(get_secret("SITE_ID") or "1") - DEFAULT_FILE_STORAGE = 'contentcuration.utils.gcs_storage.GoogleCloudStorage' SESSION_ENGINE = "django.contrib.sessions.backends.db" diff --git a/contentcuration/contentcuration/static/img/le-logo-web.png b/contentcuration/contentcuration/static/img/le-logo-web.png new file mode 100644 index 0000000000..f58cfc662f Binary files /dev/null and b/contentcuration/contentcuration/static/img/le-logo-web.png differ diff --git a/contentcuration/contentcuration/templates/permissions/permissions_email.html b/contentcuration/contentcuration/templates/permissions/permissions_email.html index c3342b810c..21f3410bc0 100644 --- a/contentcuration/contentcuration/templates/permissions/permissions_email.html +++ b/contentcuration/contentcuration/templates/permissions/permissions_email.html @@ -79,8 +79,7 @@ color: #915194; } .message-signature-img{ - width:24px; - margin-right:10px; + width:145px; cursor:pointer; } .message-signature p{ @@ -114,9 +113,13 @@

{% translate "Hello" %} {% if is_new %}{{ user.email }}{% else %}{{
-

{% translate "Thanks for using our site!" %}

- -

The Learning Equality Team

+

+ {% translate "Thanks for using our site!" %}
+ {% translate "The Learning Equality Team" %} +

+ + +
{% endautoescape %} diff --git a/contentcuration/contentcuration/templates/registration/activation_email.html b/contentcuration/contentcuration/templates/registration/activation_email.html index 2a903797ee..3dd4bd23b8 100644 --- a/contentcuration/contentcuration/templates/registration/activation_email.html +++ b/contentcuration/contentcuration/templates/registration/activation_email.html @@ -77,8 +77,7 @@ color:white; } .message-signature-img{ - width:24px; - margin-right:10px; + width:145px; cursor:pointer; } .message-signature p{ @@ -107,9 +106,13 @@

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

-

{% translate "Thanks for using our site!" %}

- -

The Learning Equality Team

+

+ {% translate "Thanks for using our site!" %}
+ {% translate "The Learning Equality Team" %} +

+ + +
{% endautoescape %} diff --git a/contentcuration/contentcuration/templates/registration/password_reset_email.html b/contentcuration/contentcuration/templates/registration/password_reset_email.html index 6390e84fcc..366b26b366 100644 --- a/contentcuration/contentcuration/templates/registration/password_reset_email.html +++ b/contentcuration/contentcuration/templates/registration/password_reset_email.html @@ -77,8 +77,7 @@ color:white; } .message-signature-img{ - width:24px; - margin-right:10px; + width:145px; cursor:pointer; } .message-signature p{ @@ -107,9 +106,13 @@

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

-

{% translate "Thanks for using our site!" %}

- -

The Learning Equality Team

+

+ {% translate "Thanks for using our site!" %}
+ {% translate "The Learning Equality Team" %} +

+ + +
{% endautoescape %} diff --git a/contentcuration/contentcuration/templates/registration/welcome_new_user_email.html b/contentcuration/contentcuration/templates/registration/welcome_new_user_email.html index 768448ebd6..9347e39119 100644 --- a/contentcuration/contentcuration/templates/registration/welcome_new_user_email.html +++ b/contentcuration/contentcuration/templates/registration/welcome_new_user_email.html @@ -55,22 +55,14 @@ margin-top: 30px; } - .message-signature { - text-align: right; - position: absolute; - right: 5px; - bottom: 5px; - } - .message-signature * { margin: 0; padding: 0; } .message-signature-img { - width: 24px; + width: 145px; cursor: pointer; - vertical-align: middle; } .note { @@ -95,7 +87,6 @@ {% translate "View the Kolibri Content Library" %}

-

@@ -104,14 +95,12 @@ tag, differentiate, re-order, and distribute them into custom channels. {% endblocktranslate %}

-

{% blocktranslate %} 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. {% endblocktranslate %}

-

@@ -172,21 +161,21 @@

{% endautoescape %}