diff --git a/src/.pa11yci b/src/.pa11yci index 6bb5727e0..0ab3f4dd7 100644 --- a/src/.pa11yci +++ b/src/.pa11yci @@ -19,7 +19,6 @@ "http://localhost:8080/register/other_contacts/", "http://localhost:8080/register/anything_else/", "http://localhost:8080/register/requirements/", - "http://localhost:8080/register/review/", "http://localhost:8080/register/finished/" ] } diff --git a/src/api/views.py b/src/api/views.py index 068844919..a7dd7600a 100644 --- a/src/api/views.py +++ b/src/api/views.py @@ -91,15 +91,17 @@ def available(request, domain=""): # validate that the given domain could be a domain name and fail early if # not. if not (DraftDomain.string_could_be_domain(domain) or DraftDomain.string_could_be_domain(domain + ".gov")): - return JsonResponse({"available": False, "message": DOMAIN_API_MESSAGES["invalid"]}) + return JsonResponse({"available": False, "code": "invalid", "message": DOMAIN_API_MESSAGES["invalid"]}) # a domain is available if it is NOT in the list of current domains try: if check_domain_available(domain): - return JsonResponse({"available": True, "message": DOMAIN_API_MESSAGES["success"]}) + return JsonResponse({"available": True, "code": "success", "message": DOMAIN_API_MESSAGES["success"]}) else: - return JsonResponse({"available": False, "message": DOMAIN_API_MESSAGES["unavailable"]}) + return JsonResponse( + {"available": False, "code": "unavailable", "message": DOMAIN_API_MESSAGES["unavailable"]} + ) except Exception: - return JsonResponse({"available": False, "message": DOMAIN_API_MESSAGES["error"]}) + return JsonResponse({"available": False, "code": "error", "message": DOMAIN_API_MESSAGES["error"]}) @require_http_methods(["GET"]) diff --git a/src/registrar/management/commands/extend_expiration_dates.py b/src/registrar/management/commands/extend_expiration_dates.py index f969faa62..5e203e488 100644 --- a/src/registrar/management/commands/extend_expiration_dates.py +++ b/src/registrar/management/commands/extend_expiration_dates.py @@ -29,7 +29,8 @@ class Command(BaseCommand): self.update_success = [] self.update_skipped = [] self.update_failed = [] - self.expiration_cutoff = date(2023, 11, 15) + self.expiration_minimum_cutoff = date(2023, 11, 15) + self.expiration_maximum_cutoff = date(2023, 12, 30) def add_arguments(self, parser): """Add command line arguments.""" @@ -71,7 +72,9 @@ class Command(BaseCommand): self.check_if_positive_int(limit_parse, "limitParse") valid_domains = Domain.objects.filter( - expiration_date__gte=self.expiration_cutoff, state=Domain.State.READY + expiration_date__gte=self.expiration_minimum_cutoff, + expiration_date__lte=self.expiration_maximum_cutoff, + state=Domain.State.READY, ).order_by("name") domains_to_change_count = valid_domains.count() @@ -134,7 +137,7 @@ class Command(BaseCommand): ==Proposed Changes== Domains to change: {domains_to_change_count} """, - prompt_title="Do you wish to proceed?", + prompt_title="Do you wish to proceed with these changes?", ) logger.info(f"{TerminalColors.MAGENTA}" "Preparing to extend expiration dates..." f"{TerminalColors.ENDC}") diff --git a/src/registrar/templates/application_form.html b/src/registrar/templates/application_form.html index db72a1fc2..cec2416fb 100644 --- a/src/registrar/templates/application_form.html +++ b/src/registrar/templates/application_form.html @@ -85,16 +85,29 @@ class="usa-button usa-button--outline" >Save and return to manage your domains {% else %} - + aria-controls="toggle-submit-domain-request" + data-open-modal + >Submit your domain request {% endif %} {% endblock %} +
+ {% include 'includes/modal.html' with modal_heading=modal_heading|safe modal_description="Once you submit this request, you won’t be able to make further edits until it’s reviewed by our staff. You’ll only be able to withdraw your request." modal_button=modal_button|safe %} +
+ {% block after_form_content %}{% endblock %} diff --git a/src/registrar/templates/domain_dns.html b/src/registrar/templates/domain_dns.html index 0f625e0e3..291319a59 100644 --- a/src/registrar/templates/domain_dns.html +++ b/src/registrar/templates/domain_dns.html @@ -12,7 +12,7 @@

You can enter your name servers, as well as other DNS-related information, in the following sections:

{% url 'domain-dns-nameservers' pk=domain.id as url %} -