diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js
index 109d18b3d..fe248c442 100644
--- a/src/registrar/assets/js/get-gov.js
+++ b/src/registrar/assets/js/get-gov.js
@@ -285,53 +285,47 @@ function handleValidationClick(e) {
let newForm = serverForm2[0].cloneNode(true)
let formNumberRegex = RegExp(`form-(\\d){1}-`,'g')
let formLabelRegex = RegExp(`DS Data record (\\d){1}`, 'g')
- // let formExampleRegex = RegExp(`ns(\\d){1}`, 'g')
formNum++
newForm.innerHTML = newForm.innerHTML.replace(formNumberRegex, `form-${formNum}-`)
newForm.innerHTML = newForm.innerHTML.replace(formLabelRegex, `DS Data Record ${formNum+1}`)
- // newForm.innerHTML = newForm.innerHTML.replace(formExampleRegex, `ns${formNum+1}`)
container.insertBefore(newForm, addButton)
let inputs = newForm.querySelectorAll("input");
+ // Reset the values of each input to blank
+ inputs.forEach((input) => {
+ input.classList.remove("usa-input--error");
+ if (input.type === "text" || input.type === "number" || input.type === "password") {
+ input.value = ""; // Set the value to an empty string
+
+ } else if (input.type === "checkbox" || input.type === "radio") {
+ input.checked = false; // Uncheck checkboxes and radios
+ }
+ });
- // Reset the values of each input to blank
- inputs.forEach((input) => {
- input.classList.remove("usa-input--error");
- if (input.type === "text" || input.type === "number" || input.type === "password") {
- input.value = ""; // Set the value to an empty string
-
- } else if (input.type === "checkbox" || input.type === "radio") {
- input.checked = false; // Uncheck checkboxes and radios
- }
- });
+ let selects = newForm.querySelectorAll("select");
+ selects.forEach((select) => {
+ select.classList.remove("usa-input--error");
+ select.selectedIndex = 0; // Set the value to an empty string
+ });
- let selects = newForm.querySelectorAll("select");
+ let labels = newForm.querySelectorAll("label");
+ labels.forEach((label) => {
+ label.classList.remove("usa-label--error");
+ });
- selects.forEach((select) => {
- select.classList.remove("usa-input--error");
- select.selectedIndex = 0; // Set the value to an empty string
- });
+ let usaFormGroups = newForm.querySelectorAll(".usa-form-group");
+ usaFormGroups.forEach((usaFormGroup) => {
+ usaFormGroup.classList.remove("usa-form-group--error");
+ });
-
- let labels = newForm.querySelectorAll("label");
- labels.forEach((label) => {
- label.classList.remove("usa-label--error");
- });
-
-
- let usaFormGroups = newForm.querySelectorAll(".usa-form-group");
- usaFormGroups.forEach((usaFormGroup) => {
- usaFormGroup.classList.remove("usa-form-group--error");
- });
-
- let usaErrorMessages = newForm.querySelectorAll(".usa-error-message");
- usaErrorMessages.forEach((usaErrorMessage) => {
- let parentDiv = usaErrorMessage.closest('div');
- if (parentDiv) {
- parentDiv.remove(); // Remove the parent div if it exists
- }
- });
+ let usaErrorMessages = newForm.querySelectorAll(".usa-error-message");
+ usaErrorMessages.forEach((usaErrorMessage) => {
+ let parentDiv = usaErrorMessage.closest('div');
+ if (parentDiv) {
+ parentDiv.remove(); // Remove the parent div if it exists
+ }
+ });
totalForms.setAttribute('value', `${formNum+1}`)
}
diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/sass/_theme/_buttons.scss
index 2996aa023..2e58073b0 100644
--- a/src/registrar/assets/sass/_theme/_buttons.scss
+++ b/src/registrar/assets/sass/_theme/_buttons.scss
@@ -22,6 +22,27 @@ a.breadcrumb__back {
}
}
+a.usa-button {
+ text-decoration: none;
+}
+
+a.usa-button--outline,
+a.usa-button--outline:visited {
+ box-shadow: inset 0 0 0 2px color('primary');
+ color: color('primary');
+}
+
+a.usa-button--outline:hover,
+a.usa-button--outline:focus {
+ box-shadow: inset 0 0 0 2px color('primary-dark');
+ color: color('primary-dark');
+}
+
+a.usa-button--outline:active {
+ box-shadow: inset 0 0 0 2px color('primary-darker');
+ color: color('primary-darker');
+}
+
a.withdraw {
background-color: color('error');
}
@@ -60,14 +81,14 @@ a.usa-button--unstyled:visited {
color: color('primary');
}
-.dotgov-button--green {
- background-color: color('success-dark');
-
- &:hover {
- background-color: color('success-darker');
- }
-
- &:active {
- background-color: color('green-80v');
- }
-}
\ No newline at end of file
+ .dotgov-button--green {
+ background-color: color('success-dark');
+
+ &:hover {
+ background-color: color('success-darker');
+ }
+
+ &:active {
+ background-color: color('green-80v');
+ }
+ }
\ No newline at end of file
diff --git a/src/registrar/assets/sass/_theme/_fieldsets.scss b/src/registrar/assets/sass/_theme/_fieldsets.scss
index 9aab8010c..e7da538e3 100644
--- a/src/registrar/assets/sass/_theme/_fieldsets.scss
+++ b/src/registrar/assets/sass/_theme/_fieldsets.scss
@@ -5,7 +5,6 @@ fieldset {
padding: units(3);
}
-fieldset legend {
- font-weight: font-weight('bold');
- color: color('primary')
+fieldset:not(:first-child) {
+ margin-top: units(2);
}
\ No newline at end of file
diff --git a/src/registrar/assets/sass/_theme/_forms.scss b/src/registrar/assets/sass/_theme/_forms.scss
index 0929a5091..13e1a7a61 100644
--- a/src/registrar/assets/sass/_theme/_forms.scss
+++ b/src/registrar/assets/sass/_theme/_forms.scss
@@ -12,4 +12,10 @@
@include at-media('tablet') {
height: units('mobile');
}
+}
+
+.usa-form-group--unstyled-error {
+ margin-left: 0;
+ padding-left: 0;
+ border-left: none;
}
\ No newline at end of file
diff --git a/src/registrar/forms/common.py b/src/registrar/forms/common.py
index 695cb9839..71dbc24b2 100644
--- a/src/registrar/forms/common.py
+++ b/src/registrar/forms/common.py
@@ -1,10 +1,19 @@
# common.py
-# Q: What are the options?
+# reference: https://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.xhtml
ALGORITHM_CHOICES = [
(1, "ERSA/MD5 [RSAMD5]"),
(2 , "Diffie-Hellman [DH]"),
(3 ,"DSA/SHA-1 [DSA]"),
(5 ,"RSA/SHA-1 [RSASHA1]"),
+ (6 ,"DSA-NSEC3-SHA1"),
+ (7 ,"RSASHA1-NSEC3-SHA1"),
+ (8 ,"RSA/SHA-256 [RSASHA256]"),
+ (10 ,"RSA/SHA-512 [RSASHA512]"),
+ (12 ,"GOST R 34.10-2001 [ECC-GOST]"),
+ (13 ,"ECDSA Curve P-256 with SHA-256 [ECDSAP256SHA256]"),
+ (14 ,"ECDSA Curve P-384 with SHA-384 [ECDSAP384SHA384]"),
+ (15 ,"Ed25519"),
+ (16 ,"Ed448"),
]
# Q: What are the options?
DIGEST_TYPE_CHOICES = [
diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index f74c9d345..e716e6f89 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -179,14 +179,15 @@ class DomainDsdataForm(forms.Form):
# Q: Is ChoiceFiled right? Or do we need to data types other than strings
# (TypedChoiceField)
digest_type = forms.TypedChoiceField(
+ required=True,
label="Digest Type",
choices=[(None, "--Select--")] + DIGEST_TYPE_CHOICES,
# Q: Is this even needed or is a required=True sufficient?
- error_messages={
- "required": (
- "You must select a Digest Type"
- )
- },
+ # error_messages={
+ # "required": (
+ # "You must select a Digest Type"
+ # )
+ # },
)
digest = forms.CharField(
required=True,
@@ -199,10 +200,10 @@ class DomainDsdataForm(forms.Form):
# ],
)
- delete = forms.BooleanField(
- required=False,
- label="Delete",
- )
+ # delete = forms.BooleanField(
+ # required=False,
+ # label="Delete",
+ # )
# TODO: Conditional DS Key Data fields
@@ -249,10 +250,10 @@ class DomainKeydataForm(forms.Form):
label="Pub key",
)
- delete = forms.BooleanField(
- required=False,
- label="Delete",
- )
+ # delete = forms.BooleanField(
+ # required=False,
+ # label="Delete",
+ # )
# TODO: Conditional DS Key Data fields
diff --git a/src/registrar/templates/domain_dnssec.html b/src/registrar/templates/domain_dnssec.html
index 95af919d3..e21bb9458 100644
--- a/src/registrar/templates/domain_dnssec.html
+++ b/src/registrar/templates/domain_dnssec.html
@@ -30,7 +30,7 @@
Add Key Data
diff --git a/src/registrar/templates/domain_dsdata.html b/src/registrar/templates/domain_dsdata.html
index 6b2e2580f..3eeeb8c68 100644
--- a/src/registrar/templates/domain_dsdata.html
+++ b/src/registrar/templates/domain_dsdata.html
@@ -27,6 +27,8 @@
>Add DS Data record
{% else %}
+
+ Enter the values given by your DNS provider for DS Data.
{% include "includes/required_fields.html" %}