#2848 - screenreader outputs bundle -[Meoward]

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

@@ -1625,8 +1625,14 @@ 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 (!request.is_deletable) {
+ // If the request is not deletable, insert a message
+ // for the screenreader to pickup explaining the empty table cell
+ modalTrigger = `
+ <span class="usa-sr-only">Domain request cannot be deleted now. Edit the request for more information.</span>`
+ }
+ else {
+ // 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

@@ -27,6 +27,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?",
  )
 
 
@@ -70,6 +71,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.")},
  )
 
@@ -81,7 +83,8 @@ class OrganizationElectionForm(RegistrarForm):
  (True, "Yes"),
  (False, "No"),
  ],
- )
+ ),
+ label="Is your organization an election office?",
  )
 
  def clean_is_election_board(self):
@@ -226,7 +229,10 @@ def from_database(cls, obj):
  email = forms.EmailField(
  label="Email",
  max_length=None,
- error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
+ error_messages={
+ "invalid": ("Enter an email address in the required format, like name@example.com."),
+ "required": ("Enter an email address in the required format, like name@example.com."),
+ },
  validators=[
  MaxLengthValidator(
  320,
@@ -440,6 +446,7 @@ class OtherContactsForm(RegistrarForm):
  message="Response must be less than 320 characters.",
  )
  ],
+ help_text="Enter an email address in the required format, like name@example.com.",
  )
  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 %}