From 1b813cabf8e7bbb5d75e59abd6161394683e3b69 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Mon, 23 Dec 2024 09:16:24 -0500 Subject: [PATCH 01/14] table sort on icon only --- src/registrar/assets/src/js/getgov/table-base.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/registrar/assets/src/js/getgov/table-base.js b/src/registrar/assets/src/js/getgov/table-base.js index e526c6b5f..e9830ca0e 100644 --- a/src/registrar/assets/src/js/getgov/table-base.js +++ b/src/registrar/assets/src/js/getgov/table-base.js @@ -495,8 +495,10 @@ export class BaseTable { // Add event listeners to table headers for sorting initializeTableHeaders() { this.tableHeaders.forEach(header => { - header.addEventListener('click', () => { - const sortBy = header.getAttribute('data-sortable'); + const sortBy = header.getAttribute('data-sortable'); + // add event listener to respond to clicks on the button + let button = header.querySelector('.usa-table__header__button') + button.addEventListener('click', () => { let order = 'asc'; // sort order will be ascending, unless the currently sorted column is ascending, and the user // is selecting the same column to sort in descending order From f817dbdf18c2d2aceb148a310373ad6e98638c96 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Mon, 23 Dec 2024 09:32:58 -0500 Subject: [PATCH 02/14] simulate button click outside button --- src/registrar/assets/src/js/getgov/table-base.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/registrar/assets/src/js/getgov/table-base.js b/src/registrar/assets/src/js/getgov/table-base.js index e9830ca0e..8f47ca53a 100644 --- a/src/registrar/assets/src/js/getgov/table-base.js +++ b/src/registrar/assets/src/js/getgov/table-base.js @@ -495,10 +495,12 @@ export class BaseTable { // Add event listeners to table headers for sorting initializeTableHeaders() { this.tableHeaders.forEach(header => { - const sortBy = header.getAttribute('data-sortable'); + // add event listener to respond to clicks on the button - let button = header.querySelector('.usa-table__header__button') - button.addEventListener('click', () => { + + header.addEventListener('click', function(event) { + let button = header.querySelector('.usa-table__header__button') + const sortBy = header.getAttribute('data-sortable'); let order = 'asc'; // sort order will be ascending, unless the currently sorted column is ascending, and the user // is selecting the same column to sort in descending order @@ -507,6 +509,11 @@ export class BaseTable { } // load the results with the updated sort this.loadTable(1, sortBy, order); + // Check if the click occurred outside the button + if (!button.contains(event.target)) { + // Simulate a button click + button.click(); + } }); }); } From ebe8aa7f782bc56882e6da8902280177a6392559 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Mon, 23 Dec 2024 09:41:14 -0500 Subject: [PATCH 03/14] header click updates button --- src/registrar/assets/src/js/getgov/table-base.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/registrar/assets/src/js/getgov/table-base.js b/src/registrar/assets/src/js/getgov/table-base.js index 8f47ca53a..97c256734 100644 --- a/src/registrar/assets/src/js/getgov/table-base.js +++ b/src/registrar/assets/src/js/getgov/table-base.js @@ -495,10 +495,7 @@ export class BaseTable { // Add event listeners to table headers for sorting initializeTableHeaders() { this.tableHeaders.forEach(header => { - - // add event listener to respond to clicks on the button - - header.addEventListener('click', function(event) { + header.addEventListener('click', event => { let button = header.querySelector('.usa-table__header__button') const sortBy = header.getAttribute('data-sortable'); let order = 'asc'; @@ -509,7 +506,9 @@ export class BaseTable { } // load the results with the updated sort this.loadTable(1, sortBy, order); - // Check if the click occurred outside the button + // If the click occurs outside of the button, need to simulate a button click in order + // for USWDS listener on the button to execute. + // Check first to see if click occurs outside of the button if (!button.contains(event.target)) { // Simulate a button click button.click(); From 549f099c53013a861ae88181857942c7b0f1e7ec Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Mon, 23 Dec 2024 10:10:35 -0500 Subject: [PATCH 04/14] fix sort on creator column in domain request table --- src/registrar/views/domain_requests_json.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/registrar/views/domain_requests_json.py b/src/registrar/views/domain_requests_json.py index d0e673adf..6dffc534e 100644 --- a/src/registrar/views/domain_requests_json.py +++ b/src/registrar/views/domain_requests_json.py @@ -109,6 +109,10 @@ def apply_sorting(queryset, request): sort_by = request.GET.get("sort_by", "id") # Default to 'id' order = request.GET.get("order", "asc") # Default to 'asc' + # Handle special case for 'creator' + if sort_by == "creator": + sort_by = "creator__email" + if order == "desc": sort_by = f"-{sort_by}" return queryset.order_by(sort_by) From fcf842853f6219afb02f54dfc00809a770364e38 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Mon, 23 Dec 2024 10:56:19 -0500 Subject: [PATCH 05/14] initial implementation of scss changes for arrow spacing --- src/registrar/assets/src/sass/_theme/_tables.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/registrar/assets/src/sass/_theme/_tables.scss b/src/registrar/assets/src/sass/_theme/_tables.scss index 45f0b5245..9c5cf8884 100644 --- a/src/registrar/assets/src/sass/_theme/_tables.scss +++ b/src/registrar/assets/src/sass/_theme/_tables.scss @@ -91,5 +91,13 @@ th { th[data-sortable]:not([aria-sort]) .usa-table__header__button { right: auto; } + + th[data-sortable][aria-sort=ascending] .usa-table__header__button { + right: auto; + } + + th[data-sortable][aria-sort=descending] .usa-table__header__button { + right: auto; + } } } From e2cc041feec92cef6146a00cd472ebaddac81eff Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Mon, 23 Dec 2024 10:57:53 -0500 Subject: [PATCH 06/14] condensed version --- .../assets/src/sass/_theme/_tables.scss | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/registrar/assets/src/sass/_theme/_tables.scss b/src/registrar/assets/src/sass/_theme/_tables.scss index 9c5cf8884..ea160396e 100644 --- a/src/registrar/assets/src/sass/_theme/_tables.scss +++ b/src/registrar/assets/src/sass/_theme/_tables.scss @@ -88,16 +88,14 @@ th { } @include at-media(tablet-lg) { - th[data-sortable]:not([aria-sort]) .usa-table__header__button { - right: auto; - } - - th[data-sortable][aria-sort=ascending] .usa-table__header__button { - right: auto; - } - - th[data-sortable][aria-sort=descending] .usa-table__header__button { + th[data-sortable] .usa-table__header__button { right: auto; + + &[aria-sort=ascending], + &[aria-sort=descending], + &:not([aria-sort]) { + right: auto; + } } } } From 76ebec01ce0e0220904b2d4705c5341e4b33c5fe Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Tue, 24 Dec 2024 12:46:02 -0500 Subject: [PATCH 07/14] refactored domain request form modal to remove hidden input --- .../src/js/getgov/domain-request-form.js | 12 ++++++++++ src/registrar/assets/src/js/getgov/helpers.js | 14 +++++++++++ src/registrar/assets/src/js/getgov/main.js | 3 +++ .../templates/domain_request_form.html | 14 ++++++++++- src/registrar/templates/includes/modal.html | 24 ++++++++++++++++--- src/registrar/views/domain_request.py | 13 ---------- 6 files changed, 63 insertions(+), 17 deletions(-) create mode 100644 src/registrar/assets/src/js/getgov/domain-request-form.js diff --git a/src/registrar/assets/src/js/getgov/domain-request-form.js b/src/registrar/assets/src/js/getgov/domain-request-form.js new file mode 100644 index 000000000..d9b660a50 --- /dev/null +++ b/src/registrar/assets/src/js/getgov/domain-request-form.js @@ -0,0 +1,12 @@ +import { submitForm } from './helpers.js'; + +export function initDomainRequestForm() { + document.addEventListener('DOMContentLoaded', function() { + const button = document.getElementById("domain-request-form-submit-button"); + if (button) { + button.addEventListener("click", function () { + submitForm("submit-domain-request-form"); + }); + } + }); +} \ No newline at end of file diff --git a/src/registrar/assets/src/js/getgov/helpers.js b/src/registrar/assets/src/js/getgov/helpers.js index 1afd84520..4b893ae7c 100644 --- a/src/registrar/assets/src/js/getgov/helpers.js +++ b/src/registrar/assets/src/js/getgov/helpers.js @@ -75,3 +75,17 @@ export function debounce(handler, cooldown=600) { export function getCsrfToken() { return document.querySelector('input[name="csrfmiddlewaretoken"]').value; } + +/** + * Helper function to submit a form + * @param {} form_id - the id of the form to be submitted + */ +export function submitForm(form_id) { + let form = document.getElementById(form_id); + if (form) { + console.log("submitting form"); + form.submit(); + } else { + console.error("Form '" + form_id + "' not found."); + } +} diff --git a/src/registrar/assets/src/js/getgov/main.js b/src/registrar/assets/src/js/getgov/main.js index f5ebc83a3..cee28e7a0 100644 --- a/src/registrar/assets/src/js/getgov/main.js +++ b/src/registrar/assets/src/js/getgov/main.js @@ -11,6 +11,7 @@ import { initMembersTable } from './table-members.js'; import { initMemberDomainsTable } from './table-member-domains.js'; import { initEditMemberDomainsTable } from './table-edit-member-domains.js'; import { initPortfolioNewMemberPageToggle, initAddNewMemberPageListeners, initPortfolioMemberPageRadio } from './portfolio-member-page.js'; +import { initDomainRequestForm } from './domain-request-form.js'; initDomainValidators(); @@ -36,6 +37,8 @@ initMembersTable(); initMemberDomainsTable(); initEditMemberDomainsTable(); +initDomainRequestForm(); + // Init the portfolio new member page initPortfolioMemberPageRadio(); initPortfolioNewMemberPageToggle(); diff --git a/src/registrar/templates/domain_request_form.html b/src/registrar/templates/domain_request_form.html index a076220cb..aeae9fb34 100644 --- a/src/registrar/templates/domain_request_form.html +++ b/src/registrar/templates/domain_request_form.html @@ -130,9 +130,21 @@ aria-describedby="Are you sure you want to submit a domain request?" data-force-action > - {% include 'includes/modal.html' with is_domain_request_form=True review_form_is_complete=review_form_is_complete modal_heading=modal_heading|safe modal_description=modal_description|safe modal_button=modal_button|safe %} + {% if review_form_is_complete %} + {% with modal_heading="You are about to submit a domain request for " domain_name_modal=requested_domain__name modal_description="Once you submit this request, you won’t be able to edit it until we review it. You’ll only be able to withdraw your request." modal_button_id="domain-request-form-submit-button" modal_button_text="Submit request" %} + {% include 'includes/modal.html' %} + {% endwith %} + {% else %} + {% with modal_heading="Your request form is incomplete" modal_description='This request cannot be submitted yet. Return to the request and visit the steps that are marked as "incomplete."' modal_button_text="Return to request" cancel_button_only=True %} + {% include 'includes/modal.html' %} + {% endwith %} + {% endif %} +
+ {% csrf_token %} +
+ {% block after_form_content %}{% endblock %} diff --git a/src/registrar/templates/includes/modal.html b/src/registrar/templates/includes/modal.html index 625044585..72a989484 100644 --- a/src/registrar/templates/includes/modal.html +++ b/src/registrar/templates/includes/modal.html @@ -24,8 +24,26 @@
{% if domain_manager_roles %} -
+

Domain managers

@@ -89,12 +89,13 @@ aria-describedby="You will be removed from this domain" data-force-action > - - {% with domain_name=domain.name|force_escape %} - {% include 'includes/modal.html' with modal_heading="Are you sure you want to remove yourself as a domain manager?" modal_description="You will no longer be able to manage the domain "|add:domain_name|add:"."|safe modal_button=modal_button_self|safe %} - {% endwith %} - + {% with domain_name=domain.name|force_escape counter_str=forloop.counter|stringformat:"s" %} + {% include 'includes/modal.html' with modal_heading="Are you sure you want to remove yourself as a domain manager?" modal_description="You will no longer be able to manage the domain "|add:domain_name|add:"."|safe modal_button_id="user-delete-button-"|add:counter_str|safe modal_button_text="Yes, remove myself" modal_button_class="usa-button--secondary" %} + {% endwith %} + + {% csrf_token %} + {% else %}
-
- {% with email=item.permission.user.email|default:item.permission.user|force_escape domain_name=domain.name|force_escape %} - {% include 'includes/modal.html' with modal_heading="Are you sure you want to remove " heading_value=email|add:"?" modal_description=""|add:email|add:" will no longer be able to manage the domain "|add:domain_name|add:"."|safe modal_button=modal_button|safe %} - {% endwith %} - + {% with email=item.permission.user.email|default:item.permission.user|force_escape domain_name=domain.name|force_escape counter_str=forloop.counter|stringformat:"s" %} + {% include 'includes/modal.html' with modal_heading="Are you sure you want to remove " heading_value=email|add:"?" modal_description=""|add:email|add:" will no longer be able to manage the domain "|add:domain_name|add:"."|safe modal_button_id="user-delete-button-"|add:counter_str|safe modal_button_text="Yes, remove domain manager" modal_button_class="usa-button--secondary" %} + {% endwith %}
+ + {% csrf_token %} + {% endif %} {% else %}
@@ -27,7 +28,7 @@ {% if cancel_button_only %} @@ -48,7 +49,7 @@ {{ modal_button_text }} diff --git a/src/registrar/templatetags/custom_filters.py b/src/registrar/templatetags/custom_filters.py index 6140130c8..bee130da2 100644 --- a/src/registrar/templatetags/custom_filters.py +++ b/src/registrar/templatetags/custom_filters.py @@ -290,3 +290,8 @@ def get_dict_value(dictionary, key): if isinstance(dictionary, dict): return dictionary.get(key, "") return "" + +@register.filter +def button_class(custom_class): + default_class = "usa-button" + return f"{default_class} {custom_class}" if custom_class else default_class diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index cb3da1f83..54689e3ce 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -1050,9 +1050,6 @@ class DomainUsersView(DomainBaseView): # Add conditionals to the context (such as "can_delete_users") context = self._add_booleans_to_context(context) - # Add modal buttons to the context (such as for delete) - context = self._add_modal_buttons_to_context(context) - # Get portfolio from session (if set) portfolio = self.request.session.get("portfolio") @@ -1149,26 +1146,6 @@ class DomainUsersView(DomainBaseView): context["can_delete_users"] = can_delete_users return context - def _add_modal_buttons_to_context(self, context): - """Adds modal buttons (and their HTML) to the context""" - # Create HTML for the modal button - modal_button = ( - '' - ) - context["modal_button"] = modal_button - - # Create HTML for the modal button when deleting yourself - modal_button_self = ( - '' - ) - context["modal_button_self"] = modal_button_self - - return context - class DomainAddUserView(DomainFormBaseView): """Inside of a domain's user management, a form for adding users. From 05de74dc9e128a6239fa2e71fe91fe5285404864 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Thu, 26 Dec 2024 06:52:42 -0500 Subject: [PATCH 09/14] fixed modal focustrap in ds data form modal --- .../assets/src/js/getgov/domain-dsdata.js | 27 +++++++++++++++++++ src/registrar/assets/src/js/getgov/main.js | 2 ++ src/registrar/templates/domain_dsdata.html | 12 +++++++-- src/registrar/views/domain.py | 9 ------- 4 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 src/registrar/assets/src/js/getgov/domain-dsdata.js diff --git a/src/registrar/assets/src/js/getgov/domain-dsdata.js b/src/registrar/assets/src/js/getgov/domain-dsdata.js new file mode 100644 index 000000000..7c0871bec --- /dev/null +++ b/src/registrar/assets/src/js/getgov/domain-dsdata.js @@ -0,0 +1,27 @@ +import { submitForm } from './helpers.js'; + +export function initDomainDSData() { + document.addEventListener('DOMContentLoaded', function() { + let domain_dsdata_page = document.getElementById("domain-dsdata"); + if (domain_dsdata_page) { + const override_button = document.getElementById("disable-override-click-button"); + const cancel_button = document.getElementById("btn-cancel-click-button"); + const cancel_close_button = document.getElementById("btn-cancel-click-close-button"); + if (override_button) { + override_button.addEventListener("click", function () { + submitForm("disable-override-click-form"); + }); + } + if (cancel_button) { + cancel_button.addEventListener("click", function () { + submitForm("btn-cancel-click-form"); + }); + } + if (cancel_close_button) { + cancel_close_button.addEventListener("click", function () { + submitForm("btn-cancel-click-form"); + }); + } + } + }); +} \ No newline at end of file diff --git a/src/registrar/assets/src/js/getgov/main.js b/src/registrar/assets/src/js/getgov/main.js index 0706639c4..d7d19e745 100644 --- a/src/registrar/assets/src/js/getgov/main.js +++ b/src/registrar/assets/src/js/getgov/main.js @@ -13,6 +13,7 @@ import { initEditMemberDomainsTable } from './table-edit-member-domains.js'; import { initPortfolioNewMemberPageToggle, initAddNewMemberPageListeners, initPortfolioMemberPageRadio } from './portfolio-member-page.js'; import { initDomainRequestForm } from './domain-request-form.js'; import { initDomainManagersPage } from './domain-managers.js'; +import { initDomainDSData } from './domain-dsdata.js'; initDomainValidators(); @@ -40,6 +41,7 @@ initEditMemberDomainsTable(); initDomainRequestForm(); initDomainManagersPage(); +initDomainDSData(); // Init the portfolio new member page initPortfolioMemberPageRadio(); diff --git a/src/registrar/templates/domain_dsdata.html b/src/registrar/templates/domain_dsdata.html index 0f60235e1..5ebb264c4 100644 --- a/src/registrar/templates/domain_dsdata.html +++ b/src/registrar/templates/domain_dsdata.html @@ -42,7 +42,7 @@ {% include "includes/form_errors.html" with form=form %} {% endfor %} -

DS data

+

DS data

In order to enable DNSSEC, you must first configure it with your DNS hosting service.

@@ -141,7 +141,15 @@ aria-describedby="Your DNSSEC records will be deleted from the registry." data-force-action > - {% 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=modal_button|safe %} + {% 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" %}
+ + {% csrf_token %} + + + + {% csrf_token %} + + {% endblock %} {# domain_content #} diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 54689e3ce..c84551fe0 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -906,15 +906,6 @@ class DomainDsDataView(DomainFormBaseView): # to preserve the context["form"] context = super().get_context_data(form=formset) context["trigger_modal"] = True - # Create HTML for the modal button - modal_button = ( - '' - ) - - # context to back out of a broken form on all fields delete - context["modal_button"] = modal_button return self.render_to_response(context) if formset.is_valid() or override: From 4f5767815680aa0caff12fb268836daf7fe4266a Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Thu, 26 Dec 2024 07:11:19 -0500 Subject: [PATCH 10/14] fix for focustrap on dnssec modal --- .../assets/src/js/getgov/domain-dnssec.js | 15 +++++++++++++++ src/registrar/assets/src/js/getgov/main.js | 2 ++ src/registrar/templates/domain_dnssec.html | 8 ++++++-- src/registrar/views/domain.py | 9 --------- 4 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 src/registrar/assets/src/js/getgov/domain-dnssec.js diff --git a/src/registrar/assets/src/js/getgov/domain-dnssec.js b/src/registrar/assets/src/js/getgov/domain-dnssec.js new file mode 100644 index 000000000..860359fe0 --- /dev/null +++ b/src/registrar/assets/src/js/getgov/domain-dnssec.js @@ -0,0 +1,15 @@ +import { submitForm } from './helpers.js'; + +export function initDomainDNSSEC() { + document.addEventListener('DOMContentLoaded', function() { + let domain_dnssec_page = document.getElementById("domain-dnssec"); + if (domain_dnssec_page) { + const button = document.getElementById("disable-dnssec-button"); + if (button) { + button.addEventListener("click", function () { + submitForm("disable-dnssec-form"); + }); + } + } + }); +} \ No newline at end of file diff --git a/src/registrar/assets/src/js/getgov/main.js b/src/registrar/assets/src/js/getgov/main.js index d7d19e745..3ba64bed8 100644 --- a/src/registrar/assets/src/js/getgov/main.js +++ b/src/registrar/assets/src/js/getgov/main.js @@ -14,6 +14,7 @@ import { initPortfolioNewMemberPageToggle, initAddNewMemberPageListeners, initPo import { initDomainRequestForm } from './domain-request-form.js'; import { initDomainManagersPage } from './domain-managers.js'; import { initDomainDSData } from './domain-dsdata.js'; +import { initDomainDNSSEC } from './domain-dnssec.js'; initDomainValidators(); @@ -42,6 +43,7 @@ initEditMemberDomainsTable(); initDomainRequestForm(); initDomainManagersPage(); initDomainDSData(); +initDomainDNSSEC(); // Init the portfolio new member page initPortfolioMemberPageRadio(); diff --git a/src/registrar/templates/domain_dnssec.html b/src/registrar/templates/domain_dnssec.html index cfec053c2..2dd306d7d 100644 --- a/src/registrar/templates/domain_dnssec.html +++ b/src/registrar/templates/domain_dnssec.html @@ -27,7 +27,7 @@ {% endif %} {% endblock breadcrumb %} -

DNSSEC

+

DNSSEC

DNSSEC, or DNS Security Extensions, is an additional security layer to protect your website. Enabling DNSSEC ensures that when someone visits your domain, they can be certain that it’s connecting to the correct server, preventing potential hijacking or tampering with your domain's records.

@@ -78,7 +78,11 @@ 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 disable DNSSEC?" modal_button=modal_button|safe %} + {% include 'includes/modal.html' with modal_heading="Are you sure you want to disable DNSSEC?" modal_button_id="disable_dnssec_button" modal_button_text="Confirm" modal_button_class="usa-button--secondary" %} +
+ {% csrf_token %} + + {% endblock %} {# domain_content #} diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index c84551fe0..45f1e6ad2 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -805,15 +805,6 @@ class DomainDNSSECView(DomainFormBaseView): context = super().get_context_data(**kwargs) has_dnssec_records = self.object.dnssecdata is not None - - # Create HTML for the modal button - modal_button = ( - '' - ) - - context["modal_button"] = modal_button context["has_dnssec_records"] = has_dnssec_records context["dnssec_enabled"] = self.request.session.pop("dnssec_enabled", False) From 962e760c115ffa74bd776ecaf96fe989f0aec438 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Thu, 26 Dec 2024 07:32:28 -0500 Subject: [PATCH 11/14] fix for focustrap on dnssec modal --- src/registrar/templates/domain_dnssec.html | 4 +- src/registrar/templates/includes/modal.html | 49 ++++++++------------ src/registrar/templatetags/custom_filters.py | 3 +- 3 files changed, 23 insertions(+), 33 deletions(-) diff --git a/src/registrar/templates/domain_dnssec.html b/src/registrar/templates/domain_dnssec.html index 2dd306d7d..a795fb2fc 100644 --- a/src/registrar/templates/domain_dnssec.html +++ b/src/registrar/templates/domain_dnssec.html @@ -78,9 +78,9 @@ 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 disable DNSSEC?" modal_button_id="disable_dnssec_button" modal_button_text="Confirm" modal_button_class="usa-button--secondary" %} + {% include 'includes/modal.html' with modal_heading="Are you sure you want to disable DNSSEC?" modal_button_id="disable-dnssec-button" modal_button_text="Confirm" modal_button_class="usa-button--secondary" %} -
+ {% csrf_token %} diff --git a/src/registrar/templates/includes/modal.html b/src/registrar/templates/includes/modal.html index c07a76ed9..0540e9530 100644 --- a/src/registrar/templates/includes/modal.html +++ b/src/registrar/templates/includes/modal.html @@ -53,28 +53,20 @@ > {{ modal_button_text }} - {% else %} -
- {% csrf_token %} - {{ modal_button }} - {% 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 %} -
    - {% csrf_token %} - - + {% elif not cancel_button_only %} - + {% else %} {% elif modal_button_id and modal_button_text %} + {% comment %} Adding button id allows for onclick listeners on button by id, + which execute form submission on form elsewhere on a page outside modal.{% endcomment %}
    • Domain managers