From e19696622638f618a31d632eac960b9d97da2759 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Wed, 21 Aug 2024 18:16:59 +0500 Subject: [PATCH 1/2] email logo fixed, some changes in email text --- src/templates/emails/base_email.html | 11 ++++++++--- .../organizer/participation_accepted.html | 8 ++++++-- .../organizer/participation_accepted.txt | 8 ++++++-- .../participation/organizer/participation_denied.html | 8 ++++++-- .../participation/organizer/participation_denied.txt | 8 ++++++-- .../organizer/participation_requested.html | 8 ++++++-- .../organizer/participation_requested.txt | 8 ++++++-- 7 files changed, 44 insertions(+), 15 deletions(-) diff --git a/src/templates/emails/base_email.html b/src/templates/emails/base_email.html index 9ea0c1a89..6e4c5e522 100644 --- a/src/templates/emails/base_email.html +++ b/src/templates/emails/base_email.html @@ -21,7 +21,10 @@ background-color: #ffffff; } .header_img { - width: 40%; + width: 100%; + height: 100%; + object-fit: contain; + box-sizing: border-box; } .header { width: 100%; @@ -31,6 +34,8 @@ justify-content: center; align-items: center; margin-bottom: 10px; + padding: 10px; + box-sizing: border-box; } .content{ padding: 20px; @@ -105,13 +110,13 @@

Hello{% if user %} {{ user.username }}{% endif %},

Thanks,

Codabench Team

- codabench_logo + Codabench Logo
{% endif %} diff --git a/src/templates/emails/participation/organizer/participation_accepted.html b/src/templates/emails/participation/organizer/participation_accepted.html index f25d3dfc9..d0942e6c3 100644 --- a/src/templates/emails/participation/organizer/participation_accepted.html +++ b/src/templates/emails/participation/organizer/participation_accepted.html @@ -1,6 +1,10 @@ {% extends 'emails/base_email.html' %} {% block content %} -

We're writing to inform you that user {{ participant.user.username }} has been accepted into your competition - {{ participant.competition.title }}.You can manage all participants from the admin panel of your competition.

+

+ User {{ participant.user.username }} has been accepted into your competition + {{ participant.competition.title }}. +
+ You can manage all participants from the admin panel of your competition. +

{% endblock %} diff --git a/src/templates/emails/participation/organizer/participation_accepted.txt b/src/templates/emails/participation/organizer/participation_accepted.txt index f25d3dfc9..d0942e6c3 100644 --- a/src/templates/emails/participation/organizer/participation_accepted.txt +++ b/src/templates/emails/participation/organizer/participation_accepted.txt @@ -1,6 +1,10 @@ {% extends 'emails/base_email.html' %} {% block content %} -

We're writing to inform you that user {{ participant.user.username }} has been accepted into your competition - {{ participant.competition.title }}.You can manage all participants from the admin panel of your competition.

+

+ User {{ participant.user.username }} has been accepted into your competition + {{ participant.competition.title }}. +
+ You can manage all participants from the admin panel of your competition. +

{% endblock %} diff --git a/src/templates/emails/participation/organizer/participation_denied.html b/src/templates/emails/participation/organizer/participation_denied.html index 43ec224c0..6d19430e9 100644 --- a/src/templates/emails/participation/organizer/participation_denied.html +++ b/src/templates/emails/participation/organizer/participation_denied.html @@ -1,6 +1,10 @@ {% extends 'emails/base_email.html' %} {% block content %} -

We're writing to inform you that user {{ participant.user.username }} has been denied to your competition - {{ participant.competition.title }}.You can manage all participants from the admin panel of your competition.

+

+ A user {{ participant.user.username }} has been denied access to your competition. + {{ participant.competition.title }}. +
+ You can manage all participants from the admin panel of your competition. +

{% endblock %} diff --git a/src/templates/emails/participation/organizer/participation_denied.txt b/src/templates/emails/participation/organizer/participation_denied.txt index 43ec224c0..6d19430e9 100644 --- a/src/templates/emails/participation/organizer/participation_denied.txt +++ b/src/templates/emails/participation/organizer/participation_denied.txt @@ -1,6 +1,10 @@ {% extends 'emails/base_email.html' %} {% block content %} -

We're writing to inform you that user {{ participant.user.username }} has been denied to your competition - {{ participant.competition.title }}.You can manage all participants from the admin panel of your competition.

+

+ A user {{ participant.user.username }} has been denied access to your competition. + {{ participant.competition.title }}. +
+ You can manage all participants from the admin panel of your competition. +

