Skip to content

Commit

Permalink
Merge pull request #242 from MTES-MCT/update_ar_emails
Browse files Browse the repository at this point in the history 
Mise à jour des emails
  • Loading branch information
@thibault
thibault authored Oct 24, 2023
2 parents c2469ed + f31b658 commit e059e19
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 27 deletions.
10 changes: 9 additions & 1 deletion .djlintrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,13 @@
"line_break_after_multiline_tag": false,
"max_line_length": 120,
"preserve_blank_lines": true,
"ignore": "T002,T003,H021,D018,H022,H006,H029"
"ignore": "T002,T003,H021,D018,H022,H006,H029",
"format_css": true,
"css": {
"indent_size": 2
},
"format_js": true,
"js": {
"indent_size": 2
}
}
5 changes: 1 addition & 4 deletions envergo/evaluations/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,7 @@ def get_regulatory_reminder_email(self, request):
recipients = self.project_sponsor_emails
cc_recipients = []

if result == "non_soumis":
subject = "Avis réglementaire EnvErgo"
else:
subject = "Avis réglementaire Loi sur l'eau"
subject = "Avis réglementaire"

if self.address:
subject += f" / {self.address}"
Expand Down
Binary file added envergo/static/images/logo_mte.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 18 additions & 11 deletions envergo/templates/emails/base_inlined.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="description" content="" />
<meta name="keywords" content="" />
<meta name="description" content="">
<meta name="keywords" content="">
<title>
{% block title %}{% endblock %}
</title>
Expand Down Expand Up @@ -64,6 +64,7 @@
width: auto !important;
}
}

@media all {
.ExternalClass {
width: 100%;
Expand Down Expand Up @@ -201,16 +202,14 @@
text-align: center"
valign="top"
align="center">
<img src="https://img.mailinblue.com/4575616/images/content_library/original/644296cb359d590cc31102f0.png"
alt="République française. Liberté Égalité Fraternité"
width="120"
<img src="https://envergo.beta.gouv.fr/static/images/logo_mte.png"
alt="Ministère de la Transition Écologique"
width="160"
border="0"
class=""
style="border: none;
-ms-interpolation-mode: bicubic;
max-width: 120px;
display: block;
width: 100%">
display: block">
</td>
</tr>
</table>
Expand Down Expand Up @@ -269,7 +268,11 @@
font-size: 16px;
vertical-align: top"
valign="top">
<p>N'hésitez pas à nous contacter pour toute question.</p>
<p style="font-family: sans-serif;
font-size: 14px;
font-weight: normal;
margin: 0;
margin-bottom: 15px">N'hésitez pas à nous contacter pour toute question.</p>
<p style="font-family: sans-serif;
font-size: 14px;
font-weight: normal;
Expand All @@ -287,9 +290,13 @@
margin-bottom: 0">
<strong>Tél.</strong> : 07 56 81 02 11
<br>
<strong>Email</strong> : <a href="mailto:[email protected]">[email protected]</a>
<strong>Email</strong> : <a href="mailto:[email protected]"
style="color: #3498db;
text-decoration: underline">[email protected]</a>
<br>
<strong>Site web</strong> : <a href="https://envergo.beta.gouv.fr">https://envergo.beta.gouv.fr</a>
<strong>Site web</strong> : <a href="https://envergo.beta.gouv.fr"
style="color: #3498db;
text-decoration: underline">https://envergo.beta.gouv.fr</a>
</p>
</td>
</tr>
Expand Down
42 changes: 32 additions & 10 deletions envergo/templates/emails/base_tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@
border-collapse: separate;
mso-table-lspace: 0pt;
mso-table-rspace: 0pt;
width: 100%; }
width: 100%;
}

table td {
font-family: Arial, sans-serif;
font-size: 16px;
Expand Down Expand Up @@ -97,6 +99,7 @@
text-align: left;
width: 100%;
}

.footer td,
.footer p,
.footer span,
Expand All @@ -105,8 +108,8 @@
font-size: 12px;
text-align: left;
}
.signature p {
}

.signature p {}

/* -------------------------------------
TYPOGRAPHY
Expand Down Expand Up @@ -139,6 +142,7 @@
margin: 0;
margin-bottom: 15px;
}

p li,
ul li,
ol li {
Expand All @@ -156,17 +160,23 @@
------------------------------------- */
.btn {
box-sizing: border-box;
width: 100%; }
.btn > tbody > tr > td {
padding-bottom: 15px; }
width: 100%;
}

.btn>tbody>tr>td {
padding-bottom: 15px;
}

.btn table {
width: auto;
}

.btn table td {
background-color: #ffffff;
border-radius: 5px;
text-align: center;
}

.btn a {
background-color: #ffffff;
border: solid 1px #3498db;
Expand Down Expand Up @@ -259,6 +269,7 @@
font-size: 28px !important;
margin-bottom: 10px !important;
}

table.body p,
table.body ul,
table.body ol,
Expand All @@ -267,28 +278,35 @@
table.body a {
font-size: 16px !important;
}

table.body .wrapper,
table.body .article {
padding: 10px !important;
}

table.body .content {
padding: 0 !important;
}

table.body .container {
padding: 0 !important;
width: 100% !important;
}

table.body .main {
border-left-width: 0 !important;
border-radius: 0 !important;
border-right-width: 0 !important;
}

table.body .btn table {
width: 100% !important;
}

table.body .btn a {
width: 100% !important;
}

table.body .img-responsive {
height: auto !important;
max-width: 100% !important;
Expand All @@ -303,6 +321,7 @@
.ExternalClass {
width: 100%;
}

.ExternalClass,
.ExternalClass p,
.ExternalClass span,
Expand All @@ -311,6 +330,7 @@
.ExternalClass div {
line-height: 100%;
}

.apple-link a {
color: inherit !important;
font-family: inherit !important;
Expand All @@ -319,6 +339,7 @@
line-height: inherit !important;
text-decoration: none !important;
}

#MessageViewBody a {
color: inherit;
text-decoration: none;
Expand All @@ -327,15 +348,16 @@
font-weight: inherit;
line-height: inherit;
}

.btn-primary table td:hover {
background-color: #34495e !important;
}

.btn-primary a:hover {
background-color: #34495e !important;
border-color: #34495e !important;
}
}

</style>
</head>
<body>
Expand All @@ -361,9 +383,9 @@
<table role="presentation" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="align-center">
<img src="https://envergo.beta.gouv.fr/static/images/logo_republique_francaise.png"
alt="République française. Liberté Égalité Fraternité"
width="120"
<img src="https://envergo.beta.gouv.fr/static/images/logo_mte.png"
alt="Ministère de la Transition Écologique"
width="160"
border="0"
class=""
style="display: block;
Expand Down
4 changes: 3 additions & 1 deletion envergo/templates/evaluations/admin/rr_email_soumis.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

<p>Le porteur du projet doit déposer un dossier de déclaration Loi sur l'eau à la DDTM.</p>

{% if rr_mention_html %}{{ rr_mention_html|safe }}{% endif %}
<div class="rr_mention" style="font-style: italic;">
{% if rr_mention_html %}{{ rr_mention_html|safe }}{% endif %}
</div>

<p>Nous vous conseillons de prendre contact avec un bureau d'études en lui transmettant ces éléments.</p>

Expand Down

0 comments on commit e059e19

Please sign in to comment.