diff --git a/requirements/base.in b/requirements/base.in index ba48ebbf59..4ff4671165 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -38,7 +38,7 @@ django-view-breadcrumbs markdown django_better_admin_arrayfield humanfriendly -git+https://github.com/maykinmedia/mail-editor.git@8e287350acd8dd4adb7b391dd0152b0e90199165#egg=mail-editor +git+https://github.com/maykinmedia/mail-editor.git@b414db1052b832638e35b6ab77804996a517c3bf#egg=mail-editor fontawesomefree django-timeline-logger django-csp diff --git a/requirements/base.txt b/requirements/base.txt index c9cff58448..afbdb67f6b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -347,7 +347,7 @@ lxml==4.9.1 # maykin-python3-saml # svglib # xmlsec -mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@8e287350acd8dd4adb7b391dd0152b0e90199165 +mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@b414db1052b832638e35b6ab77804996a517c3bf # via -r requirements/base.in mail-parser==3.15.0 # via django-yubin diff --git a/requirements/ci.txt b/requirements/ci.txt index f06d4e4654..e41ee1c205 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -607,7 +607,7 @@ lxml==4.9.1 # pyquery # svglib # xmlsec -mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@8e287350acd8dd4adb7b391dd0152b0e90199165 +mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@b414db1052b832638e35b6ab77804996a517c3bf # via # -c requirements/base.txt # -r requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index adeda0ff2b..9985b3074c 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -698,7 +698,7 @@ lxml==4.9.1 # pyquery # svglib # xmlsec -mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@8e287350acd8dd4adb7b391dd0152b0e90199165 +mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@b414db1052b832638e35b6ab77804996a517c3bf # via # -c requirements/ci.txt # -r requirements/ci.txt @@ -1146,7 +1146,7 @@ xlwt==1.3.0 # -c requirements/ci.txt # -r requirements/ci.txt # tablib -xmlsec==1.3.12 +# xmlsec==1.3.12 # via # -c requirements/ci.txt # -r requirements/ci.txt diff --git a/src/open_inwoner/conf/parts/case_status_notification.html b/src/open_inwoner/conf/parts/case_status_notification.html index a2647ece79..3f5f1cff9b 100644 --- a/src/open_inwoner/conf/parts/case_status_notification.html +++ b/src/open_inwoner/conf/parts/case_status_notification.html @@ -1,34 +1,46 @@ - +
+ + + + + + + + + + + - - + @@ -54,15 +64,12 @@

Dit bericht is automatisch verzonden. U kunt niet reageren op deze e-mail.

 

Contact opnemen

-

- Wilt u contact opnemen met ons? -

- - +

Beste inwoner,

-

Er is een update over één van uw aanvragen beschikbaar:

+

Er is iets veranderd in één van uw aanvragen.

- -
+

Nieuw:

+
+

Aanvraag:

+

{{ type_description }}

+
+

Zaaknummer:
{{ identification }}

+
+

- +
-
-

+
+ -

De status is gewijzigd naar {{ case.status_title }} case.status_title.

+

De status is gewijzigd naar {{ case_status }}.

U hoeft niets te doen. Zodra er weer een update beschikbaar is ontvangt u hier een melding over. U kunt wel inloggen om uw aanvraag te bekijken.

@@ -40,12 +52,10 @@

Met vriendelijke groet,

 

{{ site_name }}

-

 

-

 

+
 
Bekijk onze contactpagina + Ga naar onze contactpagina Bel naar 14050Bel 14050
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 index 4cc33bd8e5..fbf166b2c6 100644 --- a/src/open_inwoner/conf/parts/case_status_notification_action_required.html +++ b/src/open_inwoner/conf/parts/case_status_notification_action_required.html @@ -1,15 +1,14 @@ - +
- @@ -23,22 +22,16 @@

{{ type_description }}

@@ -67,12 +54,10 @@

{{ type_description }}

Met vriendelijke groet,

 

{{ site_name }}

-

 

-

 

- - + @@ -81,15 +66,12 @@

{{ type_description }}

Dit bericht is automatisch verzonden. U kunt niet reageren op deze e-mail.

 

Contact opnemen

-

- Wilt u contact opnemen met ons? -

