-
- In order to fully disable DNSSEC on your domain, you will need to work with your DNS provider to remove your DNSSEC-related records from your zone.
+
+
+
+
To fully disable DNSSEC
+
+ Click “Disable DNSSEC” below.
+ Wait until the Time to Live (TTL) expires on your DNSSEC records managed by your DNS hosting provider. This is often less than 24 hours, but confirm with your provider.
+ After the TTL expiration, disable DNSSEC at your DNS hosting provider.
+
+
Warning: If you disable DNSSEC at your DNS hosting provider before TTL expiration, this may cause your domain to appear offline.
+
DNSSEC is enabled on your domain
Disable DNSSEC
- {% elif dnssec_enabled %}
-
-
Add DS Records
-
In order to enable DNSSEC and add Delegation Signer (DS) records, you must first configure it with your DNS hosting service. Your configuration will determine whether you need to add DS Data or Key Data. Contact your DNS hosting provider if you are unsure which record type to add.
-
- Add DS Data
- Add Key Data
- Cancel
-
-
{% else %}
- It is strongly recommended that you only enable DNSSEC if you know how to set it up properly at your hosting service. If you make a mistake, it could cause your domain name to stop working.
+ It is strongly recommended that you only enable DNSSEC if you know how to set it up properly at your hosting service. If you make a mistake, it could cause your domain name to stop working.
-
Enable DNSSEC
+
Enable DNSSEC
{% endif %}
@@ -62,7 +56,7 @@
aria-labelledby="Are you sure you want to continue?"
aria-describedby="Your DNSSEC records will be deleted from the registry."
>
- {% include 'includes/modal.html' with modal_heading="Are you sure you want to continue?" modal_description="Your DNSSEC records will be deleted from the registry." modal_button=modal_button|safe %}
+ {% include 'includes/modal.html' with modal_heading="Are you sure you want to disable DNSSEC?" modal_button=modal_button|safe %}
{% endblock %} {# domain_content #}
diff --git a/src/registrar/templates/domain_dsdata.html b/src/registrar/templates/domain_dsdata.html
index ca4dce783..bdf4deb46 100644
--- a/src/registrar/templates/domain_dsdata.html
+++ b/src/registrar/templates/domain_dsdata.html
@@ -4,47 +4,24 @@
{% block title %}DS Data | {{ domain.name }} | {% endblock %}
{% block domain_content %}
- {% for form in formset %}
- {% include "includes/form_errors.html" with form=form %}
- {% endfor %}
-
- {% if domain.dnssecdata is None and not dnssec_ds_confirmed %}
+ {% if domain.dnssecdata is None %}
- You have no DS Data added. Enable DNSSEC by adding DS Data or return to the DNSSEC page and click 'enable.'
+ You have no DS Data added. Enable DNSSEC by adding DS Data.
{% endif %}
+ {% for form in formset %}
+ {% include "includes/form_errors.html" with form=form %}
+ {% endfor %}
+
DS Data
- {% if domain.dnssecdata is not None and domain.dnssecdata.keyData is not None %}
-
-
-
Warning, you cannot add DS Data
-
- You cannot add DS Data because you have already added Key Data. Delete your Key Data records in order to add DS Data.
-
-
-
- {% elif not dnssec_ds_confirmed %}
-
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.
-
Required fields are marked with an asterisk (* ).
-
- {% else %}
+
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 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 delete all DS records on your domain" modal_description="To fully disable DNSSEC: In addition to deleting your DS records here you’ll also 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=modal_button|safe %}
+
+
{% endblock %} {# domain_content #}
diff --git a/src/registrar/templates/domain_keydata.html b/src/registrar/templates/domain_keydata.html
deleted file mode 100644
index 167d86370..000000000
--- a/src/registrar/templates/domain_keydata.html
+++ /dev/null
@@ -1,110 +0,0 @@
-{% extends "domain_base.html" %}
-{% load static field_helpers url_helpers %}
-
-{% block title %}Key Data | {{ domain.name }} | {% endblock %}
-
-{% block domain_content %}
- {% for form in formset %}
- {% include "includes/form_errors.html" with form=form %}
- {% endfor %}
-
-
Key Data
-
- {% if domain.dnssecdata is not None and domain.dnssecdata.dsData is not None %}
-
-
-
Warning, you cannot add Key Data
-
- You cannot add Key Data because you have already added DS Data. Delete your DS Data records in order to add Key Data.
-
-
-
- {% elif not dnssec_key_confirmed %}
-
In order to enable DNSSEC and add DS records, you must first configure it with your DNS hosting service. Your configuration will determine whether you need to add DS Data or Key Data. Contact your DNS hosting provider if you are unsure which record type to add.
-
- {% else %}
-
-
Enter the values given by your DNS provider for DS Key Data.
- {% include "includes/required_fields.html" %}
-
-
-
-
- {% endif %}
-{% endblock %} {# domain_content #}
diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html
index 1acd87eeb..65c5254e9 100644
--- a/src/registrar/templates/domain_sidebar.html
+++ b/src/registrar/templates/domain_sidebar.html
@@ -34,7 +34,7 @@
>
DNSSEC
- {% if domain.dnssecdata is not None or request.path|startswith:url and request.path|endswith:'data' %}
+ {% if domain.dnssecdata is not None or request.path|startswith:url and request.path|endswith:'dsdata' %}
{% url 'domain-dns-dnssec-dsdata' pk=domain.id as url %}
@@ -44,15 +44,6 @@
DS Data
-
-
- {% url 'domain-dns-dnssec-keydata' pk=domain.id as url %}
-
- DS Key Data
-
-
{% endif %}
@@ -100,7 +91,7 @@
- User management
+ Domain managers
diff --git a/src/registrar/templates/domain_users.html b/src/registrar/templates/domain_users.html
index 22b9d18d1..f66eef5a6 100644
--- a/src/registrar/templates/domain_users.html
+++ b/src/registrar/templates/domain_users.html
@@ -1,10 +1,23 @@
{% extends "domain_base.html" %}
-{% load static %}
+{% load static url_helpers %}
-{% block title %}User management | {{ domain.name }} | {% endblock %}
+{% block title %}Domain managers | {{ domain.name }} | {% endblock %}
{% block domain_content %}
-
User management
+
Domain managers
+
+
+ Domain managers can update all information related to a domain within the
+ .gov registrar, including contact details, authorizing official, security
+ email, and DNS name servers.
+
+
+
+ There is no limit to the number of domain managers you can add.
+ After adding a domain manager, an email invitation will be sent to that user with
+ instructions on how to set up an account.
+ To remove a domain manager, contact us for assistance.
+
{% if domain.permissions %}
diff --git a/src/registrar/templates/includes/modal.html b/src/registrar/templates/includes/modal.html
index 996759576..1f9fbcfd4 100644
--- a/src/registrar/templates/includes/modal.html
+++ b/src/registrar/templates/includes/modal.html
@@ -1,3 +1,5 @@
+{% load static form_helpers url_helpers %}
+
@@ -18,25 +20,60 @@
-
- Cancel
-
+ {% comment %} The cancel button the DS form actually triggers a context change in the view,
+ in addition to being a close modal hook {% endcomment %}
+ {% if cancel_button_resets_ds_form %}
+
+ {% else %}
+
+ Cancel
+
+ {% endif %}
-
-
-
-
+ {% comment %} The cancel button the DS form actually triggers a context change in the view,
+ in addition to being a close modal hook {% endcomment %}
+ {% if cancel_button_resets_ds_form %}
+
+ {% else %}
+
+
+
+
+ {% endif %}