From 2eb25f4b78b4a37e6d36c671b9417eb919c2d0b5 Mon Sep 17 00:00:00 2001
From: Pinga <121483313+getpinga@users.noreply.github.com>
Date: Sat, 29 Mar 2025 18:38:33 +0200
Subject: [PATCH] Improved DNSSEC design in CP

---
 .../views/admin/domains/createDomain.twig     | 80 +++++++++++--------
 .../views/admin/domains/updateDomain.twig     | 80 +++++++++++--------
 2 files changed, 90 insertions(+), 70 deletions(-)

diff --git a/cp/resources/views/admin/domains/createDomain.twig b/cp/resources/views/admin/domains/createDomain.twig
index 4fa52c1..990e741 100644
--- a/cp/resources/views/admin/domains/createDomain.twig
+++ b/cp/resources/views/admin/domains/createDomain.twig
@@ -244,42 +244,52 @@
                                 <label class="form-check-label" for="addDnssec">{{ __('Add DNSSEC Data') }}</label>
                             </div>
                             <div id="dnssecData" style="display: none;">
-                                <div class="row">
-                                  <div class="col-md-6">
-                                    <div class="mb-3">
-                                        <label for="dsKeyTag" class="form-label">{{ __('DS Record') }}</label>
-                                        <input type="text" class="form-control mb-2" placeholder="{{ __('Key Tag') }}" name="dsKeyTag" id="dsKeyTag">
-                                        <select class="form-select mb-2" name="dsAlg">
-                                            <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
-                                            <option value="8">RSA/SHA-256</option>
-                                            <option value="13">ECDSA Curve P-256 with SHA-256</option>
-                                            <option value="14">ECDSA Curve P-384 with SHA-384</option>
-                                            <option value="15">Ed25519</option>
-                                            <option value="16">Ed448</option>
-                                        </select>
-                                        <select class="form-select mb-2" name="dsDigestType">
-                                            <option value="" disabled selected>{{ __('Select Digest Type') }}</option>
-                                            <option value="2">SHA-256</option>
-                                            <option value="4">SHA-384</option>
-                                        </select>
-                                        <input type="text" class="form-control mb-2" placeholder="{{ __('Digest') }}" name="dsDigest">
-                                    </div>
+                                <div class="row mb-3">
+                                  <label for="dsKeyTag" class="form-label">{{ __('DS Record') }}</label>
+                                  <div class="col-sm-4 col-md-4">
+                                    <input type="text" class="form-control mb-2" placeholder="{{ __('Key Tag') }}" name="dsKeyTag" id="dsKeyTag">
                                   </div>
-                                  <div class="col-md-6">
-                                    <div class="mb-3">
-                                        <label for="dnskeyFlags" class="form-label">{{ __('DNSKEY Record') }}</label>
-                                        <input type="number" class="form-control mb-2" placeholder="{{ __('Flags') }}" name="dnskeyFlags" id="dnskeyFlags">
-                                        <input type="number" class="form-control mb-2" placeholder="{{ __('Protocol') }}" name="dnskeyProtocol" value="3" readonly> <!-- Protocol is typically set to 3 -->
-                                        <select class="form-select mb-2" name="dnskeyAlg">
-                                            <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
-                                            <option value="8">RSA/SHA-256</option>
-                                            <option value="13">ECDSA Curve P-256 with SHA-256</option>
-                                            <option value="14">ECDSA Curve P-384 with SHA-384</option>
-                                            <option value="15">Ed25519</option>
-                                            <option value="16">Ed448</option>
-                                        </select>
-                                        <input type="text" class="form-control mb-2" placeholder="{{ __('Public Key') }}" name="dnskeyPubKey">
-                                    </div>
+                                  <div class="col-sm-4 col-md-4">
+                                    <select class="form-select mb-2" name="dsAlg">
+                                      <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
+                                      <option value="8">RSA/SHA-256</option>
+                                      <option value="13">ECDSA Curve P-256 with SHA-256</option>
+                                      <option value="14">ECDSA Curve P-384 with SHA-384</option>
+                                      <option value="15">Ed25519</option>
+                                      <option value="16">Ed448</option>
+                                    </select>
+                                  </div>
+                                  <div class="col-sm-4 col-md-4">
+                                    <select class="form-select mb-2" name="dsDigestType">
+                                      <option value="" disabled selected>{{ __('Select Digest Type') }}</option>
+                                      <option value="2">SHA-256</option>
+                                      <option value="4">SHA-384</option>
+                                    </select>
+                                  </div>
+                                  <div class="col-sm-12 col-md-12">
+                                    <input type="text" class="form-control mb-2" placeholder="{{ __('Digest') }}" name="dsDigest">
+                                  </div>
+                                </div>
+                                <div class="row mb-3">
+                                  <label for="dnskeyFlags" class="form-label">{{ __('DNSKEY Record') }}</label>
+                                  <div class="col-sm-4 col-md-4">
+                                    <input type="number" class="form-control mb-2" placeholder="{{ __('Flags') }}" name="dnskeyFlags" id="dnskeyFlags">
+                                  </div>
+                                  <div class="col-sm-4 col-md-4">
+                                    <input type="number" class="form-control mb-2" placeholder="{{ __('Protocol') }}" name="dnskeyProtocol" value="3" readonly>
+                                  </div>
+                                  <div class="col-sm-4 col-md-4">
+                                    <select class="form-select mb-2" name="dnskeyAlg">
+                                      <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
+                                      <option value="8">RSA/SHA-256</option>
+                                      <option value="13">ECDSA Curve P-256 with SHA-256</option>
+                                      <option value="14">ECDSA Curve P-384 with SHA-384</option>
+                                      <option value="15">Ed25519</option>
+                                      <option value="16">Ed448</option>
+                                    </select>
+                                  </div>
+                                  <div class="col-sm-12 col-md-12">
+                                    <input type="text" class="form-control mb-2" placeholder="{{ __('Public Key') }}" name="dnskeyPubKey">
                                   </div>
                                 </div>
                                 {% if launch_phases == 'on' %}<hr />{% endif %}