- - + - - - - - - {{ content }} - - + + + + + + + {{ content }} + +

Beste inwoner,

-

Er is een update over één van uw aanvragen beschikbaar:

+

Er is iets veranderd in één van uw aanvragen.

-

Update

+

Nieuw:

- -
+

- +
-
-

+
+

Wij hebben documenten van u nodig
- Upload de documenten tot {{ datum }} 2024

+ Upload de documenten tot {{ end_date }}

@@ -47,13 +40,7 @@

{{ type_description }}

- - Upload documenten + Upload documenten
+
 
Bekijk onze contactpagina + Ga naar onze contactpagina Bel naar 14050Bel 14050
diff --git a/src/open_inwoner/conf/parts/contactform_registration.html b/src/open_inwoner/conf/parts/contactform_registration.html index 0e996dab18..ae5b04d233 100644 --- a/src/open_inwoner/conf/parts/contactform_registration.html +++ b/src/open_inwoner/conf/parts/contactform_registration.html @@ -1,29 +1,34 @@ -

Beste

- - - - - - - - - - - - - - - - - - - - - +
Onderwerp:{{ subject }}
Naam:{{ name }}
Email:{{ email }}
Telefoonnummer:{{ phonenumber }}
Vraag:
{{ question }}

Beste

+ + + + + + + + + + + + + + + + + + + + + + + + +
Onderwerp:{{ subject }}
Naam:{{ name }}
Email:{{ email }}
Telefoonnummer:{{ phonenumber }}
Vraag:
{{ question }}
+ +

Met vriendelijke groet, + {{ site_name }}

+
- -

Met vriendelijke groet, - {{ site_name }}

