Merge pull request #447 from HEPData/fix-email-text-wrap

Add white-space:pre-wrap back into emails
HEPData · Dec 1, 2021 · 85cd519 · 85cd519
2 parents 9a974c5 + 9cfc6bd
commit 85cd519
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/hepdata/modules/theme/templates/hepdata_theme/email/coordinator_request.html b/hepdata/modules/theme/templates/hepdata_theme/email/coordinator_request.html
@@ -14,7 +14,7 @@
         <p>
             <b>A message has been supplied:</b>
         </p>
-        <pre style="padding-left:20px;font-family:'Lato',sans-serif;">{{ message }}</pre>
+        <pre style="white-space:pre-wrap;padding-left:20px;font-family:'Lato',sans-serif;">{{ message }}</pre>
     {% endif %}
 
     <p>

diff --git a/hepdata/modules/theme/templates/hepdata_theme/email/invite.html b/hepdata/modules/theme/templates/hepdata_theme/email/invite.html
@@ -49,7 +49,7 @@
         <p>
             <b>A message has been supplied by the Coordinator ({{ coordinator_email }}). </b>
         </p>
-        <pre style="padding-left:20px;font-family:'Lato',sans-serif;">{{ message }}</pre>
+        <pre style="white-space:pre-wrap;padding-left:20px;font-family:'Lato',sans-serif;">{{ message }}</pre>
     {% endif %}
 
     <p>

diff --git a/hepdata/modules/theme/templates/hepdata_theme/email/passed_review.html b/hepdata/modules/theme/templates/hepdata_theme/email/passed_review.html
@@ -15,7 +15,7 @@
 
     {% if message %}
         <p style="font-weight: bolder">Message:</p>
-        <pre style="padding-left:20px;font-family:'Lato',sans-serif;font-weight:lighter;">{{ message }}</pre>
+        <pre style="white-space:pre-wrap;padding-left:20px;font-family:'Lato',sans-serif;font-weight:lighter;">{{ message }}</pre>
     {% endif %}
 
     <p>The submission is now ready to be finalised{% if collaboration %} for {{ collaboration }}{% endif %}, which can be done from your <a href="{{ dashboard_link }}">HEPData dashboard</a>.</p>

diff --git a/hepdata/modules/theme/templates/hepdata_theme/email/question.html b/hepdata/modules/theme/templates/hepdata_theme/email/question.html
@@ -11,7 +11,7 @@
     in HEPData.</p>
 
     <p style="font-weight: bolder">Message:</p>
-    <pre style="padding-left:20px;font-family:'Lato',sans-serif;font-weight:lighter;">{{ message }}</pre>
+    <pre style="white-space:pre-wrap;padding-left:20px;font-family:'Lato',sans-serif;font-weight:lighter;">{{ message }}</pre>
 
     <br/>
     <hr>

diff --git a/hepdata/modules/theme/templates/hepdata_theme/email/review-message.html b/hepdata/modules/theme/templates/hepdata_theme/email/review-message.html
@@ -11,7 +11,7 @@
         from {{ actor }}.</p>
 
     <p style="font-weight: bolder">Message:</p>
-    <pre style="padding-left:20px;font-family:'Lato',sans-serif;font-weight:lighter;">{{ table_message }}</pre>
+    <pre style="white-space:pre-wrap;padding-left:20px;font-family:'Lato',sans-serif;font-weight:lighter;">{{ table_message }}</pre>
 
     <p>You can view the table <a href="{{ table_link }}" style="color: #9b59b6">here</a>.
     </p>

diff --git a/hepdata/modules/theme/templates/hepdata_theme/email/submission_status.html b/hepdata/modules/theme/templates/hepdata_theme/email/submission_status.html
@@ -36,7 +36,7 @@
 
     {% if message %}
         <p style="font-weight: bolder">Message:</p>
-        <pre style="font-family:'Lato',sans-serif;font-weight:lighter;">{{ message }}</pre>
+        <pre style="white-space:pre-wrap;font-family:'Lato',sans-serif;font-weight:lighter;">{{ message }}</pre>
     {% endif %}
 
     {% if show_detail %}
@@ -66,7 +66,7 @@
               {% for message_data in table.messages %}
                 <div style="font-size:90%">
                   <p style="font-weight:bold;margin:5px">{{ message_data.user }} said on {{ message_data.date }}:</p>
-                  <pre style="font-family:'Lato',sans-serif;margin:5px 5px 10px 15px;">{{ message_data.message }}</pre>
+                  <pre style="white-space:pre-wrap;font-family:'Lato',sans-serif;margin:5px 5px 10px 15px;">{{ message_data.message }}</pre>
                 </div>
               {% endfor %}
             </td>

diff --git a/hepdata/modules/theme/templates/hepdata_theme/email/upload_errors.html b/hepdata/modules/theme/templates/hepdata_theme/email/upload_errors.html
@@ -40,7 +40,7 @@ <h4 style="color: #C03A2B;">{% if header_message %}
             {% for error in file_errors %}
                 <div style="background-color:#ECF0F1;min-height:40px;margin:3px;border-radius:0 4px 4px 0;display:flex;">
                     <div style="background-color:#C03A2B;padding:10px;width:10%;border-radius:4px 0 0 4px;color: #fff;float:left!important;">{{ error.level }}</div>
-                    <pre style="font-family:'Lato',sans-serif;font-weight:lighter;padding:10px;margin:0;width:75%;text-align:left;color: #3B5169;float:right!important;">{{ error.message|safe }}</pre>
+                    <pre style="white-space:pre-wrap;font-family:'Lato',sans-serif;font-weight:lighter;padding:10px;margin:0;width:75%;text-align:left;color: #3B5169;float:right!important;">{{ error.message|safe }}</pre>
                     <div style="clear:both;"></div>
                 </div>
             {% endfor %}