Merge pull request #1383 from IFRCGo/fix/flash-update-email

Change text size for situational overview in pdf

Author: szabozoltan69

flash_update/utils.py

@@ -5,7 +5,7 @@
 
 from xhtml2pdf import pisa
 
-from main.frontend import get_project_url
+from main.frontend import get_flash_update_url
 
 from flash_update.models import FlashGraphicMap
 
@@ -49,7 +49,7 @@ def get_email_context(instance):
     actions_taken = [dict(action_taken) for action_taken in flash_update_data['actions_taken']]
     resources = [dict(refrence) for refrence in flash_update_data['references']]
     email_context = {
-        'resource_url': get_project_url(instance.id),
+        'resource_url': get_flash_update_url(instance.id),
         'title': flash_update_data['title'],
         'situational_overview': flash_update_data['situational_overview'],
         'map_list': map_list,

main/frontend.py

@@ -3,3 +3,7 @@
 
 def get_project_url(id):
     return f'https://{settings.FRONTEND_URL}/three-w/{id}/'
+
+
+def get_flash_update_url(id):
+    return f'{settings.FRONTEND_URL}/flash-update/{id}/'

notifications/templates/email/flash_update/flash_pdf.html

@@ -27,10 +27,13 @@
           font-weight: bold;
           padding-left: 20px;
       }
-    .img-flash {
-            width: 120px;
-            height: 120px;
+    .flash-image {
+            width: 200px;
+            height: 200px;
         }
+    #situational_overview{
+        font-size: 15px;
+    }
 
     </style>
 
@@ -40,17 +43,17 @@
         </div>
         <h1 class="title-heading-main">{{title}}</h1>
         <h2 class="heading">Situational Overview</h2>
-        <p class="desc"> {{situational_overview|safe}}</p>
+        <div id="situational_overview"><p> {{situational_overview|safe}}</p></div>
 
         <h2 class="heading">Graphics</h2>
         <div class="d-flex p-2">
         {% for map in map_list %}
-            <img class = 'img-flash' src="{{map.image}}" alt="image">
+            <img class = 'flash-image' src="{{map.image}}" alt="image">
         {% endfor %}
         </div><br>
         <div class="d-flex p-2">
         {% for graphic in graphic_list %}
-            <img class = 'img-flash'  src="{{graphic.image}}" alt="image">
+            <img class = 'flash-image'  src="{{graphic.image}}" alt="image">
         {% endfor %}
         </div>
 

notifications/templates/email/flash_update/flash_update.html

@@ -26,11 +26,11 @@
                     <tr>
                       <td class="text-default text-light pb-40" style="padding-bottom: 40px;font-weight: 300;">
                         {% for map in map_list %}
-                        <img class = 'img-flash' src="{{map.image}}" alt="image">
+                        <img class = 'flash-image' src="{{map.image}}" alt="image">
                         {% endfor %}
 
                         {% for graphic in graphic_list %}
-                        <img class = 'img-flash'  src="{{graphic.image}}" alt="image">
+                        <img class = 'flash-image'  src="{{graphic.image}}" alt="image">
                         {% endfor %}
                       </td>
                     </tr>

notifications/templates/email/flash_update/head.html

@@ -289,10 +289,10 @@
         background-repeat: no-repeat;
         margin: auto !important;
       }
-      .img-flash {
-              width: 120px;
-              height: 120px;
-          }
+      .flash-image {
+        width: 200px;
+        height: 200px;
+        }
       .img-dref {
         background-image: url("./images/rc.svg");
       }
@@ -418,7 +418,7 @@
                               <tr>
 
                                 <td class="text-header text-default text-right" style="text-align: right;color: #000000;font-family:'Lato', Arial, sans-serif;">
-                                    <a href="https://{{ resource_url }}" target="_blank" class="link" style="font-family: 'Lato', Arial, sans-serif;text-decoration: underline;color: #000;">Open in GO</a>
+                                    <a href="{{ resource_url }}" target="_blank" class="link" style="font-family: 'Lato', Arial, sans-serif;text-decoration: underline;color: #000;">Open in GO</a>
                                   </td>
 
                               </tr>