{% endblock %} diff --git a/src/templates/emails/participation/organizer/participation_requested.html b/src/templates/emails/participation/organizer/participation_requested.html index dad10d911..9adfe5c73 100644 --- a/src/templates/emails/participation/organizer/participation_requested.html +++ b/src/templates/emails/participation/organizer/participation_requested.html @@ -1,6 +1,10 @@ {% extends 'emails/base_email.html' %} {% block content %} -

We're writing to inform you that user {{ participant.user.username }} has requested access to your competition - {{ participant.competition.title }}.You can manage all participants from the admin panel of your competition.

+

+ A user {{ participant.user.username }} has requested access to your competition + {{ participant.competition.title }}. +
+ You can manage all participants from the admin panel of your competition. +

{% endblock %} diff --git a/src/templates/emails/participation/organizer/participation_requested.txt b/src/templates/emails/participation/organizer/participation_requested.txt index dad10d911..9adfe5c73 100644 --- a/src/templates/emails/participation/organizer/participation_requested.txt +++ b/src/templates/emails/participation/organizer/participation_requested.txt @@ -1,6 +1,10 @@ {% extends 'emails/base_email.html' %} {% block content %} -

We're writing to inform you that user {{ participant.user.username }} has requested access to your competition - {{ participant.competition.title }}.You can manage all participants from the admin panel of your competition.

+

+ A user {{ participant.user.username }} has requested access to your competition + {{ participant.competition.title }}. +
+ You can manage all participants from the admin panel of your competition. +

{% endblock %} From ab7cfa541575dd51fdf8781aef1d6e52fbd2c209 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Wed, 21 Aug 2024 19:24:24 +0500 Subject: [PATCH 2/2] participant side email templates updated --- .../participant/participation_accepted.html | 9 +++++---- .../participant/participation_accepted.txt | 9 +++++---- .../participant/participation_denied.html | 10 ++++------ .../participant/participation_denied.txt | 11 ++++------- .../participation_organizer_direct_email.html | 9 +++++---- .../participation_organizer_direct_email.txt | 11 +++++++---- .../participant/participation_requested.html | 17 +++++++++-------- .../participant/participation_requested.txt | 17 +++++++++-------- 8 files changed, 48 insertions(+), 45 deletions(-) diff --git a/src/templates/emails/participation/participant/participation_accepted.html b/src/templates/emails/participation/participant/participation_accepted.html index 27a0ddfd9..d125565df 100644 --- a/src/templates/emails/participation/participant/participation_accepted.html +++ b/src/templates/emails/participation/participant/participation_accepted.html @@ -1,10 +1,11 @@ {% extends 'emails/base_email.html' %} {% block content %} -

We're thrilled to inform you that your application for the - {{ participant.competition.title }} - competition has been accepted. Get ready to showcase your skills and compete with other talented individuals.

-

We look forward to seeing your participation.

+

+ Your application for the + {{ participant.competition.title }} + competition has been accepted. Get ready to showcase your skills and compete with other talented individuals. +

{% endblock %} diff --git a/src/templates/emails/participation/participant/participation_accepted.txt b/src/templates/emails/participation/participant/participation_accepted.txt index 27a0ddfd9..d125565df 100644 --- a/src/templates/emails/participation/participant/participation_accepted.txt +++ b/src/templates/emails/participation/participant/participation_accepted.txt @@ -1,10 +1,11 @@ {% extends 'emails/base_email.html' %} {% block content %} -

We're thrilled to inform you that your application for the - {{ participant.competition.title }} - competition has been accepted. Get ready to showcase your skills and compete with other talented individuals.

-

We look forward to seeing your participation.

+

+ Your application for the + {{ participant.competition.title }} + competition has been accepted. Get ready to showcase your skills and compete with other talented individuals. +

{% endblock %} diff --git a/src/templates/emails/participation/participant/participation_denied.html b/src/templates/emails/participation/participant/participation_denied.html index 23d4701be..9bef8c5ca 100644 --- a/src/templates/emails/participation/participant/participation_denied.html +++ b/src/templates/emails/participation/participant/participation_denied.html @@ -1,12 +1,10 @@ {% extends 'emails/base_email.html' %} {% block content %} -

We're writing to inform you about your application for the - {{ participant.competition.title }} - competition. While your application was carefully considered, we regret to inform you that your participation privileges - have been denied. We encourage you to review the competition details and rules to see if there are areas where you can - improve your application for future competitions.

-

