Merge pull request #2930 from cisagov/nl/2848-screenreader-outputs-bu…

…ndle

#2848 - screenreader outputs bundle -[Meoward]

src/registrar/assets/js/get-gov.js

@@ -1612,8 +1612,9 @@ class DomainRequestsTable extends LoadTableBase {
           const submissionDate = request.last_submitted_date ? new Date(request.last_submitted_date).toLocaleDateString('en-US', options) : `<span class="text-base">Not submitted</span>`;
 
           // The markup for the delete function either be a simple trigger or a 3 dots menu with a hidden trigger (in the case of portfolio requests page)
-          // Even if the request is not deletable, we may need these empty strings for the td if the deletable column is displayed
-          let modalTrigger = '';
+          // If the request is not deletable, use the following (hidden) span for ANDI screenreaders to indicate this state to the end user
+          let modalTrigger =  `
+          <span class="usa-sr-only">Domain request cannot be deleted now. Edit the request for more information.</span>`;
 
           let markupCreatorRow = '';
 
@@ -1625,8 +1626,8 @@ class DomainRequestsTable extends LoadTableBase {
             `
           }
 
-          // If the request is deletable, create modal body and insert it. This is true for both requests and portfolio requests pages
           if (request.is_deletable) {
+            // If the request is deletable, create modal body and insert it. This is true for both requests and portfolio requests pages
             let modalHeading = '';
             let modalDescription = '';
 

src/registrar/forms/domain_request_wizard.py

@@ -34,6 +34,7 @@ class OrganizationTypeForm(RegistrarForm):
         choices=DomainRequest.OrganizationChoicesVerbose.choices,
         widget=forms.RadioSelect,
         error_messages={"required": "Select the type of organization you represent."},
+        label="What kind of U.S.-based government organization do you represent?",
     )
 
 
@@ -77,6 +78,7 @@ class OrganizationFederalForm(RegistrarForm):
     federal_type = forms.ChoiceField(
         choices=BranchChoices.choices,
         widget=forms.RadioSelect,
+        label="Which federal branch is your organization in?",
         error_messages={"required": ("Select the part of the federal government your organization is in.")},
     )
 
@@ -88,7 +90,8 @@ class OrganizationElectionForm(RegistrarForm):
                 (True, "Yes"),
                 (False, "No"),
             ],
-        )
+        ),
+        label="Is your organization an election office?",
     )
 
     def clean_is_election_board(self):
@@ -450,6 +453,7 @@ class OtherContactsForm(RegistrarForm):
                 message="Response must be less than 320 characters.",
             )
         ],
+        help_text="Enter an email address in the required format, like [email protected].",
     )
     phone = PhoneNumberField(
         label="Phone",

src/registrar/templates/domain_request_org_federal.html

@@ -2,7 +2,7 @@
 {% load field_helpers %}
 
 {% block form_instructions %}
-  <h2 class="margin-bottom-05">
+  <h2 id="id_domain_request_federal_org_header" class="margin-bottom-05">
     Which federal branch is your organization in?
   </h2>
 {% endblock %}