diff --git a/src/registrar/templates/domain_dsdata.html b/src/registrar/templates/domain_dsdata.html
index 95e8e3d5f..ceab937bc 100644
--- a/src/registrar/templates/domain_dsdata.html
+++ b/src/registrar/templates/domain_dsdata.html
@@ -34,122 +34,376 @@
{% endif %}
{% endblock breadcrumb %}
- {% if domain.dnssecdata is None %}
-
-
- You have no DS data added. Enable DNSSEC by adding DS data.
+
+
{{ form.domain }}
+
+
+
+
+
+ DS data
+
+
In order to enable DNSSEC, you must first configure it with your DNS provider.
+ +Click βAdd DS dataβ and enter the values given by your DNS provider for DS (Delegation Signer) data. You can add a maximum of 8 DS records.
+ + {% comment %} + This template supports the rendering of three different DS data forms, conditionally displayed: + 1 - Add DS Data form (rendered when there are no existing DS data records defined for the domain) + 2 - DS Data table (rendered when the domain has existing DS data, which can be viewed and edited) + 3 - Add DS Data form (rendered above the DS Data table to add a single additional DS Data record) + {% endcomment %} + + {% if formset.initial and formset.forms.0.initial %} + + {% comment %}This section renders both the DS Data table and the Add DS Data form {% endcomment %} + + {% include "includes/required_fields.html" %} + + + + {% else %} + + {% comment %} + This section renders Add DS Data form which renders when there are no existing + DS records defined on the domain. + {% endcomment %} + +
+ {% include "includes/required_fields.html" %}
+
+
+
+
{% endif %}
- DS data
- -In order to enable DNSSEC, you must first configure it with your DNS hosting service.
- -Enter the values given by your DNS provider for DS data.
- - {% include "includes/required_fields.html" %} - - - - {% if trigger_modal %} Trigger unsaved changes modal +
+ {% include 'includes/modal.html' with modal_heading="Are you sure you want to continue?" modal_description="You have unsaved changes that will be lost." modal_button_id="unsaved-changes-click-button" modal_button_text="Continue without saving" cancel_button_text="Go back" %}
+
+
+ Trigger cancel changes modal
+
+ {% include 'includes/modal.html' with modal_heading="Are you sure you want to cancel your changes?" modal_description="This action cannot be undone." modal_button_id="cancel-changes-click-button" modal_button_text="Yes, cancel" cancel_button_text="Go back" %}
+
+
+ Trigger delete modal
+
+ {% include 'includes/modal.html' with modal_heading="Are you sure you want to delete this DS data record?" modal_description="This action cannot be undone." modal_button_id="delete-click-button" modal_button_text="Yes, delete" modal_button_class="usa-button--secondary" %}
+
+
+ Trigger Disable DNSSEC Modal
- {% endif %}
- {# Use data-force-action to take esc out of the equation and pass cancel_button_resets_ds_form to effectuate a reset in the view #}
- {% include 'includes/modal.html' with cancel_button_resets_ds_form=True modal_heading="Warning: You are about to remove all DS records on your domain." modal_description="To fully disable DNSSEC: In addition to removing your DS records here, youβll need to delete the DS records at your DNS host. To avoid causing your domain to appear offline, you should wait to delete your DS records at your DNS host until the Time to Live (TTL) expires. This is often less than 24 hours, but confirm with your provider." modal_button_id="disable-override-click-button" modal_button_text="Remove all DS data" modal_button_class="usa-button--secondary" %}
+ {% include 'includes/modal.html' with modal_heading="Warning: You are about to remove all DS records on your domain." modal_description="To fully disable DNSSEC: In addition to removing your DS records here, youβll need to delete the DS records at your DNS host. To avoid causing your domain to appear offline, you should wait to delete your DS records at your DNS host until the Time to Live (TTL) expires. This is often less than 24 hours, but confirm with your provider." modal_button_id="disable-dnssec-click-button" modal_button_text="Remove all DS data" modal_button_class="usa-button--secondary" %}
-
-
{% endblock %} {# domain_content #}
diff --git a/src/registrar/templates/domain_nameservers.html b/src/registrar/templates/domain_nameservers.html
index bd8216d05..acd73cc3b 100644
--- a/src/registrar/templates/domain_nameservers.html
+++ b/src/registrar/templates/domain_nameservers.html
@@ -82,7 +82,7 @@
This section does not render if the last form has initial data (this occurs if 13 nameservers already exist)
{% endcomment %}
- Add a name server
@@ -121,7 +121,7 @@
-
| Name servers | @@ -141,8 +141,8 @@ {{ form.domain }}|||||||
|---|---|---|---|---|---|---|---|
| {{ form.server.value }} {% if form.ip.value %}({{ form.ip.value }}){% endif %} | -+ | {{ form.server.value }} {% if form.ip.value %}({{ form.ip.value }}){% endif %} | +
|
- + | |||