diff --git a/.djlintrc b/.djlintrc
index 4a62333cf..268c1b5aa 100644
--- a/.djlintrc
+++ b/.djlintrc
@@ -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
+ }
}
diff --git a/envergo/evaluations/models.py b/envergo/evaluations/models.py
index f4e2c8973..fea33edf7 100644
--- a/envergo/evaluations/models.py
+++ b/envergo/evaluations/models.py
@@ -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}"
diff --git a/envergo/static/images/logo_mte.png b/envergo/static/images/logo_mte.png
new file mode 100644
index 000000000..9f4f7b299
Binary files /dev/null and b/envergo/static/images/logo_mte.png differ
diff --git a/envergo/templates/emails/base_inlined.html b/envergo/templates/emails/base_inlined.html
index 28617af3d..826ed4a9a 100644
--- a/envergo/templates/emails/base_inlined.html
+++ b/envergo/templates/emails/base_inlined.html
@@ -9,8 +9,8 @@
-
-
+
+
{% block title %}{% endblock %}
@@ -64,6 +64,7 @@
width: auto !important;
}
}
+
@media all {
.ExternalClass {
width: 100%;
@@ -201,16 +202,14 @@
text-align: center"
valign="top"
align="center">
- 
+ display: block">
@@ -269,7 +268,11 @@
font-size: 16px;
vertical-align: top"
valign="top">
- N'hésitez pas à nous contacter pour toute question.
+ N'hésitez pas à nous contacter pour toute question.
Tél. : 07 56 81 02 11
- Email : contact@envergo.beta.gouv.fr
+ Email : contact@envergo.beta.gouv.fr
- Site web : https://envergo.beta.gouv.fr
+ Site web : https://envergo.beta.gouv.fr
diff --git a/envergo/templates/emails/base_tpl.html b/envergo/templates/emails/base_tpl.html
index 1f9ed937e..6c464fc91 100644
--- a/envergo/templates/emails/base_tpl.html
+++ b/envergo/templates/emails/base_tpl.html
@@ -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;
@@ -97,6 +99,7 @@
text-align: left;
width: 100%;
}
+
.footer td,
.footer p,
.footer span,
@@ -105,8 +108,8 @@
font-size: 12px;
text-align: left;
}
- .signature p {
- }
+
+ .signature p {}
/* -------------------------------------
TYPOGRAPHY
@@ -139,6 +142,7 @@
margin: 0;
margin-bottom: 15px;
}
+
p li,
ul li,
ol li {
@@ -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;
@@ -259,6 +269,7 @@
font-size: 28px !important;
margin-bottom: 10px !important;
}
+
table.body p,
table.body ul,
table.body ol,
@@ -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;
@@ -303,6 +321,7 @@
.ExternalClass {
width: 100%;
}
+
.ExternalClass,
.ExternalClass p,
.ExternalClass span,
@@ -311,6 +330,7 @@
.ExternalClass div {
line-height: 100%;
}
+
.apple-link a {
color: inherit !important;
font-family: inherit !important;
@@ -319,6 +339,7 @@
line-height: inherit !important;
text-decoration: none !important;
}
+
#MessageViewBody a {
color: inherit;
text-decoration: none;
@@ -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;
}
}
-
@@ -361,9 +383,9 @@
- 
+ {% if rr_mention_html %}{{ rr_mention_html|safe }}{% endif %}
+
Nous vous conseillons de prendre contact avec un bureau d'études en lui transmettant ces éléments.
|