[#2169] Improved mail-template syntax

maykinmedia · Mar 11, 2024 · ced91f7 · ced91f7
1 parent 3960c19
commit ced91f7
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/src/open_inwoner/conf/parts/case_document_notification.html b/src/open_inwoner/conf/parts/case_document_notification.html
@@ -78,7 +78,7 @@ <h2>{{ type_description }}</h2>
     <tr>
         <td class="td--responsive td-mail td__padding-right td__padding-bottom td__padding-left td__leftcell" colspan="2"><p><a href="{{ contact_page }}#">Ga naar onze contactpagina</a></p>
         </td>
-        <td class="td--responsive td-mail td__padding-right td__padding-bottom td__padding-left td__rightcell td__nowrap" colspan="4"><p><a href="tel:{{contact_phonenumber}}" data-rel="external">{{contact_phonenumber}}</a></p></td>
+        <td class="td--responsive td-mail td__padding-right td__padding-bottom td__padding-left td__rightcell td__nowrap" colspan="4"><p><a href="tel:{{ contact_phonenumber }}" data-rel="external">Bel {{ contact_phonenumber }}</a></p></td>
     </tr>
     <tr class="tr-mail border-top">
         <td class="td-mail border-top td__padding-zero" colspan="6">

diff --git a/src/open_inwoner/conf/parts/case_status_notification.html b/src/open_inwoner/conf/parts/case_status_notification.html
@@ -78,7 +78,7 @@ <h2>{{ type_description }}</h2>
     <tr>
         <td class="td--responsive td-mail td__padding-right td__padding-bottom td__padding-left td__leftcell" colspan="2"><p><a href="{{ contact_page }}">Ga naar onze contactpagina</a></p>
         </td>
-        <td class="td--responsive td-mail td__padding-right td__padding-bottom td__padding-left td__rightcell td__nowrap" colspan="4"><p><a href="tel:{{ contact_phonenumber }}" data-rel="external">{{ contact_phonenumber }}</a></p></td>
+        <td class="td--responsive td-mail td__padding-right td__padding-bottom td__padding-left td__rightcell td__nowrap" colspan="4"><p><a href="tel:{{ contact_phonenumber }}" data-rel="external">Bel {{ contact_phonenumber }}</a></p></td>
     </tr>
     <tr class="tr-mail border-top">
         <td class="td-mail border-top td__padding-zero" colspan="6">

diff --git a/src/open_inwoner/conf/parts/case_status_notification_action_required.html b/src/open_inwoner/conf/parts/case_status_notification_action_required.html
@@ -75,7 +75,7 @@ <h2>{{ type_description }}</h2>
     <tr class="tr--responsive">
         <td class="td--responsive td-mail td__padding-right td__padding-bottom td__padding-left td__leftcell" colspan="2"><p><a href="{{ contact_page }}">Ga naar onze contactpagina</a></p>
         </td>
-        <td class="td--responsive td-mail td__padding-right td__padding-bottom td__padding-left td__rightcell td__nowrap" colspan="4"><p><a href="tel:{{ contact_phonenumber }}" data-rel="external">{{ contact_phonenumber }}</a></p></td>
+        <td class="td--responsive td-mail td__padding-right td__padding-bottom td__padding-left td__rightcell td__nowrap" colspan="4"><p><a href="tel:{{ contact_phonenumber }}" data-rel="external">Bel {{ contact_phonenumber }}</a></p></td>
     </tr>
     <tr class="tr-mail border-top">
         <td class="td-mail border-top td__padding-zero" colspan="6">

diff --git a/src/open_inwoner/conf/parts/maileditor.py b/src/open_inwoner/conf/parts/maileditor.py
@@ -241,6 +241,10 @@ def _readfile(name):
                 "name": "contact_page",
                 "description": _("The link to an existing contactpage"),
             },
+            {
+                "name": "contact_phonenumber",
+                "description": _("The callable link to the configured phonenumber"),
+            },
             {
                 "name": "profile_notifications",
                 "description": _(
@@ -294,6 +298,14 @@ def _readfile(name):
                 "name": "site_name",
                 "description": _("Name of the site"),
             },
+            {
+                "name": "contact_page",
+                "description": _("The link to an existing contactpage"),
+            },
+            {
+                "name": "contact_phonenumber",
+                "description": _("The callable link to the configured phonenumber"),
+            },
             {
                 "name": "profile_notifications",
                 "description": _(
@@ -350,6 +362,14 @@ def _readfile(name):
                 "name": "site_name",
                 "description": _("Name of the site"),
             },
+            {
+                "name": "contact_page",
+                "description": _("The link to an existing contactpage"),
+            },
+            {
+                "name": "contact_phonenumber",
+                "description": _("The callable link to the configured phonenumber"),
+            },
             {
                 "name": "profile_notifications",
                 "description": _(

diff --git a/src/open_inwoner/static/mailcss/email.css b/src/open_inwoner/static/mailcss/email.css
@@ -154,7 +154,7 @@ td.align-center {
 }
 
 .td__rightcell.td__nowrap {
-    min-width: 300px;
+    min-width: 200px;
 }
 
 .spacing__extra {

diff --git a/src/open_inwoner/templates/mail/_base.html b/src/open_inwoner/templates/mail/_base.html
@@ -137,7 +137,7 @@
 
     .button--primary {
         background-color: {{ theming.primary_color }};
-        border: 1px solid{{ theming.primary_color }};
+        border: 1px solid {{ theming.primary_color }};
     }
 
     .td-mail__bg-accent {