From ef7e320c61a3d925a9d62575494a7bbce9e91343 Mon Sep 17 00:00:00 2001
From: "Simon L." <szaimen@e.mail.de>
Date: Mon, 22 Jun 2026 14:51:19 +0200
Subject: [PATCH] fix(desec): keep modal markup and script with the moved entry
 block

The deSEC entry <details> was moved up above the domain submit form, but the
#desec-modal container and desec-modal.js were left behind inside the
skip_domain_validation block. Move them up to sit directly after the entry
block so the open button, modal, and wiring script are always rendered
together (and present even when domain validation is skipped). This restores
the modal flow the Playwright tests drive via #desec-frame.

Signed-off-by: Simon L. <szaimen@e.mail.de>
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Simon L. <szaimen@e.mail.de>
---
 php/templates/containers.twig | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index 61d52189..29326be6 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -120,6 +120,13 @@
                                     <button type="button" class="button" data-desec-open>Register free domain via deSEC</button>
                                 {% endif %}
                             </details>
+                            <div id="desec-modal" class="modal" role="dialog" aria-modal="true" aria-label="Register a free deSEC domain" hidden>
+                                <div class="modal-content">
+                                    <button type="button" class="modal-close" data-desec-close aria-label="Close">&times;</button>
+                                    <iframe id="desec-frame" title="Register a free deSEC domain"></iframe>
+                                </div>
+                            </div>
+                            <script type="text/javascript" src="desec-modal.js"></script>
                             <form method="POST" action="api/configuration" class="xhr">
                                 <input type="text" id="domain" name="domain" value="{{ domain }}" placeholder="nextcloud.yourdomain.com"/>
                                 <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
@@ -142,13 +149,6 @@
                                     {% endif %}
                                     <p><strong>Hint:</strong> If the domain validation fails but you are completely sure that you've configured everything correctly, you may skip the domain validation by following <a target="_blank" href="https://github.com/nextcloud/all-in-one#how-to-skip-the-domain-validation">this documentation</a>.</p>
                                 </details>
-                                <div id="desec-modal" class="modal" role="dialog" aria-modal="true" aria-label="Register a free deSEC domain" hidden>
-                                    <div class="modal-content">
-                                        <button type="button" class="modal-close" data-desec-close aria-label="Close">&times;</button>
-                                        <iframe id="desec-frame" title="Register a free deSEC domain"></iframe>
-                                    </div>
-                                </div>
-                                <script type="text/javascript" src="desec-modal.js"></script>
                             {% endif %}
 
                             <h2>Restore former AIO instance from backup</h2>