Thank you for your interest in the competition. We wish you the best of luck in your future endeavors. +

+ Your application for the + {{ participant.competition.title }} + competition has been denied. You can reach out to the organizing team for more details.

{% endblock %} diff --git a/src/templates/emails/participation/participant/participation_denied.txt b/src/templates/emails/participation/participant/participation_denied.txt index 23d4701be..4b592667a 100644 --- a/src/templates/emails/participation/participant/participation_denied.txt +++ b/src/templates/emails/participation/participant/participation_denied.txt @@ -1,14 +1,11 @@ {% extends 'emails/base_email.html' %} {% block content %} -

We're writing to inform you about your application for the - {{ participant.competition.title }} - competition. While your application was carefully considered, we regret to inform you that your participation privileges - have been denied. We encourage you to review the competition details and rules to see if there are areas where you can - improve your application for future competitions.

-

Thank you for your interest in the competition. We wish you the best of luck in your future endeavors. +

+ Your application for the + {{ participant.competition.title }} + competition has been denied. You can reach out to the organizing team for more details.

- {% endblock %} diff --git a/src/templates/emails/participation/participant/participation_organizer_direct_email.html b/src/templates/emails/participation/participant/participation_organizer_direct_email.html index 715d61d23..ad5b88dc1 100644 --- a/src/templates/emails/participation/participant/participation_organizer_direct_email.html +++ b/src/templates/emails/participation/participant/participation_organizer_direct_email.html @@ -1,13 +1,14 @@ {% extends 'emails/base_email.html' %} {% block title %} -

This is a message from the organizer for the competition:

- {{ competition }} - +

+ This is a message from the organizer for the competition: + {{ competition }} +



{% endblock %} {% block content %}

Message:

-
{{ body }}
+ 
{{ body }}
{% endblock %} diff --git a/src/templates/emails/participation/participant/participation_organizer_direct_email.txt b/src/templates/emails/participation/participant/participation_organizer_direct_email.txt index ecb20a46a..44e044305 100644 --- a/src/templates/emails/participation/participant/participation_organizer_direct_email.txt +++ b/src/templates/emails/participation/participant/participation_organizer_direct_email.txt @@ -1,11 +1,14 @@ {% extends 'emails/base_email.txt' %} {% block title %} -This is a message from the organizer for the competition: -{{ competition }} -> http://{{ site.domain }}{{ competition.get_absolute_url }} +

+ This is a message from the organizer for the competition: + {{ competition }} +

+

{% endblock %} {% block content %} -Message: -{{ body }} +

Message:

+ 
{{ body }}
{% endblock %} diff --git a/src/templates/emails/participation/participant/participation_requested.html b/src/templates/emails/participation/participant/participation_requested.html index 582d174b5..3412695c7 100644 --- a/src/templates/emails/participation/participant/participation_requested.html +++ b/src/templates/emails/participation/participant/participation_requested.html @@ -1,12 +1,13 @@ {% extends 'emails/base_email.html' %} {% block content %} -

Thanks for your interest in the - {{ participant.competition.title }} - competition. We have received your request to participate.

- -

We will carefully review your application and notify you by email regarding your participation status (accepted or denied). - In the meantime, you can review the competition details and rules to familiarize yourself with the challenge.

- -

We look forward to your participation!

+

+ Thank you for your interest in the + {{ participant.competition.title }} + competition. We have received your request to participate. +

+

+ We will carefully review your application and notify you by email regarding your participation status (accepted or denied). + In the meantime, you can review the competition details and rules to familiarize yourself with the challenge. +

{% endblock %} diff --git a/src/templates/emails/participation/participant/participation_requested.txt b/src/templates/emails/participation/participant/participation_requested.txt index 582d174b5..3412695c7 100644 --- a/src/templates/emails/participation/participant/participation_requested.txt +++ b/src/templates/emails/participation/participant/participation_requested.txt @@ -1,12 +1,13 @@ {% extends 'emails/base_email.html' %} {% block content %} -

Thanks for your interest in the - {{ participant.competition.title }} - competition. We have received your request to participate.

- -

We will carefully review your application and notify you by email regarding your participation status (accepted or denied). - In the meantime, you can review the competition details and rules to familiarize yourself with the challenge.

- -

We look forward to your participation!

+

+ Thank you for your interest in the + {{ participant.competition.title }} + competition. We have received your request to participate. +

+

+ We will carefully review your application and notify you by email regarding your participation status (accepted or denied). + In the meantime, you can review the competition details and rules to familiarize yourself with the challenge. +

{% endblock %}