Merge branch '4.4' into 5.0

fabpot · fabpot · commit 57fcd445c106 · 2020-06-24T15:36:01.000+02:00
* 4.4:
  [HttpClient] Support for cURL handler objects.
  [HttpClient] unset activity list when creating CurlResponse
  Fixed typo in test name
  add .body wrapper element
  [HttpFondation] Change file extension of "audio/mpeg" from "mpga" to "mp3"
  [VarDumper] Support for cURL handler objects.
  Check whether path is file in DataPart::fromPath()
  [DI][FrameworkBundle] Remove whitelist occurrences
  Avoid accessibility errors on debug toolbar
diff --git a/Resources/views/Email/zurb_2/notification/body.html.twig b/Resources/views/Email/zurb_2/notification/body.html.twig
@@ -10,54 +10,56 @@
 </head>
 <body>
 <spacer size="32"></spacer>
-<container class="body_{{ ("urgent" == importance ? "alert" : ("high" == importance ? "warning" : "default")) }}">
-    <spacer size="16"></spacer>
-    <row>
-        <columns large="12" small="12">
-            {% block lead %}
-                <small><strong>{{ importance|upper }}</strong></small>
-                <p class="lead">
-                    {{ email.subject }}
-                </p>
-            {% endblock %}
+<wrapper class="body">
+    <container class="body_{{ ("urgent" == importance ? "alert" : ("high" == importance ? "warning" : "default")) }}">
+        <spacer size="16"></spacer>
+        <row>
+            <columns large="12" small="12">
+                {% block lead %}
+                    <small><strong>{{ importance|upper }}</strong></small>
+                    <p class="lead">
+                        {{ email.subject }}
+                    </p>
+                {% endblock %}
 
-            {% block content %}
-                {% if markdown %}
-                    {{ include('@email/zurb_2/notification/content_markdown.html.twig') }}
-                {% else %}
-                    {{ (raw ? content|raw : content)|nl2br }}
-                {% endif %}
-            {% endblock %}
+                {% block content %}
+                    {% if markdown %}
+                        {{ include('@email/zurb_2/notification/content_markdown.html.twig') }}
+                    {% else %}
+                        {{ (raw ? content|raw : content)|nl2br }}
+                    {% endif %}
+                {% endblock %}
 
-            {% block action %}
-                {% if action_url %}
-                    <spacer size="16"></spacer>
-                    <button href="{{ action_url }}">{{ action_text }}</button>
-                {% endif %}
-            {% endblock %}
+                {% block action %}
+                    {% if action_url %}
+                        <spacer size="16"></spacer>
+                        <button href="{{ action_url }}">{{ action_text }}</button>
+                    {% endif %}
+                {% endblock %}
 
-            {% block exception %}
-                {% if exception %}
-                    <spacer size="16"></spacer>
-                    <p><em>Exception stack trace attached.</em></p>
-                {% endif %}
-            {% endblock %}
-        </columns>
-    </row>
+                {% block exception %}
+                    {% if exception %}
+                        <spacer size="16"></spacer>
+                        <p><em>Exception stack trace attached.</em></p>
+                    {% endif %}
+                {% endblock %}
+            </columns>
+        </row>
 
-    <wrapper class="secondary">
-        <spacer size="16"></spacer>
-        {% block footer %}
-            <row>
-                <columns small="12" large="6">
-                    {% block footer_content %}
-                        <p><small>Notification e-mail sent by Symfony</small></p>
-                    {% endblock %}
-                </columns>
-            </row>
-        {% endblock %}
-    </wrapper>
-</container>
+        <wrapper class="secondary">
+            <spacer size="16"></spacer>
+            {% block footer %}
+                <row>
+                    <columns small="12" large="6">
+                        {% block footer_content %}
+                            <p><small>Notification e-mail sent by Symfony</small></p>
+                        {% endblock %}
+                    </columns>
+                </row>
+            {% endblock %}
+        </wrapper>
+    </container>
+</wrapper>
 </body>
 </html>
 {% endapply %}
