Version 3.4.0

supportpal · Apr 16, 2021 · 86a260a · 86a260a
1 parent 743b2c0
commit 86a260a
Show file tree

Hide file tree

Showing 15 changed files with 118 additions and 54 deletions.
diff --git a/core/dashboard.twig b/core/dashboard.twig
@@ -13,8 +13,7 @@
                     <div class="sp-mb-3/2 sp-font-semibold sp-text-lg xs:sp-text-xl sm:sp-mb-3 sm:sp-text-2xl lg:sp-text-3xl">
                         {{ Lang.get('core.how_can_we_help') }}
                     </div>
-                    <form name="search" action="{{ route('core.frontend.search') }}" method="post">
-                        <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+                    <form name="search" action="{{ route('core.frontend.search') }}" method="get">
                         <input type="search" name="query" placeholder="{{ Lang.get('general.search') }}" />
                     </form>
                 </div>

diff --git a/head_common.twig b/head_common.twig
@@ -4,6 +4,7 @@
 <meta name="csrf_token" content="{{ csrf_token() }}" />
 <meta name="token" content="{{ Request.input('token') }}" />
 <meta name="date_format" content="{{ Config.get('settings.date_format') }}" />
+<meta name="time_format" content="{{ Config.get('settings.time_format') }}" />
 <meta name="max_file_size" content="{{ max_file_size }}" />
 <meta name="allowed_files" content="{{ allowed_files }}" />
 <meta name="environment" content="{{ Config.get('app.environment') }}" />

diff --git a/index.twig b/index.twig
@@ -15,7 +15,7 @@
     {% set route = Route.currentRouteName() %}
 </head>
 
-<body class="{{ get_template_mode(false) }} sp-bg-secondary sp-text-primary">
+<body class="{{ get_template_mode(false) }} sp-bg-secondary sp-text-primary print:sp-bg-primary">
 
     {{ View.fireHook('frontend.body_start') }}
 
@@ -27,8 +27,7 @@
             <div class="sp-search sp-absolute sp-hidden sp-flex sp-items-center sp-h-full sp-w-full sp--mt-2
                         sp-bg-primary sp-z-10 print:sp-hidden">
                 <div class="sp-flex-grow sp-w-full">
-                    <form name="search" action="{{ route('core.frontend.search') }}" method="post">
-                        <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+                    <form name="search" action="{{ route('core.frontend.search') }}" method="get">
                         <input type="search" name="query" placeholder="{{ Lang.get('general.search') }}" />
                     </form>
                 </div>

diff --git a/selfservice/article_details.twig b/selfservice/article_details.twig
@@ -7,9 +7,9 @@
             <i class="fas fa-folder sp-mr-1"></i>
             <ul class="sp-item-list">
                 {% for category in article.categories.sortBy('name') %}
-                    <li>
-                        <a href="{{ category.frontend_url }}">{{ category.name }}</a>
-                    </li>
+                    <li><!--
+                        --><a href="{{ category.frontend_url }}">{{ category.name }}</a><!--
+                    --></li>
                 {% endfor %}
             </ul>
         </li>

diff --git a/selfservice/article_list.twig b/selfservice/article_list.twig
@@ -1,13 +1,11 @@
 {% if not articles.isEmpty() %}
     <ul class="sp-article-list">
         {% for article in articles %}