diff --git a/cp/resources/views/admin/domains/updateDomain.twig b/cp/resources/views/admin/domains/updateDomain.twig
index ca27122..e30f0ca 100644
--- a/cp/resources/views/admin/domains/updateDomain.twig
+++ b/cp/resources/views/admin/domains/updateDomain.twig
@@ -319,42 +319,52 @@
                             <label class="form-check-label" for="addDnssec">{{ __('Add DNSSEC Data') }}</label>
                         </div>
                         <div id="dnssecData" style="display: none;">
-                          <div class="row">
-                            <div class="col-md-6">
-                                <div class="mb-3">
-                                    <label for="dsKeyTag" class="form-label">{{ __('DS Record') }}</label>
-                                    <input type="text" class="form-control mb-2" placeholder="{{ __('Key Tag') }}" name="dsKeyTag" id="dsKeyTag">
-                                    <select class="form-select mb-2" name="dsAlg">
-                                        <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
-                                        <option value="8">RSA/SHA-256</option>
-                                        <option value="13">ECDSA Curve P-256 with SHA-256</option>
-                                        <option value="14">ECDSA Curve P-384 with SHA-384</option>
-                                        <option value="15">Ed25519</option>
-                                        <option value="16">Ed448</option>
-                                    </select>
-                                    <select class="form-select mb-2" name="dsDigestType">
-                                        <option value="" disabled selected>{{ __('Select Digest Type') }}</option>
-                                        <option value="2">SHA-256</option>
-                                        <option value="4">SHA-384</option>
-                                    </select>
-                                    <input type="text" class="form-control mb-2" placeholder="{{ __('Digest') }}" name="dsDigest">
-                                </div>
+                          <div class="row mb-3">
+                            <label for="dsKeyTag" class="form-label">{{ __('DS Record') }}</label>
+                            <div class="col-sm-4 col-md-4">
+                              <input type="text" class="form-control mb-2" placeholder="{{ __('Key Tag') }}" name="dsKeyTag" id="dsKeyTag">
                             </div>
-                            <div class="col-md-6">
-                                <div class="mb-3">
-                                    <label for="dnskeyFlags" class="form-label">{{ __('DNSKEY Record') }}</label>
-                                    <input type="number" class="form-control mb-2" placeholder="{{ __('Flags') }}" name="dnskeyFlags" id="dnskeyFlags">
-                                    <input type="number" class="form-control mb-2" placeholder="{{ __('Protocol') }}" name="dnskeyProtocol" value="3" readonly> <!-- Protocol is typically set to 3 -->
-                                    <select class="form-select mb-2" name="dnskeyAlg">
-                                        <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
-                                        <option value="8">RSA/SHA-256</option>
-                                        <option value="13">ECDSA Curve P-256 with SHA-256</option>
-                                        <option value="14">ECDSA Curve P-384 with SHA-384</option>
-                                        <option value="15">Ed25519</option>
-                                        <option value="16">Ed448</option>
-                                    </select>
-                                    <input type="text" class="form-control mb-2" placeholder="{{ __('Public Key') }}" name="dnskeyPubKey">
-                                </div>
+                            <div class="col-sm-4 col-md-4">
+                              <select class="form-select mb-2" name="dsAlg">
+                                <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
+                                <option value="8">RSA/SHA-256</option>
+                                <option value="13">ECDSA Curve P-256 with SHA-256</option>
+                                <option value="14">ECDSA Curve P-384 with SHA-384</option>
+                                <option value="15">Ed25519</option>
+                                <option value="16">Ed448</option>
+                              </select>
+                            </div>
+                            <div class="col-sm-4 col-md-4">
+                              <select class="form-select mb-2" name="dsDigestType">
+                                <option value="" disabled selected>{{ __('Select Digest Type') }}</option>
+                                <option value="2">SHA-256</option>
+                                <option value="4">SHA-384</option>
+                              </select>
+                            </div>
+                            <div class="col-sm-12 col-md-12">
+                              <input type="text" class="form-control mb-2" placeholder="{{ __('Digest') }}" name="dsDigest">
+                            </div>
+                          </div>
+                          <div class="row mb-3">
+                            <label for="dnskeyFlags" class="form-label">{{ __('DNSKEY Record') }}</label>
+                            <div class="col-sm-4 col-md-4">
+                              <input type="number" class="form-control mb-2" placeholder="{{ __('Flags') }}" name="dnskeyFlags" id="dnskeyFlags">
+                            </div>
+                            <div class="col-sm-4 col-md-4">
+                              <input type="number" class="form-control mb-2" placeholder="{{ __('Protocol') }}" name="dnskeyProtocol" value="3" readonly>
+                            </div>
+                            <div class="col-sm-4 col-md-4">
+                              <select class="form-select mb-2" name="dnskeyAlg">
+                                <option value="" disabled selected>{{ __('Select Algorithm') }}</option>
+                                <option value="8">RSA/SHA-256</option>
+                                <option value="13">ECDSA Curve P-256 with SHA-256</option>
+                                <option value="14">ECDSA Curve P-384 with SHA-384</option>
+                                <option value="15">Ed25519</option>
+                                <option value="16">Ed448</option>
+                              </select>
+                            </div>
+                            <div class="col-sm-12 col-md-12">
+                              <input type="text" class="form-control mb-2" placeholder="{{ __('Public Key') }}" name="dnskeyPubKey">
                             </div>
                           </div>
                         </div>