From 276e1890031cf9915888ed9bdd786112873fa4ea Mon Sep 17 00:00:00 2001
From: Muhammad Adeel Tajamul
 <77053848+muhammadadeeltajamul@users.noreply.github.com>
Date: Mon, 2 Jun 2025 16:24:06 +0500
Subject: [PATCH] chore: replaced tags in digest template (#36835)

---
 .../notifications/digest_content.html         | 127 +++++++++---------
 .../notifications/digest_footer.html          |  12 +-
 .../notifications/digest_header.html          |   2 +-
 .../edx_ace/email_digest/email/body.html      |   2 +-
 4 files changed, 71 insertions(+), 72 deletions(-)

diff --git a/openedx/core/djangoapps/notifications/templates/notifications/digest_content.html b/openedx/core/djangoapps/notifications/templates/notifications/digest_content.html
index d951de10be..05613ff8a0 100644
--- a/openedx/core/djangoapps/notifications/templates/notifications/digest_content.html
+++ b/openedx/core/djangoapps/notifications/templates/notifications/digest_content.html
@@ -1,69 +1,68 @@
 {% load i18n %}
 {% for notification_app in email_content %}
-    <h3 style="font-size: 22px; font-weight:700; line-height:28px; margin: 0.75rem 0 0;">
-        {{ notification_app.translated_title }}
-    </h3>
-    {% if notification_app.help_text %}
-        <p style="margin: 0; height: 1.5rem; font-weight: 400; font-size: 14px; line-height: 24px">
-            <span style="float:left; color:#707070;">
-                {{ notification_app.help_text }}
-            </span>
-            {% if notification_app.help_text_url %}
-                <span style="float:right; margin-right: 0.25rem">
-                    <a href="{{notification_app.help_text_url}}" style="text-decoration: none; color: #00688D">
-                        {% trans "View all" as tmsg %}{{ tmsg | force_escape }}
-                    </a>
+    <blockquote style="margin: 0 0 1rem">
+        <h3 style="font-size: 22px; font-weight:700; line-height:28px; margin: 0 0 1rem;">
+            {{ notification_app.translated_title }}
+        </h3>
+        {% if notification_app.help_text %}
+            <blockquote style="margin: 0; font-weight: 400; font-size: 14px; line-height: 24px">
+                <span style="float:left; color:#707070;">
+                    {{ notification_app.help_text }}
                 </span>
-            {% endif %}
-        </p>
-    {% endif %}
-    <p style="height: 1rem; margin: 0;" />
-    <p style="margin: 0;">
-        <table style="background-color: #FBFAF9; border-radius: 8px; padding: 0.5rem 0" width="100%">
-            <tbody>
-                {% for notification in notification_app.notifications %}
-                    <tr>
-                        <td align="left" valign="top" style="padding: 1rem 0 1rem 1rem">
-                            <img
-                                src="{{notification.icon}}"
-                                style="max-height: 28px; max-width: 28px; margin: 0.75rem 1rem 0.75rem 0"
-                            />
-                        </td>
-                        <td class="notification-content" width="100%" align="left" valign="top" style="padding: 1rem 1rem 1rem 0.5rem;">
-                            <blockquote style="font-size: 14px; font-weight:400; line-height:24px; color:#454545; margin: 0 0 0.5rem 0;">
-                                <style> strong {color: #00262B; font-weight:500} </style>
-                                {{ notification.email_content | truncatechars_html:600 | safe }}
-                            </blockquote>
-                            {% if notification.details %}
-                                <blockquote style="color:#454545; margin: 0 0 0.5rem 0; font-size: 14px; font-style: normal; font-weight: 400; line-height: 24px;">
-                                    {{ notification.details | safe }}
+                {% if notification_app.help_text_url %}
+                    <span style="float:right; margin-right: 0.25rem">
+                        <a href="{{notification_app.help_text_url}}" style="text-decoration: none; color: #00688D">
+                            {% trans "View all" as tmsg %}{{ tmsg | force_escape }}
+                        </a>
+                    </span>
+                {% endif %}
+            </blockquote>
+        {% endif %}
+        <blockquote style="margin: 0.5rem 0;">
+            <table style="background-color: #FBFAF9; border-radius: 8px; padding: 0" width="100%">
+                <tbody>
+                    {% for notification in notification_app.notifications %}
+                        <tr>
+                            <td align="left" valign="top" style="padding: 1rem 0 1rem 1rem">
+                                <img
+                                    src="{{notification.icon}}"
+                                    style="max-height: 28px; max-width: 28px; margin: 0.75rem 1rem 0.75rem 0"
+                                />
+                            </td>
+                            <td class="notification-content" width="100%" align="left" valign="top" style="padding: 1rem 1rem 1rem 0.5rem;">
+                                <blockquote style="font-size: 14px; font-weight:400; line-height:24px; color:#454545; margin: 0 0 0.25rem 0;">
+                                    <style> strong {color: #00262B; font-weight:500} </style>
+                                    {{ notification.email_content | truncatechars_html:600 | safe }}
                                 </blockquote>
-                            {% endif %}
-                            <blockquote style="color:#707070; margin: 0; font-size: 14px; font-style: normal; font-weight: 400; line-height: 24px;">
-                                <span style="float: left">
-                                    <span>{{ notification.course_name }}</span>
-                                    <span style="padding: 0 0.375rem">{{ "&middot;"|safe }}</span>
-                                    <span>{{ notification.time_ago }}</span>
-                                </span>
-                                <span style="float: right">
-                                    <a href="{{notification.content_url}}" style="text-decoration: none; color: #00688D">
-                                        {% trans "View" as tmsg %}{{ tmsg | force_escape }} {{ notification.view_text|default:""}}
-                                    </a>
-                                </span>
-                            </blockquote>
-                        </td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    </p>
-    <p style="height: 0.375rem; margin: 0;" />
-    {% if notification_app.show_remaining_count %}
-        <p style="margin: 0; height: 0.75rem; font-weight: 400; font-size: 14px; line-height: 24px;">
-            <a href="{{notification_app.url}}" style="color: #00688d; margin: 0; float:right; text-decoration: none;">
-                + {{ notification_app.remaining_count }} {% trans "more" as tmsg %}{{ tmsg | force_escape }}
-            </a>
-        </p>
-    {% endif %}
-    <p style="height: 0.375rem; margin: 0;" />
+                                {% if notification.details %}
+                                    <blockquote style="color:#454545; margin: 0.25rem 0 0.25rem; font-size: 14px; font-style: normal; font-weight: 400; line-height: 24px;">
+                                        {{ notification.details | safe }}
+                                    </blockquote>
+                                {% endif %}
+                                <blockquote style="color:#707070; margin: 0 0 0.25rem; font-size: 14px; font-style: normal; font-weight: 400; line-height: 24px;">
+                                    <span style="float: left">
+                                        <span>{{ notification.course_name }}</span>
+                                        <span style="padding: 0 0.375rem">{{ "&middot;"|safe }}</span>
+                                        <span>{{ notification.time_ago }}</span>
+                                    </span>
+                                    <span style="float: right">
+                                        <a href="{{notification.content_url}}" style="text-decoration: none; color: #00688D">
+                                            {% trans "View" as tmsg %}{{ tmsg | force_escape }} {{ notification.view_text|default:""}}
+                                        </a>
+                                    </span>
+                                </blockquote>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </blockquote>
+        {% if notification_app.show_remaining_count %}
+            <blockquote style="margin: 0 0 0.375rem; height: 0.75rem; font-weight: 400; font-size: 14px; line-height: 24px;">
+                <a href="{{notification_app.url}}" style="color: #00688d; margin: 0 1rem 0 0; float:right; text-decoration: none;">
+                    + {{ notification_app.remaining_count }} {% trans "more" as tmsg %}{{ tmsg | force_escape }}
+                </a>
+            </blockquote>
+        {% endif %}
+    </blockquote>
 {% endfor %}
diff --git a/openedx/core/djangoapps/notifications/templates/notifications/digest_footer.html b/openedx/core/djangoapps/notifications/templates/notifications/digest_footer.html
index ae5c6b4699..80e9f681cc 100644
--- a/openedx/core/djangoapps/notifications/templates/notifications/digest_footer.html
+++ b/openedx/core/djangoapps/notifications/templates/notifications/digest_footer.html
@@ -31,25 +31,25 @@
         </tr>
         <tr>
             <td>
-                <p style="margin: 1.5rem 0 0 0;">
+                <blockquote style="margin: 1rem 0 0;">
                     {% if footer_email_reason %}
                         {{ footer_email_reason }}
                     {% else %}
                         {% trans "You are receiving this email because you have subscribed to email digest" as tmsg %}{{ tmsg | force_escape }}
                     {% endif %}
-                </p>
-                <p style="margin: 0.625rem 0">
+                </blockquote>
+                <blockquote style="margin: 0.625rem 0">
                     <a href="{{notification_settings_url}}" rel="noopener noreferrer" target="_blank" style="color: black">
                         {% trans "Notification Settings" as tmsg %}{{ tmsg | force_escape }}
                     </a>
                     <a href="{{unsubscribe_url}}" rel="noopener noreferrer" target="_blank" style="color: black; margin-left: 1rem">
                         {% trans "Unsubscribe from email digest for learning activity" as tmsg %}{{ tmsg | force_escape }}
                     </a>
-                </p>
-                <p>
+                </blockquote>
+                <blockquote style="margin: 0">
                     &copy; {% now "Y" %} {{ platform_name }}. {% trans "All rights reserved" as tmsg %}{{ tmsg | force_escape }} <br/>
                     {{ mailing_address }}
-                </p>
+                </blockquote>
             </td>
         </tr>
     </tbody>
diff --git a/openedx/core/djangoapps/notifications/templates/notifications/digest_header.html b/openedx/core/djangoapps/notifications/templates/notifications/digest_header.html
index 71443b6fb1..4d2c91c180 100644
--- a/openedx/core/djangoapps/notifications/templates/notifications/digest_header.html
+++ b/openedx/core/djangoapps/notifications/templates/notifications/digest_header.html
@@ -46,7 +46,7 @@
         <tr style="height: 24px"></tr>
         <tr align="center">
             <td>
-                <table width="100%" border="0" cellpadding="0">
+                <table width="100%" align="center" border="0" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             {% for update in email_digest_updates %}
diff --git a/openedx/core/djangoapps/notifications/templates/notifications/edx_ace/email_digest/email/body.html b/openedx/core/djangoapps/notifications/templates/notifications/edx_ace/email_digest/email/body.html
index e1e69eca51..1963dc0998 100644
--- a/openedx/core/djangoapps/notifications/templates/notifications/edx_ace/email_digest/email/body.html
+++ b/openedx/core/djangoapps/notifications/templates/notifications/edx_ace/email_digest/email/body.html
@@ -12,7 +12,7 @@
                 </td>
             </tr>
             <tr>
-                <td style="padding:0.75rem 1.5rem; background-color:white">
+                <td style="padding:1.5rem; background-color:white">
                     {% include 'notifications/digest_content.html' %}
                 </td>
             </tr>