-            {% if type|default is empty %}
-                {# article.categories is pre filtered to categories the user can view, while article.types is not #}
-                {% set type = article.categories.first().type %}
-            {% endif %}
+            {# article.categories is pre filtered to categories the user can view, while article.types is not #}
+            {% set type = article.categories.first().type %}
 
             <li data-slug="{{ article.slug }}">
-                <a href='{{ article.url(type) }}'>
+                <a href="{{ article.url(type) }}">
                     <h4>
                         {% if show_pinned|default is not empty and show_pinned and article.pinned %}
                             <span class="sp-float-left">

diff --git a/ticket/feedback.twig b/ticket/feedback.twig
@@ -10,18 +10,45 @@
 
 {% block content %}
 
-    <div class="sp-alert sp-alert-success">{{ Lang.get('ticket.feedback_thank_you') }}</div>
-
-    {{ Lang.get('ticket.feedback_questions') }}
-
-    <br /><br />
-
-    {{ form_open({'route': ['ticket.frontend.ticket.feedback', ticket.number, token] }) }}
+    <div class="sp-flex sp-justify-center sp-mb-4">
+        <div class="sp-rounded-full sp-h-24 sp-w-24 sp-flex sp-items-center sp-justify-center sp-bg-secondary">
+            <i class="fas fa-check fa-3x sp-text-green-600"></i>
+        </div>
+    </div>
+
+    <div class="sp-text-center">
+        <h4>{{ Lang.get('ticket.feedback_saved') }}</h4>
+    </div>
+
+    <hr>
+
+    {{ form_open({'route': ['ticket.frontend.ticket.feedback', ticket.number, token]}) }}
+
+        <h2>{{ Lang.get('ticket.how_was_the_help') }}</h2>
+
+        {{ form_hidden('rating', rating) }}
+
+        <div class="sp-feedback sp-text-center sp-my-6">
+            <div class="sp-flex sp-flex-wrap">
+                <div class="sp-feedback-rating sp-w-full sp-p-3 sp-border-2 sp-border-primary sp-rounded sm:sp-w-1/3 hover:sp-cursor-pointer {% if rating == GOOD_RATING %}sp-border-secondary sp-font-semibold{% endif %}" data-rating="{{ GOOD_RATING }}">
+                    <img class="sp-inline" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAABqlBMVEUAAAAuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEuzHEeM3AYAAAAjXRSTlMAAQIDBAUGBwgJCgsMDg8QERITFBUWFxgaGxwdHh8gIiQmKSorLC4vMDIzNDY4OTo8Pj9BQ0RFR0lKS0xOT1RVVldYWVtcXV5hYmNmaG9zdHV4fH5/hYiLjo+UlZeYmp6gpaaoqqutr7C1t7q8vsHDxcfIzM7P0dPV19na3ODi5Obo6evt7/Hz9ff5+/3xUOGfAAACRklEQVQYGYXBiSOTYQDH8d+z7Z0iYpPpkhrpPuhS6dKlRBedohKx7kQpraKY7fs/9zzvsA2tz0cFvH3dbzJYk73Hy/VPdQPke3/YaDWxUZabOqgVTCfOrzv7akrDayvj18dwnq5RIe8V1qt65VT1Ys3ElK/0CzDZpEKRZ0A6rpzQZ+BxQCucBtK1WmRGgA6tpn4WZkq1oB3o1OrqgGFlVWagX5ZpaIlokWloicg6ARyVrx9+BiWFx4CLygqPAVdkPYTpgKwo0CyrByciXw9OtaR1wClZt2HCyEritMiXxDkm6yZMSTKzsF9OAqdBvgROk6y1QEzaCpmgnEasMSNfI9a4kTME16Q2eK6sxkSyJ6wFjYlkT1i+VngpPYBzKq4G5qW3sFPFeYCnKdik4gxQpnmo1n8AVfoBG1WcAdbpA8RVXAgI6wm0ybf+zUBQeZon2+WLQMboAvTJdxfOKMfLQEhOM7yWtsOckdMGyYCWXIXv8vXBDSmQhrickjT0atGmDJyR4wF1kh5AQr7LwP2gfLtTMBWQ0w4zRtJWoEGOGQamr26piB4YAdIxOV4KOuSMwoSRExwkZ3abfF2Q8uRsBm7JZ86mWfCiTL4dwCVl3QKOKMs7OZiC8a6Ysirm4KNRVmAC2K8lRksqvkI6qkVl00CnVorPAbuUs+E3MBxVIa8bq1X5yr9h3StXTuh8CsjsUSGvDyfRVhs2Uqjq0KMM1qdqrbD3O8vNdxitwrRMku9PZ1j/Er08lML3rrveqDivrKq8xGi5v+9pCmPJArjSAAAAAElFTkSuQmCC" alt="{{ Lang.get('ticket.good_satisfied') }}">
+                    <div class="sp-mt-1">{{ Lang.get('ticket.good_satisfied') }}</div>
+                </div>
+                <div class="sp-feedback-rating sp-w-full sp-p-3 sp-mt-3 sp-border-2 sp-border-primary sp-rounded sm:sp-w-1/3 sm:sp-mt-0 hover:sp-cursor-pointer {% if rating == NEUTRAL_RATING %}sp-border sp-border-secondary sp-font-semibold{% endif %}" data-rating="{{ NEUTRAL_RATING }}">
+                    <img class="sp-inline" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAABmFBMVEUAAADxxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/xxA/4+wrwAAAAh3RSTlMAAQIDBAUGBwgJCgsMDQ4PERITFBUWFxgaGxwdHyAkJikqKywuLzAzNDY4Ojw+P0FDREVHSUpMTk9SVFZXWFlcXV5iY2Zob3BzdHV4fH6ChYaIiYuPlJWXmJqeoKWmqK2vsLK1t7q8vsHDxcfIzM7P0dPV19na3ODi5Obo6evt7/Hz9ff5+/36/rmZAAACCUlEQVQYGYXBCUNMUQCG4e9M3aFFNU2apIYpoVBZIkWIKNkiVKJQ2SMiad/m/dvOuVNqVs+jJF5j3/s41uzA+RJlVfuCvT6dMcokMkGquVNKY3pwFu83VhYGC8pit6ZxRvcrmTeFNRXVrtAA1nJEexX+AGYblKz8JbAV067878DzgNJcAraqtMO8BbqVSXQNlgu1rQvoUWa1wLgSyuIwIsvUtYT1T7S1WtYF4Kx8I7CQJyk4DdxQgnkDPJb1FJYCssJAs6yHOBXydeI0SCoGLsq6BzNG1jzOOflGce7IugtzkswaNMmZxGmQ7wHOZVkFQESqgXienHqsb0a+MNZKUM4Y3JTa4ZUS6ifnHwW1rWpsYfiAfG3wWhqETuVWCZvSBzim3DzA0xxUKzcDFGkTKvQfQEh/4JByM0CxPkNMueUDQQ1DuxICXgojXznEja7CkHwdpFqNyGmGd9IRWDdyFknTK2cIbkuBLYjJ6SDVWkSWB9RKGoRJ+QJeCiOnC5aNpBqgTtl5G9AtZwJmjLLqhQ1PzmGgX9kcBa4poR9oVWal6/DFKCEwAzQpk9KfsBXWjqIloEfpYuvAce06uAKMh5XM68Nq014lv7CelGhX/pUNIH5CybwhnMn2qqCR8kOnn8WxvlYozcnfpNrsNsrAtMyy12pPUNmEr49t4PvYFzXKzSsKlewzSvUXTrn3Jn1lbwAAAAAASUVORK5CYII=" alt="{{ Lang.get('ticket.im_not_sure') }}">
+                    <div class="sp-mt-1">{{ Lang.get('ticket.im_not_sure') }}</div>
+                </div>
+                <div class="sp-feedback-rating sp-w-full sp-p-3 sp-mt-3 sp-border-2 sp-border-primary sp-rounded sm:sp-w-1/3 sm:sp-mt-0 hover:sp-cursor-pointer {% if rating == BAD_RATING %}sp-border sp-border-secondary sp-font-semibold{% endif %}" data-rating="{{ BAD_RATING }}">
+                    <img class="sp-inline" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAABpFBMVEUAAADnTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDznTDw8vlXlAAAAi3RSTlMAAQIDBAUGBwgJCgsMDQ4PERITFBUWFxgaGxwdHh8gJCYpKissLi8wMzQ2ODo8PT4/QUNERUZHSUpMTk9QUlZXWFlbXF1eYmNmaG9zdHV4fH6ChYiJi4+UlZeYmpudnqClpqitr7C1t7q8vsHDxcfIzM7P0dPV19na3N7g4uTm6Onr7e/x8/X3+fv9/9BgVAAAAkNJREFUGBmFwYlDi2EAx/Hfs/a+UUmtlLPYcuXMGbkSURJCyC20co4ICRVb7ftPe553W9tq5vNREa994FUaa+rmsVr9U8tjCr09YFRK8xjLTe/VCqYP59f19qYqf3Vd9HIC58kqFfPGscZblVd/E2uuWYWqPgNTO1Qs8hRYjCov/Am4F9IKJ4HF9coxL4FeldL6B+aqlNUN9Km0FuC5MurS8EiWiXVElGNiHRFZx4HDCjyCnxWS/ARwXhl+Argo6w7MhmQ1AAdlDeFEFBjCaZRUA5yQdQ0mjawZnA4FZnCOyLoK05LMH9gjJ44TUyCOs0PWaqBZ2gLpCjltWAmjQBvWRyNnFC5JXfBMGW3xmSFfWW3xmSFfgU54IQ3DGZXXBAvSa9iu8jzA0zRsVHkGqNYCNOo/gHr9gA0qzwA1egdR5YXab00mv492r1FeGPB1H7q0ZP88WcO+ciKQNjoHI8oyd8j72aSsgzAhbYWkUcZDYGEw1rz5RAJI1iljBPql0CJEFTgFPKlU4GgaPhs5HtAiaRjicrwUPFBOFOiU0w1zRtIWICbrGMyFtaQfpmR5KeiVMwaTRtIN6FFeJeBJugIpT84mYFBS47eJsAqcTvVL2gb0KGMQOKTS1ibhvVFGaBLYo1LWfoHFBuVUzwJ9WimaBHYqb9088LxBxbwBrE4Vqv2KdbtWeeGzKSC9S8W8EZx413rfSOH6fXfTWB8atcLu7yy30GtUgumYotDvPl//0nBhNEXgzUCrUXledX1tpdFyfwF8RgXXQ7P1gQAAAABJRU5ErkJggg==" alt="{{ Lang.get('ticket.bad_not_satisfied') }}">
+                    <div class="sp-mt-1">{{ Lang.get('ticket.bad_not_satisfied') }}</div>
+                </div>
+            </div>
+        </div>
 
         {% include 'frontend.' ~ template ~ '.forms.custom_fields' %}
 
         <div class="sp-form-button">
-            {{ form_submit(Lang.get('general.save')) }}
+            {{ form_submit(Lang.get('ticket.update_feedback')) }}
         </div>
 
     {{ form_close() }}
@@ -44,6 +71,14 @@
             // Date picker
             $('.datepicker').datepicker();
 
+            // Update the rating.
+            $('.sp-feedback-rating').on('click', function () {
+                $('form').find('.sp-feedback-rating').removeClass('sp-border-secondary sp-font-semibold');
+                $(this).addClass('sp-border-secondary sp-font-semibold');
+
+                $('form').find('input[name="rating"]').val($(this).data('rating'));
+            });
+
             // Disable form button on click
             $('form').on('submit', function () {
                 $(this).find("input[type='submit']").prop('disabled', true);

diff --git a/ticket/forms/message.twig b/ticket/forms/message.twig
@@ -1,4 +1,7 @@
-<form class="sp-message-form validate" data-ajax="ajax">
+<form class="sp-message-form validate"
+      action="{{ route('ticket.frontend.message.store') }}"
+      method="post"
+      data-ajax="ajax">
 
     {{ form_hidden('send_email_to_users', 1) }}
     {{ form_hidden('ticket_number', ticket.number) }}
@@ -35,7 +38,7 @@
                 </div>
             </div>
 
-            <div class="sp-redactor-rounded-t-none">
+            <div class="sp-redactor-rounded-t-none sp-validation-container">
                 {{ form_redactor('text') }}
             </div>
 

diff --git a/ticket/forms/submit_ticket_step2.twig b/ticket/forms/submit_ticket_step2.twig
@@ -14,7 +14,7 @@
     <p class="sp-description">{{ Lang.get('ticket.select_department_desc') }}</p>
 
     {% for department in departments %}
-        <a class="sp-department sp-block sp-px-4 sp-py-3 sp-mt-3 sp-border sp-rounded"
+        <a class="sp-department sp-block sp-px-4 sp-py-3 sp-mt-3 sp-bg-secondary sp-border sp-rounded hover:sp-bg-tertiary"
            href="{{ route('ticket.frontend.ticket.createStep3', {'department': department.id}) }}">
             <h4>{{ department.frontend_name }}</h4>
             {% if department.description is not empty %}

diff --git a/ticket/ticket_custom_fields.twig b/ticket/ticket_custom_fields.twig
@@ -1,11 +1,15 @@
-<form class="sp-custom-fields sp-mt-3 validate">
+<form class="sp-custom-fields sp-mt-3 validate"
+      data-ajax="ajax"
+      method="POST"
+      action="{{ route('ticket.frontend.ticket.saveFields', {'number': ticket.number}) }}">
+
+    {{ form_hidden('token', Request.input('token')) }}
+
     {% include 'frontend.' ~ template ~ '.forms.custom_fields' %}
 
     {% if ticket.locked == 0 %}
         <div class="sp-form-button print:sp-hidden">
-            <button class="sp-customfields-save sp-button-submit" data-token="{{ Request.input('token', '') }}" type="button">
-                {{ Lang.get('general.save') }}
-            </button>
+            {{ form_submit(Lang.get('general.save')) }}
         </div>
     {% endif %}
 </form>
diff --git a/ticket/track.twig b/ticket/track.twig
@@ -13,12 +13,18 @@
 
 		<div class="sp-form-row">
 			{{ form_label('email', Lang.get('general.email')) }}
-			{{ form_email('email') }}
+			<div class="sp-input-container">
+				{{ form_email('email') }}
+			</div>
 		</div>
+
 		<div class="sp-form-row">
 			{{ form_label('number', Lang.get('ticket.ticket_number')) }}
-			{{ form_text('number') }}
+			<div class="sp-input-container">
+				{{ form_text('number') }}
+			</div>
 		</div>
+
 		<div class="sp-form-button">
 			{{ form_submit(Lang.get('ticket.view_ticket')) }}
 		</div>

diff --git a/user/change_password.twig b/user/change_password.twig
@@ -14,7 +14,7 @@
     <div class="sp-form-row">
         {{ form_label('current_password', Lang.get('user.current_password')) }}
         <div class="sp-input-container">
-            {{ form_password('current_password', {'autocomplete': 'off', 'autofocus': 'autofocus', 'size': 20}) }}<br />
+            {{ form_password('current_password', {'autocomplete': 'off', 'autofocus': 'autofocus', 'size': 20}) }}
             <div class="sp-description">{{ Lang.get('user.personal_confirm_password') }}</div>
         </div>
     </div>

diff --git a/user/forms/twofa.twig b/user/forms/twofa.twig
@@ -2,22 +2,7 @@
     {{ form_label('twofa_qrcode', Lang.get('user.qr_code')) }}
     <div class="sp-input-container">
         <img src="{{ qrCode }}" class="sp-border sp-border-tertiary sp-rounded" />
-    </div>
-</div>
 
-<div class="sp-form-row">
-    {{ form_label('twofa_secret', Lang.get('user.two_fa_secret')) }}
-    <div class="sp-input-container">
-        {{ twofa_secret }}
-        <div class="sp-description">{{ Lang.get('user.two_fa_secret_desc') }}</div>
-    </div>
-</div>
-
-<div class="sp-form-row">
-    {{ form_label('twofa_code', Lang.get('user.verify_code')) }}
-    <div class="sp-input-container">
-        {{ form_text('twofa_code') }}<br />
-        {{ form_submit(Lang.get('user.verify_and_enable'), {'class': 'twofa-verify sp-my-3'}) }}
         <div class="sp-description">
             {{ Lang.get('user.two_fa_verify_desc') }}
 
@@ -38,3 +23,29 @@
         </div>
     </div>
 </div>
+
+<div class="sp-form-row">
+    {{ form_label('twofa_secret', Lang.get('user.two_fa_secret')) }}
+    <div class="sp-input-container">
+        {{ twofa_secret }}
+        <div class="sp-description">{{ Lang.get('user.two_fa_secret_desc') }}</div>
+    </div>
+</div>
+
+<div class="sp-form-row">
+    {{ form_label('twofa_code', Lang.get('user.verify_code')) }}
+    <div class="sp-input-container">
+        {{ form_text('twofa_code') }}
+    </div>
+</div>
+
+<div class="sp-form-row">
+    {{ form_label('password', Lang.get('general.password')) }}
+    <div class="sp-input-container">
+        {{ form_password('password') }}
+    </div>
+</div>
+
+<div class="sp-form-button">
+    {{ form_submit(Lang.get('user.verify_and_enable'), {'class': 'twofa-verify'}) }}
+</div>
diff --git a/user/login_twofa.twig b/user/login_twofa.twig
@@ -16,7 +16,7 @@
         {{ form_hidden('email', email) }}
         {{ form_hidden('twofa_token', twofa_token) }}
         {{ form_hidden('back', back) }}
-        {{ form_hidden('remember', remember) }}
+        {{ form_hidden('remember_me', remember_me) }}
 
         <div class="sp-form-row sp-form-full sp-mb-4">
             {{ form_label('twofa_code', Lang.get('user.two_fa_code')) }}

diff --git a/user/login_twofa_setup.twig b/user/login_twofa_setup.twig
@@ -16,8 +16,11 @@
     {{ form_open({'route': 'user.login.twofa.setup', 'method': 'POST', 'class': 'validate'}) }}
 
         {{ form_hidden('email', email) }}
+        {{ form_hidden('enable', 1) }}
         {{ form_hidden('twofa_token', twofa_token) }}
         {{ form_hidden('twofa_secret', twofa_secret) }}
+        {{ form_hidden('back', back) }}
+        {{ form_hidden('remember_me', remember_me) }}
 
         {% include 'frontend.' ~ template ~ '.user.forms.twofa' %}
 

diff --git a/user/twofa.twig b/user/twofa.twig
@@ -30,27 +30,32 @@
         </div>
     </div>
 
-    <form method="post" action="{{ route('user.twofa') }}">
+    {{ form_open({'method': 'POST', 'route': 'user.twofa', 'class': 'validate'}) }}
         <input type="hidden" name="enable" value="{{ 1 - auth_user().twofa_enabled }}" />
         <input type="hidden" name="twofa_secret" value="{{ twofa_secret }}" />
         {{ csrf_field() }}
 
         {% if auth_user().twofa_enabled and not Config.get('settings.force_2fa_users') %}
-
             <div class="sp-form-row">
                 {{ form_label('twofa_code', Lang.get('user.verify_code')) }}
                 <div class="sp-input-container">
-                    {{ form_text('twofa_code') }}<br />
-                    {{ form_submit(Lang.get('user.verify_and_disable'), {'class': 'twofa-verify sp-mt-3'}) }}
+                    {{ form_text('twofa_code') }}
                     <div class="sp-description">{{ Lang.get('user.verify_code_desc') }}</div>
                 </div>
             </div>
 
+            <div class="sp-form-button">
+                {{ form_submit(Lang.get('user.verify_and_disable'), {'class': 'twofa-verify'}) }}
+            </div>
         {% elseif not auth_user().twofa_enabled %}
-
             {% include 'frontend.' ~ template ~ '.user.forms.twofa' %}
-
         {% endif %}
-    </form>
+    {{ form_close() }}
+
+{% endblock %}
 
+{% block scripts_footer %}
+    {% if jsValidator|default is not empty %}
+        {{ jsValidator|raw }}
+    {% endif %}
 {% endblock %}