From 1616b13eb510c671bc0799e2f3d364ec5ab4f2cd Mon Sep 17 00:00:00 2001
From: StijnVrolijk <stijn.o.vrolijk@gmail.com>
Date: Wed, 29 Jul 2020 07:38:20 +0200
Subject: [PATCH] Apply frontend changes from Core to theme

---
 .../Modules/Faq/Layout/Templates/Detail.html.twig          | 1 -
 .../FormBuilder/Layout/Templates/Mails/Form.html.twig      | 7 ++++++-
 .../Modules/FormBuilder/Layout/Widgets/Form.html.twig      | 6 +++---
 .../Modules/Profiles/Layout/Widgets/LoginLink.html.twig    | 2 +-
 .../Bootstrap4/src/Layout/Templates/Navigation.html.twig   | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Frontend/Themes/Bootstrap4/Modules/Faq/Layout/Templates/Detail.html.twig b/src/Frontend/Themes/Bootstrap4/Modules/Faq/Layout/Templates/Detail.html.twig
index baca622f9d..2f771d7627 100644
--- a/src/Frontend/Themes/Bootstrap4/Modules/Faq/Layout/Templates/Detail.html.twig
+++ b/src/Frontend/Themes/Bootstrap4/Modules/Faq/Layout/Templates/Detail.html.twig
@@ -45,7 +45,6 @@
           {% form feedback %}
             <div class="card-body">
               <div class="row">
-                {{ hidQuestionId|raw }}
                 <div class="col-md-3">
                   {{ 'msg.Feedback'|trans|ucfirst }}
                 </div>
diff --git a/src/Frontend/Themes/Bootstrap4/Modules/FormBuilder/Layout/Templates/Mails/Form.html.twig b/src/Frontend/Themes/Bootstrap4/Modules/FormBuilder/Layout/Templates/Mails/Form.html.twig
index eb46dc68ba..c6e13eff9e 100644
--- a/src/Frontend/Themes/Bootstrap4/Modules/FormBuilder/Layout/Templates/Mails/Form.html.twig
+++ b/src/Frontend/Themes/Bootstrap4/Modules/FormBuilder/Layout/Templates/Mails/Form.html.twig
@@ -11,6 +11,11 @@
 
   <h3>{{ 'lbl.Content'|trans|ucfirst }}</h3>
   {% for field in fields %}
-    <p><strong>{{ field.label }}:</strong><br /> {{ field.value|raw }}</p>
+    <p><strong>{{ field.label|raw }}{% if field.value %}:{% endif %}</strong>
+      {% if field.value %}
+        <br />
+        {{ field.value|replace({'<br />\r\n' : '\r\n','<br>\r\n' : '\r\n','<br />' : '\r\n','<br>' : '\r\n'})|e|nl2br|raw }}
+      {% endif %}
+    </p>
   {% endfor %}
 {% endblock %}
diff --git a/src/Frontend/Themes/Bootstrap4/Modules/FormBuilder/Layout/Widgets/Form.html.twig b/src/Frontend/Themes/Bootstrap4/Modules/FormBuilder/Layout/Widgets/Form.html.twig
index 32ff6da26c..0e13d9ab4b 100644
--- a/src/Frontend/Themes/Bootstrap4/Modules/FormBuilder/Layout/Widgets/Form.html.twig
+++ b/src/Frontend/Themes/Bootstrap4/Modules/FormBuilder/Layout/Widgets/Form.html.twig
@@ -35,7 +35,7 @@
                       {{ field.label|raw }}{% if field.required %}<abbr title="{{ 'lbl.RequiredField'|trans|ucfirst }}">*</abbr>{% endif %}
                     </label>
                     {{ field.html|raw }}
-                    {% if field.error %}<span class="form-control-feedback">{{ field.error }}</span>{% endif %}
+                    {% if field.error %}<span class="form-control-feedback">{{ field.error|raw }}</span>{% endif %}
                   </div>
                 {% endif %}
 
@@ -45,7 +45,7 @@
                     <label class="form-control-label" for="{{ field.name }}">
                       {{ field.html|raw }} {{ field.label|raw }}
                     </label>
-                    {% if field.error %}<span class="form-control-feedback">{{ field.error }}</span>{% endif %}
+                    {% if field.error %}<span class="form-control-feedback">{{ field.error|raw }}</span>{% endif %}
                   </div>
                 {% endif %}
 
@@ -62,7 +62,7 @@
                         </label>
                       </div>
                     {% endfor %}
-                    {% if field.error %}<span class="form-control-feedback">{{ field.error }}</span>{% endif %}
+                    {% if field.error %}<span class="form-control-feedback">{{ field.error|raw }}</span>{% endif %}
                   </div>
                 {% endif %}
               </div>
diff --git a/src/Frontend/Themes/Bootstrap4/Modules/Profiles/Layout/Widgets/LoginLink.html.twig b/src/Frontend/Themes/Bootstrap4/Modules/Profiles/Layout/Widgets/LoginLink.html.twig
index 95e5170385..da73ddd395 100644
--- a/src/Frontend/Themes/Bootstrap4/Modules/Profiles/Layout/Widgets/LoginLink.html.twig
+++ b/src/Frontend/Themes/Bootstrap4/Modules/Profiles/Layout/Widgets/LoginLink.html.twig
@@ -7,7 +7,7 @@
 {% if isLoggedIn %}
   <div class="dropdown">
     <button type="button" class="btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="profile-logged-in">
-      {{ 'msg.ProfilesLoggedInAs'|trans|format(profile.display_name, profile.url.dashboard)|raw }}
+      {{ 'msg.ProfilesLoggedInAs'|trans|format(profile.display_name|e, profile.url.dashboard)|raw }}
     </button>
     <div class="dropdown-menu dropdown-menu-right" aria-labelledby="profile-logged-in">
       <a href="{{ profile.url.settings }}" class="dropdown-item">{{ 'lbl.Settings'|trans|ucfirst }}</a>
diff --git a/src/Frontend/Themes/Bootstrap4/src/Layout/Templates/Navigation.html.twig b/src/Frontend/Themes/Bootstrap4/src/Layout/Templates/Navigation.html.twig
index 6a40e205d1..762bf4d6ad 100644
--- a/src/Frontend/Themes/Bootstrap4/src/Layout/Templates/Navigation.html.twig
+++ b/src/Frontend/Themes/Bootstrap4/src/Layout/Templates/Navigation.html.twig
@@ -2,7 +2,7 @@
   <ul class="navbar-nav mr-auto">
     {% for nav in navigation %}
       <li class="nav-item{% if nav.selected %} active{% endif %}">
-        <a class="nav-link" href="{{ nav.link }}" title="{{ nav.navigation_title }}"{% if nav.nofollow %} rel="nofollow"{% endif %}>{{ nav.navigation_title }}</a>
+        <a class="nav-link" href="{{ nav.link }}" title="{{ nav.navigation_title }}"{% if nav.nofollow %} rel="nofollow"{% endif %}>{{ nav.navigation_title|e('html') }}</a>
         {% if nav.selected %}{{ nav.children }}{% endif %}
       </li>
     {% endfor %}