[shopsys] better removed subscription form on error pages (#1819)

shopsys · May 5, 2020 · 69c1b83 · 69c1b83
1 parent 0861abc
commit 69c1b83
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 24 deletions.
diff --git a/templates/Front/Content/Error/error.html.twig b/templates/Front/Content/Error/error.html.twig
@@ -52,3 +52,9 @@
         </div>
     </div>
 {% endblock %}
+
+{% block footer %}
+    {% embed 'Front/Layout/footer.html.twig' %}
+        {% block newsletter_subscription %}{% endblock %}
+    {% endembed %}
+{% endblock %}
diff --git a/templates/Front/Layout/footer.html.twig b/templates/Front/Layout/footer.html.twig
@@ -1,26 +1,32 @@
-<div class="footer">
-    <div class="web__line web__line--grey clearfix dont-print">
-        <div class="web__container">
-            {{ render(controller('App\\Controller\\Front\\NewsletterController:subscriptionAction')) }}
-        </div>
-    </div>
-    <div class="web__line web__line--grey dont-print">
-        <div class="web__container">
-            {{ render(controller('App\\Controller\\Front\\AdvertController:boxAction',{'positionName' : 'footer'})) }}
-        </div>
-    </div>
-    <div class="web__line">
-        <footer class="web__container footer__bottom">
-            <div class="footer__bottom__copyright dont-print">
-                Made with passion by <a href="http://www.shopsys-framework.com/">Shopsys Framework</a>
+<div class="web__footer{% if not isCookiesConsentGiven() %} web__footer--with-cookies js-eu-cookies-consent-footer-gap{% endif %}">
+    <div class="footer">
+
+        {% block newsletter_subscription %}
+            <div class="web__line web__line--grey clearfix dont-print">
+                <div class="web__container">
+                    {{ render(controller('App\\Controller\\Front\\NewsletterController:subscriptionAction')) }}
+                </div>
             </div>
+        {% endblock %}
 
-            <div class="footer__bottom__articles">
-                {{ getShopInfoPhoneNumber() }}
-                {{ getShopInfoEmail() }}
-                {{ render(controller('App\\Controller\\Front\\ArticleController:footerAction')) }}
-                <a class="menu__item__link" href="{{ url('front_contact') }}">{{ 'Contact'|trans }}</a>
+        <div class="web__line web__line--grey dont-print">
+            <div class="web__container">
+                {{ render(controller('App\\Controller\\Front\\AdvertController:boxAction',{'positionName' : 'footer'})) }}
             </div>
-        </footer>
+        </div>
+        <div class="web__line">
+            <footer class="web__container footer__bottom">
+                <div class="footer__bottom__copyright dont-print">
+                    Made with passion by <a href="http://www.shopsys-framework.com/">Shopsys Framework</a>
+                </div>
+
+                <div class="footer__bottom__articles">
+                    {{ getShopInfoPhoneNumber() }}
+                    {{ getShopInfoEmail() }}
+                    {{ render(controller('App\\Controller\\Front\\ArticleController:footerAction')) }}
+                    <a class="menu__item__link" href="{{ url('front_contact') }}">{{ 'Contact'|trans }}</a>
+                </div>
+            </footer>
+        </div>
     </div>
 </div>
diff --git a/templates/Front/Layout/layout.html.twig b/templates/Front/Layout/layout.html.twig
@@ -34,9 +34,9 @@
 
         {% block content %}{% endblock %}
 
-        <div class="web__footer{% if not isCookiesConsentGiven() %} web__footer--with-cookies js-eu-cookies-consent-footer-gap{% endif %}">
-            {% include 'Front/Layout/footer.html.twig' %}
-        </div>
+        {% block footer %}
+            {% embed 'Front/Layout/footer.html.twig' %}{% endembed %}
+        {% endblock %}
     </div>
     {% if not isCookiesConsentGiven() %}
         {% set cookiesArticle = findCookiesArticleByDomainId(getDomain().id) %}