diff --git a/src/open_inwoner/conf/parts/maileditor.py b/src/open_inwoner/conf/parts/maileditor.py index 6a8cfcc63c..ed47bff4da 100644 --- a/src/open_inwoner/conf/parts/maileditor.py +++ b/src/open_inwoner/conf/parts/maileditor.py @@ -220,6 +220,10 @@ def _readfile(name): "name": "case_link", "description": _("The link to the case details."), }, + # { + # "name": "start_date", + # "description": _("The start date of the case"), + # }, { "name": "end_date", "description": _("The planned final date of the case"), @@ -236,22 +240,6 @@ def _readfile(name): "name": "site_name", "description": _("Name of the site"), }, - { - "name": "footer.logo_url", - "description": _("URL of the site logo."), - }, - { - "name": "theming.accent", - "description": _("Configured accent background color"), - }, - { - "name": "theming.primary", - "description": _("Configured primary background color"), - }, - { - "name": "theming.secondary", - "description": _("Configured secondary background color"), - }, ], }, "case_document_notification": { diff --git a/src/open_inwoner/static/img/mail/open-link.svg b/src/open_inwoner/static/img/mail/open-link.svg deleted file mode 100644 index a93485e16b..0000000000 --- a/src/open_inwoner/static/img/mail/open-link.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/open_inwoner/static/img/mail/receiver.svg b/src/open_inwoner/static/img/mail/receiver.svg deleted file mode 100644 index 3609ebf91b..0000000000 --- a/src/open_inwoner/static/img/mail/receiver.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/open_inwoner/static/mailcss/email.css b/src/open_inwoner/static/mailcss/email.css index c636b7583e..a149d979f1 100644 --- a/src/open_inwoner/static/mailcss/email.css +++ b/src/open_inwoner/static/mailcss/email.css @@ -1,89 +1,13 @@ -/* Prettier ignores the static folder, so format manually */ - -/* cyrillic-ext */ -@font-face { - font-family: Ubuntu; - font-style: normal; - font-weight: 500; - font-display: swap; - src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCv6KVjbNBYlgoCjC3jvWyNPYZvg7UI.woff2) format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} - -/* cyrillic */ -@font-face { - font-family: Ubuntu; - font-style: normal; - font-weight: 500; - font-display: swap; - src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCv6KVjbNBYlgoCjC3jtGyNPYZvg7UI.woff2) format('woff2'); - unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} - -/* greek-ext */ -@font-face { - font-family: Ubuntu; - font-style: normal; - font-weight: 500; - font-display: swap; - src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCv6KVjbNBYlgoCjC3jvGyNPYZvg7UI.woff2) format('woff2'); - unicode-range: U+1F00-1FFF; -} - -/* greek */ -@font-face { - font-family: Ubuntu; - font-style: normal; - font-weight: 500; - font-display: swap; - src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCv6KVjbNBYlgoCjC3js2yNPYZvg7UI.woff2) format('woff2'); - unicode-range: U+0370-03FF; -} - -/* latin-ext */ -@font-face { - font-family: Ubuntu; - font-style: normal; - font-weight: 500; - font-display: swap; - src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCv6KVjbNBYlgoCjC3jvmyNPYZvg7UI.woff2) format('woff2'); - unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} - -/* latin */ -@font-face { - font-family: Ubuntu; - font-style: normal; - font-weight: 500; - font-display: swap; - src: url(https://fonts.gstatic.com/s/ubuntu/v20/4iCv6KVjbNBYlgoCjC3jsGyNPYZvgw.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} - -/* latin-ext */ -@font-face { - font-family: Lato; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/lato/v24/S6uyw4BMUTPHjxAwXiWtFCfQ7A.woff2) format('woff2'); - unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} - -/* latin */ -@font-face { - font-family: Lato; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(https://fonts.gstatic.com/s/lato/v24/S6uyw4BMUTPHjx4wXiWtFCc.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} - -/* Tags styles for all templates */ - -h2 { - font-size: 16px; +/* Tags: general styles for all templates */ + +table, th, td, img { + border: 0; + border-spacing: 0; + padding: 0; +} + +th { + font-weight: bold; } p { @@ -91,15 +15,10 @@ p { margin: 0; } -a { - /* color: var(--color-font-secondary); */ - color: teal; -} - .heading-font, h1 { color: #000000; font-family: Ubuntu, Helvetica, Arial, sans-serif; - font-weight: 600; + font-weight: bold; padding: 0; margin: 0; } @@ -108,7 +27,6 @@ table, .table-mail { /* --color-gray-dark */ background-color: #ffffff; border-spacing: 0; - border-collapse: collapse; color: #4B4B4B; font-family: Lato, Helvetica, sans-serif; line-height: 24px; @@ -127,20 +45,26 @@ td, .td-mail { text-align: center; width: auto; max-height: 53px; + max-width: 600px; } .td-mail.align-top { vertical-align: top; } -.td-mail.align-center { - vertical-align: center; +td.align-center { + vertical-align: middle; } .tr-mail.border-top .td-mail { border-top: 1px solid #d2d2d2; } +.td-mail.spacer-bottom { + border-bottom: 1px solid #d2d2d2; + padding-top: 80px; +} + .td-mail--accent { height: 24px; } @@ -156,7 +80,7 @@ td, .td-mail { .td-mail__bg-white { background-color: #ffffff; border: 1px solid #ffffff; - border-radius: 3px; + border-radius: 6px; color: #704000; display: inline-block; font-family: 'Lato', 'Helvetica', Arial, sans-serif; @@ -211,39 +135,3 @@ td, .td-mail { font-size: 14px; } -/* CSS variables may all need to be put in HTML instead */ - -.color--primary { - /* color: var(--color-primary); */ - color: #0065BD; -} - -.color--secondary { - /* color: var(--color-secondary); */ - color: teal; -} - -.color--accent { - /*color:{{ theming.secondary_color }}*/ - color: #e0001a; -} - -.button--primary { - background-color: #0065BD; - border: 1px solid #0065BD; - border-radius: 3px; - color: #ffffff; - display: inline-block; - font-family: sans-serif; - font-size: 16px; - line-height: 44px; - text-align: center; - text-decoration: none; - width: 100%; - -webkit-text-size-adjust: none; -} - -.td-mail__bg-accent { - /* background-color: var(--color-accent); */ - background-color: #e0001a; -} diff --git a/src/open_inwoner/templates/mail/_base.html b/src/open_inwoner/templates/mail/_base.html index 9bb008668e..f2900a4cac 100644 --- a/src/open_inwoner/templates/mail/_base.html +++ b/src/open_inwoner/templates/mail/_base.html @@ -1,14 +1,139 @@ - - + + + + @@ -20,17 +145,15 @@
- -

test

-