From 8d13ea2f9fd80b663cc25b12f70e33b029b76378 Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Tue, 8 Oct 2024 17:48:25 -0600
Subject: [PATCH] Initial ANDI screenreader fixes

---
 src/registrar/forms/domain_request_wizard.py            | 6 +++++-
 src/registrar/templates/domain_request_org_federal.html | 2 +-
 src/registrar/templates/includes/senior_official.html   | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index f2fdd32bc..29e9fa639 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/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):
@@ -440,6 +443,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",
diff --git a/src/registrar/templates/domain_request_org_federal.html b/src/registrar/templates/domain_request_org_federal.html
index 834298f24..8e0aa3938 100644
--- a/src/registrar/templates/domain_request_org_federal.html
+++ b/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 %}
diff --git a/src/registrar/templates/includes/senior_official.html b/src/registrar/templates/includes/senior_official.html
index 0302bc71f..073b82457 100644
--- a/src/registrar/templates/includes/senior_official.html
+++ b/src/registrar/templates/includes/senior_official.html
@@ -21,7 +21,9 @@
         {% input_with_errors form.first_name %}
         {% input_with_errors form.last_name %}
         {% input_with_errors form.title %}
-        {% input_with_errors form.email %}
+        {% with sublabel_text="Enter an email address in the required format, like name@example.com." %}
+            {% input_with_errors form.email %}
+        {% endwith %}
         <button type="submit" class="usa-button">Save</button>
     </form>
 {% elif not form.full_name.value and not form.title.value and not form.email.value %}