refactor(templates/mfa): Move cancel into slot actions

... if it is the only alternative-options button
pennersr · Sep 23, 2024 · c870b0b · c870b0b
1 parent 29f09e9
commit c870b0b
Showing 1 changed file with 28 additions and 23 deletions.
diff --git a/allauth/templates/mfa/authenticate.html b/allauth/templates/mfa/authenticate.html
@@ -23,42 +23,47 @@
             {% element button type="submit" tags="primary,mfa,login" %}
                 {% trans "Sign In" %}
             {% endelement %}
+            {% if "webauthn" not in MFA_SUPPORTED_TYPES %}
+                {% element button type="submit" form="logout-from-stage" tags="link,mfa,cancel" %}
+                    {% trans "Cancel" %}
+                {% endelement %}
+            {% endif %}
         {% endslot %}
     {% endelement %}
-    {% element hr %}
-    {% endelement %}
-    {% element h2 %}
-        {% translate "Alternative options" %}
-    {% endelement %}
-    {% element button_group vertical=True %}
-        {% if "webauthn" in MFA_SUPPORTED_TYPES %}
+    {% if "webauthn" in MFA_SUPPORTED_TYPES %}
+        {% element hr %}
+        {% endelement %}
+        {% element h2 %}
+            {% translate "Alternative options" %}
+        {% endelement %}
+        {% element button_group vertical=True %}
             {% element button form="webauthn_form" id="mfa_webauthn_authenticate" type="button" tags="outline,primary" %}
                 {% trans "Use a security key" %}
             {% endelement %}
-        {% endif %}
-        {% element button type="submit" form="logout-from-stage" tags="outline,primary,mfa,cancel" %}
-            {% trans "Cancel" %}
-        {% endelement %}
-    {% endelement %}
-    {% if "webauthn" in MFA_SUPPORTED_TYPES %}
-        {% element form id="webauthn_form" form=webauthn_form method="post" action=action_url no_visible_fields=True %}
-            {% slot body %}
-                {% csrf_token %}
-                {% element fields form=webauthn_form %}
-                {% endelement %}
-            {% endslot %}
+            {% element button type="submit" form="logout-from-stage" tags="outline,primary,mfa,cancel" %}
+                {% trans "Cancel" %}
+            {% endelement %}
         {% endelement %}
-        {{ js_data|json_script:"js_data" }}
-        {% include "mfa/webauthn/snippets/scripts.html" %}
-        <script>
+        {% if "webauthn" in MFA_SUPPORTED_TYPES %}
+            {% element form id="webauthn_form" form=webauthn_form method="post" action=action_url no_visible_fields=True %}
+                {% slot body %}
+                    {% csrf_token %}
+                    {% element fields form=webauthn_form %}
+                    {% endelement %}
+                {% endslot %}
+            {% endelement %}
+            {{ js_data|json_script:"js_data" }}
+            {% include "mfa/webauthn/snippets/scripts.html" %}
+            <script>
         allauth.webauthn.forms.authenticateForm({
         ids: {
         authenticate: "mfa_webauthn_authenticate",
         credential: "{{ webauthn_form.credential.auto_id }}"
         },
         data: JSON.parse(document.getElementById('js_data').textContent)
         })
-        </script>
+            </script>
+        {% endif %}
     {% endif %}
     <form id="logout-from-stage"
           method="post"