From 95bfe3c137bf3c8cceed2877ff35c7d563c7e750 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Fri, 17 Nov 2023 12:39:54 -0800
Subject: [PATCH 01/85] Italicizing the required fields sentence

---
 src/registrar/templates/includes/required_fields.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/includes/required_fields.html b/src/registrar/templates/includes/required_fields.html
index 58612a284..c710644c5 100644
--- a/src/registrar/templates/includes/required_fields.html
+++ b/src/registrar/templates/includes/required_fields.html
@@ -1,3 +1,3 @@
   <p class="margin-top-3">
-    Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required" title="required">*</abbr>).
+    <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required" title="required">*</abbr>).</i>
   </p>

From faa2eaa40a256640e5a0f82e84dedd38b74761ef Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Fri, 17 Nov 2023 13:20:19 -0800
Subject: [PATCH 02/85] Changed urbanization label

---
 src/registrar/forms/application_wizard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index a70c23e52..bccc9179b 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -268,7 +268,7 @@ class OrganizationContactForm(RegistrarForm):
     )
     urbanization = forms.CharField(
         required=False,
-        label="Urbanization (Puerto Rico only)",
+        label="Urbanization (required for Puerto Rico only)",
     )
 
     def clean_federal_agency(self):

From 61475f6cb05653273359318b336278ac1ed1547c Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Fri, 17 Nov 2023 13:25:30 -0800
Subject: [PATCH 03/85] Changed urbanization label

---
 ...omainapplication_more_organization_information_and_more.py | 2 +-
 src/registrar/migrations/0018_domaininformation.py            | 2 +-
 .../0027_alter_domaininformation_address_line1_and_more.py    | 4 ++--
 src/registrar/models/domain_application.py                    | 2 +-
 src/registrar/models/domain_information.py                    | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py b/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py
index 49df16fbb..4fdcdfeaf 100644
--- a/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py
+++ b/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py
@@ -106,7 +106,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="domainapplication",
             name="urbanization",
-            field=models.TextField(blank=True, help_text="Urbanization (Puerto Rico only)", null=True),
+            field=models.TextField(blank=True, help_text="Urbanization (required for Puerto Rico only)", null=True),
         ),
         migrations.AlterField(
             model_name="domainapplication",
diff --git a/src/registrar/migrations/0018_domaininformation.py b/src/registrar/migrations/0018_domaininformation.py
index 582a6e244..931d99d4a 100644
--- a/src/registrar/migrations/0018_domaininformation.py
+++ b/src/registrar/migrations/0018_domaininformation.py
@@ -146,7 +146,7 @@ class Migration(migrations.Migration):
                     "urbanization",
                     models.TextField(
                         blank=True,
-                        help_text="Urbanization (Puerto Rico only)",
+                        help_text="Urbanization (required for Puerto Rico only)",
                         null=True,
                     ),
                 ),
diff --git a/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py b/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
index 9f362c956..97912334e 100644
--- a/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
+++ b/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
@@ -45,9 +45,9 @@ class Migration(migrations.Migration):
             name="urbanization",
             field=models.TextField(
                 blank=True,
-                help_text="Urbanization (Puerto Rico only)",
+                help_text="Urbanization (required for Puerto Rico only)",
                 null=True,
-                verbose_name="Urbanization (Puerto Rico only)",
+                verbose_name="Urbanization (required for Puerto Rico only)",
             ),
         ),
     ]
diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py
index 86b8a0f7a..5045311b3 100644
--- a/src/registrar/models/domain_application.py
+++ b/src/registrar/models/domain_application.py
@@ -465,7 +465,7 @@ class DomainApplication(TimeStampedModel):
     urbanization = models.TextField(
         null=True,
         blank=True,
-        help_text="Urbanization (Puerto Rico only)",
+        help_text="Urbanization (required for Puerto Rico only)",
     )
 
     about_your_organization = models.TextField(
diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py
index d2bc5c53d..4080f357b 100644
--- a/src/registrar/models/domain_information.py
+++ b/src/registrar/models/domain_information.py
@@ -131,8 +131,8 @@ class DomainInformation(TimeStampedModel):
     urbanization = models.TextField(
         null=True,
         blank=True,
-        help_text="Urbanization (Puerto Rico only)",
-        verbose_name="Urbanization (Puerto Rico only)",
+        help_text="Urbanization (required for Puerto Rico only)",
+        verbose_name="Urbanization (required for Puerto Rico only)",
     )
 
     about_your_organization = models.TextField(

From 94adf2246dc4b3c832dfb758c20b6beb1a3c44a2 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Fri, 17 Nov 2023 14:34:51 -0800
Subject: [PATCH 04/85] Added optional to name server labels above 2

---
 src/registrar/views/domain.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 88fad1567..9a0e2ea68 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -253,6 +253,7 @@ class DomainNameserversView(DomainFormBaseView):
                 form.fields["server"].required = True
             else:
                 form.fields["server"].required = False
+                form.fields["server"].label += f" (optional)"
             form.fields["domain"].initial = self.object.name
         return formset
 

From 7b9bbb939056ea1c27490c7a7ea24756847c7c2c Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Fri, 17 Nov 2023 14:50:38 -0800
Subject: [PATCH 05/85] fix python syntax

---
 src/registrar/views/domain.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 9a0e2ea68..3aa7cc9df 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -253,7 +253,7 @@ class DomainNameserversView(DomainFormBaseView):
                 form.fields["server"].required = True
             else:
                 form.fields["server"].required = False
-                form.fields["server"].label += f" (optional)"
+                form.fields["server"].label += " (optional)"
             form.fields["domain"].initial = self.object.name
         return formset
 

From 3f1ac333f8716da6463ad62d4461aa283019f9e1 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Fri, 17 Nov 2023 14:59:29 -0800
Subject: [PATCH 06/85] added "(optional)" to instances of Street address 2
 fields

---
 src/registrar/forms/application_wizard.py                     | 2 +-
 ...omainapplication_more_organization_information_and_more.py | 2 +-
 src/registrar/migrations/0018_domaininformation.py            | 2 +-
 .../0026_alter_domainapplication_address_line2_and_more.py    | 4 ++--
 .../0027_alter_domaininformation_address_line1_and_more.py    | 4 ++--
 src/registrar/models/domain_application.py                    | 2 +-
 src/registrar/models/domain_information.py                    | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index bccc9179b..972aa42c6 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -244,7 +244,7 @@ class OrganizationContactForm(RegistrarForm):
     )
     address_line2 = forms.CharField(
         required=False,
-        label="Street address line 2",
+        label="Street address line 2 (optional)",
     )
     city = forms.CharField(
         label="City",
diff --git a/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py b/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py
index 4fdcdfeaf..c48d95188 100644
--- a/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py
+++ b/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py
@@ -31,7 +31,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="domainapplication",
             name="address_line2",
-            field=models.CharField(blank=True, help_text="Street address line 2", max_length=15, null=True),
+            field=models.CharField(blank=True, help_text="Street address line 2 (optional)", max_length=15, null=True),
         ),
         migrations.AlterField(
             model_name="domainapplication",
diff --git a/src/registrar/migrations/0018_domaininformation.py b/src/registrar/migrations/0018_domaininformation.py
index 931d99d4a..3d1a1f9b3 100644
--- a/src/registrar/migrations/0018_domaininformation.py
+++ b/src/registrar/migrations/0018_domaininformation.py
@@ -117,7 +117,7 @@ class Migration(migrations.Migration):
                     "address_line2",
                     models.CharField(
                         blank=True,
-                        help_text="Street address line 2",
+                        help_text="Street address line 2 (optional)",
                         max_length=15,
                         null=True,
                     ),
diff --git a/src/registrar/migrations/0026_alter_domainapplication_address_line2_and_more.py b/src/registrar/migrations/0026_alter_domainapplication_address_line2_and_more.py
index 77da9e79c..ccc897500 100644
--- a/src/registrar/migrations/0026_alter_domainapplication_address_line2_and_more.py
+++ b/src/registrar/migrations/0026_alter_domainapplication_address_line2_and_more.py
@@ -12,11 +12,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="domainapplication",
             name="address_line2",
-            field=models.TextField(blank=True, help_text="Street address line 2", null=True),
+            field=models.TextField(blank=True, help_text="Street address line 2 (optional)", null=True),
         ),
         migrations.AlterField(
             model_name="domaininformation",
             name="address_line2",
-            field=models.TextField(blank=True, help_text="Street address line 2", null=True),
+            field=models.TextField(blank=True, help_text="Street address line 2 (optional)", null=True),
         ),
     ]
diff --git a/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py b/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
index 97912334e..e4f87702a 100644
--- a/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
+++ b/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
@@ -24,9 +24,9 @@ class Migration(migrations.Migration):
             name="address_line2",
             field=models.TextField(
                 blank=True,
-                help_text="Street address line 2",
+                help_text="Street address line 2 (optional)",
                 null=True,
-                verbose_name="Street address line 2",
+                verbose_name="Street address line 2 (optional)",
             ),
         ),
         migrations.AlterField(
diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py
index 5045311b3..6418ff308 100644
--- a/src/registrar/models/domain_application.py
+++ b/src/registrar/models/domain_application.py
@@ -442,7 +442,7 @@ class DomainApplication(TimeStampedModel):
     address_line2 = models.TextField(
         null=True,
         blank=True,
-        help_text="Street address line 2",
+        help_text="Street address line 2 (optional)",
     )
     city = models.TextField(
         null=True,
diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py
index 4080f357b..6e20f4c5e 100644
--- a/src/registrar/models/domain_information.py
+++ b/src/registrar/models/domain_information.py
@@ -106,8 +106,8 @@ class DomainInformation(TimeStampedModel):
     address_line2 = models.TextField(
         null=True,
         blank=True,
-        help_text="Street address line 2",
-        verbose_name="Street address line 2",
+        help_text="Street address line 2 (optional)",
+        verbose_name="Street address line 2 (optional)",
     )
     city = models.TextField(
         null=True,

From 78aa47771930a39d04755d3e4711402db26308f1 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Fri, 17 Nov 2023 15:10:27 -0800
Subject: [PATCH 07/85] added "(optional)" to instances of Middle name fields

---
 src/registrar/forms/application_wizard.py                   | 6 +++---
 src/registrar/migrations/0001_initial.py                    | 2 +-
 ...tiondomain_email_transitiondomain_first_name_and_more.py | 2 +-
 src/registrar/models/contact.py                             | 2 +-
 src/registrar/models/transition_domain.py                   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index 972aa42c6..247700ac6 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -331,7 +331,7 @@ class AuthorizingOfficialForm(RegistrarForm):
     )
     middle_name = forms.CharField(
         required=False,
-        label="Middle name",
+        label="Middle name (optional)",
     )
     last_name = forms.CharField(
         label="Last name / family name",
@@ -529,7 +529,7 @@ class YourContactForm(RegistrarForm):
     )
     middle_name = forms.CharField(
         required=False,
-        label="Middle name",
+        label="Middle name (optional)",
     )
     last_name = forms.CharField(
         label="Last name / family name",
@@ -558,7 +558,7 @@ class OtherContactsForm(RegistrarForm):
     )
     middle_name = forms.CharField(
         required=False,
-        label="Middle name",
+        label="Middle name (optional)",
     )
     last_name = forms.CharField(
         label="Last name / family name",
diff --git a/src/registrar/migrations/0001_initial.py b/src/registrar/migrations/0001_initial.py
index 8c50c750d..052fd0628 100644
--- a/src/registrar/migrations/0001_initial.py
+++ b/src/registrar/migrations/0001_initial.py
@@ -135,7 +135,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "middle_name",
-                    models.TextField(blank=True, help_text="Middle name", null=True),
+                    models.TextField(blank=True, help_text="Middle name (optional)", null=True),
                 ),
                 (
                     "last_name",
diff --git a/src/registrar/migrations/0046_transitiondomain_email_transitiondomain_first_name_and_more.py b/src/registrar/migrations/0046_transitiondomain_email_transitiondomain_first_name_and_more.py
index 4fcb66713..68633dccc 100644
--- a/src/registrar/migrations/0046_transitiondomain_email_transitiondomain_first_name_and_more.py
+++ b/src/registrar/migrations/0046_transitiondomain_email_transitiondomain_first_name_and_more.py
@@ -33,7 +33,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="transitiondomain",
             name="middle_name",
-            field=models.TextField(blank=True, help_text="Middle name", null=True),
+            field=models.TextField(blank=True, help_text="Middle name (optional)", null=True),
         ),
         migrations.AddField(
             model_name="transitiondomain",
diff --git a/src/registrar/models/contact.py b/src/registrar/models/contact.py
index 41ed9f2c5..0a7ba4fa1 100644
--- a/src/registrar/models/contact.py
+++ b/src/registrar/models/contact.py
@@ -26,7 +26,7 @@ class Contact(TimeStampedModel):
     middle_name = models.TextField(
         null=True,
         blank=True,
-        help_text="Middle name",
+        help_text="Middle name (optional)",
     )
     last_name = models.TextField(
         null=True,
diff --git a/src/registrar/models/transition_domain.py b/src/registrar/models/transition_domain.py
index 3f1c8d641..3679320a7 100644
--- a/src/registrar/models/transition_domain.py
+++ b/src/registrar/models/transition_domain.py
@@ -83,7 +83,7 @@ class TransitionDomain(TimeStampedModel):
     middle_name = models.TextField(
         null=True,
         blank=True,
-        help_text="Middle name",
+        help_text="Middle name (optional)",
     )
     last_name = models.TextField(
         null=True,

From e58586bb18ee50f00ebb468cfc0877cf5f4f0483 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Fri, 17 Nov 2023 17:10:59 -0800
Subject: [PATCH 08/85] Added (optional) to security email form label

---
 src/registrar/forms/domain.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 6cb5b338f..c99ab48ea 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -152,7 +152,7 @@ class ContactForm(forms.ModelForm):
 class DomainSecurityEmailForm(forms.Form):
     """Form for adding or editing a security email to a domain."""
 
-    security_email = forms.EmailField(label="Security email", required=False)
+    security_email = forms.EmailField(label="Security email (optional)", required=False)
 
 
 class DomainOrgNameAddressForm(forms.ModelForm):

From 6fc513ed54f6b57ff9c130bfcefbbdf7e9104c37 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Fri, 17 Nov 2023 17:56:04 -0800
Subject: [PATCH 09/85] updated domain app pages' required fields sentence

---
 .../templates/application_about_your_organization.html       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/registrar/templates/application_about_your_organization.html b/src/registrar/templates/application_about_your_organization.html
index f1b843b7a..867a48dee 100644
--- a/src/registrar/templates/application_about_your_organization.html
+++ b/src/registrar/templates/application_about_your_organization.html
@@ -13,7 +13,10 @@
 {% endblock %}
 
 {% block form_required_fields_help_text %}
-  <p class="text-semibold"><abbr class="usa-hint usa-hint--required" title="required">*</abbr>This question is required.</p>
+    <p class="margin-top-3">
+      <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required"
+          title="required">*</abbr>).</i>
+    </p>
 {% endblock %}
 
 {% block form_fields %}

From cd9c4878e4fad1aef7fae63e6d36e9a2063419f1 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Fri, 17 Nov 2023 18:10:00 -0800
Subject: [PATCH 10/85] updated domain app pages' required fields sentence

---
 src/registrar/templates/application_dotgov_domain.html | 5 ++++-
 src/registrar/templates/application_org_election.html  | 5 ++++-
 src/registrar/templates/application_org_federal.html   | 5 ++++-
 src/registrar/templates/application_org_type.html      | 5 ++++-
 src/registrar/templates/application_purpose.html       | 6 +++++-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html
index 0d11203ad..47c109acc 100644
--- a/src/registrar/templates/application_dotgov_domain.html
+++ b/src/registrar/templates/application_dotgov_domain.html
@@ -47,7 +47,10 @@
     these initial checks, we’ll verify that it meets all of our requirements once you
     complete and submit the rest of this form.</p>
 
-    <p class="text-semibold"><abbr class="usa-hint usa-hint--required" title="required">*</abbr> This question is required.</p>
+      <p class="margin-top-3">
+        <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required"
+            title="required">*</abbr>).</i>
+      </p>
 
     {% with attr_aria_describedby="domain_instructions domain_instructions2" %}
       {# attr_validate / validate="domain" invokes code in get-gov.js #}
diff --git a/src/registrar/templates/application_org_election.html b/src/registrar/templates/application_org_election.html
index 45776af5c..ee41f9eae 100644
--- a/src/registrar/templates/application_org_election.html
+++ b/src/registrar/templates/application_org_election.html
@@ -13,7 +13,10 @@
 {% endblock %}
 
 {% block form_required_fields_help_text %}
-  <p class="text-semibold"><abbr class="usa-hint usa-hint--required" title="required">*</abbr> This question is required.</p>
+    <p class="margin-top-3">
+      <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required"
+          title="required">*</abbr>).</i>
+    </p>
 {% endblock %}
 
 {% block form_fields %}
diff --git a/src/registrar/templates/application_org_federal.html b/src/registrar/templates/application_org_federal.html
index 28cabadd0..c9924929d 100644
--- a/src/registrar/templates/application_org_federal.html
+++ b/src/registrar/templates/application_org_federal.html
@@ -8,7 +8,10 @@
 {% endblock %}
 
 {% block form_required_fields_help_text %}
-<p class="text-semibold"><abbr class="usa-hint usa-hint--required" title="required">*</abbr> This question is required.</p>
+  <p class="margin-top-3">
+    <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required"
+        title="required">*</abbr>).</i>
+  </p>
 {% endblock %}
 
 
diff --git a/src/registrar/templates/application_org_type.html b/src/registrar/templates/application_org_type.html
index 80d599920..7538bed8d 100644
--- a/src/registrar/templates/application_org_type.html
+++ b/src/registrar/templates/application_org_type.html
@@ -9,7 +9,10 @@
 {% endblock %}
 
 {% block form_required_fields_help_text %}
-<p class="text-semibold"><abbr class="usa-hint usa-hint--required" title="required">*</abbr> This question is required.</p>
+  <p class="margin-top-3">
+    <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required"
+        title="required">*</abbr>).</i>
+  </p>
 {% endblock %}
 
 
diff --git a/src/registrar/templates/application_purpose.html b/src/registrar/templates/application_purpose.html
index 5135e6678..93d6a9429 100644
--- a/src/registrar/templates/application_purpose.html
+++ b/src/registrar/templates/application_purpose.html
@@ -13,7 +13,11 @@ Read about <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{
 {% endblock %}
 
 {% block form_required_fields_help_text %}
-  <p class="text-semibold"><abbr class="usa-hint usa-hint--required" title="required">*</abbr> This question is required.</p>
+  <p class="margin-top-3">
+    <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required"
+        title="required">*</abbr>).</i>
+  </p>
+
 {% endblock %}
 
 

From 1a57a3e26da2c3c90f4e638e3ecfd3f5baab1737 Mon Sep 17 00:00:00 2001
From: Erin <121973038+erinysong@users.noreply.github.com>
Date: Mon, 20 Nov 2023 12:18:06 -0800
Subject: [PATCH 11/85] Revert migration data and create migration for optional
 text

---
 src/registrar/migrations/0001_initial.py      |  2 +-
 ..._more_organization_information_and_more.py |  2 +-
 .../migrations/0018_domaininformation.py      |  2 +-
 ...omainapplication_address_line2_and_more.py |  2 +-
 ...omaininformation_address_line1_and_more.py |  4 +-
 ...il_transitiondomain_first_name_and_more.py |  2 +-
 ...0047_alter_contact_middle_name_and_more.py | 37 +++++++++++++++++++
 7 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 src/registrar/migrations/0047_alter_contact_middle_name_and_more.py

diff --git a/src/registrar/migrations/0001_initial.py b/src/registrar/migrations/0001_initial.py
index 052fd0628..8c50c750d 100644
--- a/src/registrar/migrations/0001_initial.py
+++ b/src/registrar/migrations/0001_initial.py
@@ -135,7 +135,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "middle_name",
-                    models.TextField(blank=True, help_text="Middle name (optional)", null=True),
+                    models.TextField(blank=True, help_text="Middle name", null=True),
                 ),
                 (
                     "last_name",
diff --git a/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py b/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py
index c48d95188..4fdcdfeaf 100644
--- a/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py
+++ b/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py
@@ -31,7 +31,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="domainapplication",
             name="address_line2",
-            field=models.CharField(blank=True, help_text="Street address line 2 (optional)", max_length=15, null=True),
+            field=models.CharField(blank=True, help_text="Street address line 2", max_length=15, null=True),
         ),
         migrations.AlterField(
             model_name="domainapplication",
diff --git a/src/registrar/migrations/0018_domaininformation.py b/src/registrar/migrations/0018_domaininformation.py
index 3d1a1f9b3..931d99d4a 100644
--- a/src/registrar/migrations/0018_domaininformation.py
+++ b/src/registrar/migrations/0018_domaininformation.py
@@ -117,7 +117,7 @@ class Migration(migrations.Migration):
                     "address_line2",
                     models.CharField(
                         blank=True,
-                        help_text="Street address line 2 (optional)",
+                        help_text="Street address line 2",
                         max_length=15,
                         null=True,
                     ),
diff --git a/src/registrar/migrations/0026_alter_domainapplication_address_line2_and_more.py b/src/registrar/migrations/0026_alter_domainapplication_address_line2_and_more.py
index ccc897500..798d5c476 100644
--- a/src/registrar/migrations/0026_alter_domainapplication_address_line2_and_more.py
+++ b/src/registrar/migrations/0026_alter_domainapplication_address_line2_and_more.py
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="domainapplication",
             name="address_line2",
-            field=models.TextField(blank=True, help_text="Street address line 2 (optional)", null=True),
+            field=models.TextField(blank=True, help_text="Street address line 2", null=True),
         ),
         migrations.AlterField(
             model_name="domaininformation",
diff --git a/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py b/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
index e4f87702a..97912334e 100644
--- a/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
+++ b/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
@@ -24,9 +24,9 @@ class Migration(migrations.Migration):
             name="address_line2",
             field=models.TextField(
                 blank=True,
-                help_text="Street address line 2 (optional)",
+                help_text="Street address line 2",
                 null=True,
-                verbose_name="Street address line 2 (optional)",
+                verbose_name="Street address line 2",
             ),
         ),
         migrations.AlterField(
diff --git a/src/registrar/migrations/0046_transitiondomain_email_transitiondomain_first_name_and_more.py b/src/registrar/migrations/0046_transitiondomain_email_transitiondomain_first_name_and_more.py
index 68633dccc..4fcb66713 100644
--- a/src/registrar/migrations/0046_transitiondomain_email_transitiondomain_first_name_and_more.py
+++ b/src/registrar/migrations/0046_transitiondomain_email_transitiondomain_first_name_and_more.py
@@ -33,7 +33,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="transitiondomain",
             name="middle_name",
-            field=models.TextField(blank=True, help_text="Middle name (optional)", null=True),
+            field=models.TextField(blank=True, help_text="Middle name", null=True),
         ),
         migrations.AddField(
             model_name="transitiondomain",
diff --git a/src/registrar/migrations/0047_alter_contact_middle_name_and_more.py b/src/registrar/migrations/0047_alter_contact_middle_name_and_more.py
new file mode 100644
index 000000000..acd3355fe
--- /dev/null
+++ b/src/registrar/migrations/0047_alter_contact_middle_name_and_more.py
@@ -0,0 +1,37 @@
+# Generated by Django 4.2.7 on 2023-11-20 20:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0046_transitiondomain_email_transitiondomain_first_name_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="contact",
+            name="middle_name",
+            field=models.TextField(blank=True, help_text="Middle name (optional)", null=True),
+        ),
+        migrations.AlterField(
+            model_name="domainapplication",
+            name="address_line2",
+            field=models.TextField(blank=True, help_text="Street address line 2 (optional)", null=True),
+        ),
+        migrations.AlterField(
+            model_name="domaininformation",
+            name="address_line2",
+            field=models.TextField(
+                blank=True,
+                help_text="Street address line 2 (optional)",
+                null=True,
+                verbose_name="Street address line 2 (optional)",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="transitiondomain",
+            name="middle_name",
+            field=models.TextField(blank=True, help_text="Middle name (optional)", null=True),
+        ),
+    ]

From 79c1fd63efac649430b9fd1bccd7ff0dca0faf6a Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 20 Nov 2023 14:09:38 -0800
Subject: [PATCH 12/85] update label for Contact Form

---
 src/registrar/forms/domain.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index c99ab48ea..14522512e 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -147,6 +147,9 @@ class ContactForm(forms.ModelForm):
 
         for field_name in self.required:
             self.fields[field_name].required = True
+            
+        # Set custom form label
+        self.fields["middle_name"].label = "Middle name (optional)"
 
 
 class DomainSecurityEmailForm(forms.Form):

From e1ca58a623dcef4bd9af5ca9b98f693f8f9f4244 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 20 Nov 2023 14:46:32 -0800
Subject: [PATCH 13/85] undo erroneous changes to migration files

---
 ...omainapplication_more_organization_information_and_more.py | 2 +-
 src/registrar/migrations/0018_domaininformation.py            | 2 +-
 .../0026_alter_domainapplication_address_line2_and_more.py    | 2 +-
 .../0027_alter_domaininformation_address_line1_and_more.py    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py b/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py
index 4fdcdfeaf..49df16fbb 100644
--- a/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py
+++ b/src/registrar/migrations/0007_domainapplication_more_organization_information_and_more.py
@@ -106,7 +106,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="domainapplication",
             name="urbanization",
-            field=models.TextField(blank=True, help_text="Urbanization (required for Puerto Rico only)", null=True),
+            field=models.TextField(blank=True, help_text="Urbanization (Puerto Rico only)", null=True),
         ),
         migrations.AlterField(
             model_name="domainapplication",
diff --git a/src/registrar/migrations/0018_domaininformation.py b/src/registrar/migrations/0018_domaininformation.py
index 931d99d4a..582a6e244 100644
--- a/src/registrar/migrations/0018_domaininformation.py
+++ b/src/registrar/migrations/0018_domaininformation.py
@@ -146,7 +146,7 @@ class Migration(migrations.Migration):
                     "urbanization",
                     models.TextField(
                         blank=True,
-                        help_text="Urbanization (required for Puerto Rico only)",
+                        help_text="Urbanization (Puerto Rico only)",
                         null=True,
                     ),
                 ),
diff --git a/src/registrar/migrations/0026_alter_domainapplication_address_line2_and_more.py b/src/registrar/migrations/0026_alter_domainapplication_address_line2_and_more.py
index 798d5c476..77da9e79c 100644
--- a/src/registrar/migrations/0026_alter_domainapplication_address_line2_and_more.py
+++ b/src/registrar/migrations/0026_alter_domainapplication_address_line2_and_more.py
@@ -17,6 +17,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="domaininformation",
             name="address_line2",
-            field=models.TextField(blank=True, help_text="Street address line 2 (optional)", null=True),
+            field=models.TextField(blank=True, help_text="Street address line 2", null=True),
         ),
     ]
diff --git a/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py b/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
index 97912334e..ac1255f22 100644
--- a/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
+++ b/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
@@ -45,9 +45,9 @@ class Migration(migrations.Migration):
             name="urbanization",
             field=models.TextField(
                 blank=True,
-                help_text="Urbanization (required for Puerto Rico only)",
+                verbose_name="Urbanization (Puerto Rico only)",
                 null=True,
-                verbose_name="Urbanization (required for Puerto Rico only)",
+                verbose_name="Urbanization (Puerto Rico only)",
             ),
         ),
     ]

From e2542023ec8586e5839b5baeebad4693dc7d0616 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 20 Nov 2023 14:48:14 -0800
Subject: [PATCH 14/85] undo erroneous changes to migration files

---
 .../0027_alter_domaininformation_address_line1_and_more.py      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py b/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
index ac1255f22..9f362c956 100644
--- a/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
+++ b/src/registrar/migrations/0027_alter_domaininformation_address_line1_and_more.py
@@ -45,7 +45,7 @@ class Migration(migrations.Migration):
             name="urbanization",
             field=models.TextField(
                 blank=True,
-                verbose_name="Urbanization (Puerto Rico only)",
+                help_text="Urbanization (Puerto Rico only)",
                 null=True,
                 verbose_name="Urbanization (Puerto Rico only)",
             ),

From 1f309584ff5b50a6546e16a017769c3fe2f06df6 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 20 Nov 2023 17:02:42 -0800
Subject: [PATCH 15/85] update .gov domain page

---
 src/registrar/templates/application_dotgov_domain.html | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html
index 47c109acc..9037c70cf 100644
--- a/src/registrar/templates/application_dotgov_domain.html
+++ b/src/registrar/templates/application_dotgov_domain.html
@@ -38,8 +38,7 @@
 
   <fieldset class="usa-fieldset margin-top-2">
     <legend>
-      <h2>What .gov domain do you want?&nbsp;<abbr class="usa-hint usa-hint--required
-          text-super" title="required">*</abbr></h2>
+      <h2>What .gov domain do you want?</h2>
     </legend>
 
     <p id="domain_instructions" class="margin-top-05">After you enter your domain, we’ll make sure it’s
@@ -47,11 +46,6 @@
     these initial checks, we’ll verify that it meets all of our requirements once you
     complete and submit the rest of this form.</p>
 
-      <p class="margin-top-3">
-        <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required"
-            title="required">*</abbr>).</i>
-      </p>
-
     {% with attr_aria_describedby="domain_instructions domain_instructions2" %}
       {# attr_validate / validate="domain" invokes code in get-gov.js #}
       {% with append_gov=True attr_validate="domain" add_label_class="usa-sr-only" %}
@@ -69,7 +63,7 @@
 
   <fieldset class="usa-fieldset margin-top-1">
     <legend>
-      <h2>Alternative domains</h2>
+      <h2>Alternative domains (optional)</h2>
     </legend>
 
     <p id="alt_domain_instructions" class="margin-top-05">Are there other domains you’d like if we can’t give

From bac2d94b75d0668993adc4737846b44098b7c500 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 20 Nov 2023 17:20:32 -0800
Subject: [PATCH 16/85] update .gov domain page

---
 src/registrar/forms/application_wizard.py              | 1 -
 src/registrar/templates/application_dotgov_domain.html | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index 247700ac6..094b3815f 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -405,7 +405,6 @@ class AlternativeDomainForm(RegistrarForm):
 
     alternative_domain = forms.CharField(
         required=False,
-        label="Alternative domain",
     )
 
 
diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html
index 9037c70cf..bd3c4a473 100644
--- a/src/registrar/templates/application_dotgov_domain.html
+++ b/src/registrar/templates/application_dotgov_domain.html
@@ -67,7 +67,7 @@
     </legend>
 
     <p id="alt_domain_instructions" class="margin-top-05">Are there other domains you’d like if we can’t give
-    you your first choice? Entering alternative domains is optional.</p>
+    you your first choice?</p>
 
     {% with attr_aria_describedby="alt_domain_instructions" %}
       {# attr_validate / validate="domain" invokes code in get-gov.js #}

From c342fdf2a6f71c3970bbd3fd60eb672bc1d47435 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 20 Nov 2023 17:53:33 -0800
Subject: [PATCH 17/85] update .gov domain page

---
 src/registrar/forms/application_wizard.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index 094b3815f..aa763b534 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -405,6 +405,7 @@ class AlternativeDomainForm(RegistrarForm):
 
     alternative_domain = forms.CharField(
         required=False,
+        label="",
     )
 
 

From f96af00a5188d0c6542c2ca076bf6678318ddad7 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 10:35:54 -0800
Subject: [PATCH 18/85] got rid of the required fields line in the purpose app
 page

---
 src/registrar/templates/application_purpose.html | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/registrar/templates/application_purpose.html b/src/registrar/templates/application_purpose.html
index 93d6a9429..3a225b880 100644
--- a/src/registrar/templates/application_purpose.html
+++ b/src/registrar/templates/application_purpose.html
@@ -12,16 +12,6 @@ Read about <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{
 
 {% endblock %}
 
-{% block form_required_fields_help_text %}
-  <p class="margin-top-3">
-    <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required"
-        title="required">*</abbr>).</i>
-  </p>
-
-{% endblock %}
-
-
-
 {% block form_fields %}
     {% with attr_maxlength=1000 add_label_class="usa-sr-only" %}
       {% input_with_errors forms.0.purpose %}

From 07d9bd76cd7dd7b5a8be2d931d24f994d2402a60 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 12:04:51 -0800
Subject: [PATCH 19/85] got rid of required fields line in one-field forms

---
 src/registrar/templates/application_org_election.html | 9 +--------
 src/registrar/templates/application_org_type.html     | 9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/registrar/templates/application_org_election.html b/src/registrar/templates/application_org_election.html
index ee41f9eae..7d3e092cb 100644
--- a/src/registrar/templates/application_org_election.html
+++ b/src/registrar/templates/application_org_election.html
@@ -3,7 +3,7 @@
 
 {% block form_instructions %}
   <h2 class="margin-bottom-05">
-    Is your organization an election office?  <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    Is your organization an election office?
   </h2>
 
   <p>An election office is a government entity whose <em>primary</em> responsibility is overseeing elections and/or conducting voter registration.</p>
@@ -12,13 +12,6 @@
 
 {% endblock %}
 
-{% block form_required_fields_help_text %}
-    <p class="margin-top-3">
-      <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required"
-          title="required">*</abbr>).</i>
-    </p>
-{% endblock %}
-
 {% block form_fields %}
   {% with add_class="usa-radio__input--tile" add_legend_class="usa-sr-only" %}
     {% input_with_errors forms.0.is_election_board %}
diff --git a/src/registrar/templates/application_org_type.html b/src/registrar/templates/application_org_type.html
index 7538bed8d..801079647 100644
--- a/src/registrar/templates/application_org_type.html
+++ b/src/registrar/templates/application_org_type.html
@@ -3,18 +3,11 @@
 
 {% block form_instructions %}
   <h2 class="margin-bottom-05">
-    What kind of U.S.-based government organization do you represent? <abbr class="usa-hint usa-hint--required text-super" title="required">*</abbr>
+    What kind of U.S.-based government organization do you represent?
   </h2>
 
 {% endblock %}
 
-{% block form_required_fields_help_text %}
-  <p class="margin-top-3">
-    <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required"
-        title="required">*</abbr>).</i>
-  </p>
-{% endblock %}
-
 
 {% block form_fields %}
   {% with add_class="usa-radio__input--tile" add_legend_class="usa-sr-only" %}

From d3cf1ea01da18d00369019cb8369bbdaf31e3ad0 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 12:36:50 -0800
Subject: [PATCH 20/85] got rid of more required form fields

---
 .../templates/application_about_your_organization.html   | 7 -------
 src/registrar/templates/application_org_federal.html     | 9 +--------
 src/registrar/templates/application_org_type.html        | 3 +++
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/registrar/templates/application_about_your_organization.html b/src/registrar/templates/application_about_your_organization.html
index 867a48dee..4bf9d21f2 100644
--- a/src/registrar/templates/application_about_your_organization.html
+++ b/src/registrar/templates/application_about_your_organization.html
@@ -12,13 +12,6 @@
   </p>
 {% endblock %}
 
-{% block form_required_fields_help_text %}
-    <p class="margin-top-3">
-      <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required"
-          title="required">*</abbr>).</i>
-    </p>
-{% endblock %}
-
 {% block form_fields %}
     {% with attr_maxlength=1000 add_label_class="usa-sr-only" %}
       {% input_with_errors forms.0.about_your_organization %}
diff --git a/src/registrar/templates/application_org_federal.html b/src/registrar/templates/application_org_federal.html
index c9924929d..6c8851af2 100644
--- a/src/registrar/templates/application_org_federal.html
+++ b/src/registrar/templates/application_org_federal.html
@@ -3,17 +3,10 @@
 
 {% block form_instructions %}
   <h2 class="margin-bottom-05">
-    Which federal branch is your organization&nbsp;in?&nbsp;<abbr class="usa-hint usa-hint--required text-super" title="required">*</abbr>
+    Which federal branch is your organization in?
   </h2>
 {% endblock %}
 
-{% block form_required_fields_help_text %}
-  <p class="margin-top-3">
-    <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required"
-        title="required">*</abbr>).</i>
-  </p>
-{% endblock %}
-
 
 {% block form_fields %}
   {% with add_class="usa-radio__input--tile"  add_legend_class="usa-sr-only" %}
diff --git a/src/registrar/templates/application_org_type.html b/src/registrar/templates/application_org_type.html
index 801079647..ef3fb82f7 100644
--- a/src/registrar/templates/application_org_type.html
+++ b/src/registrar/templates/application_org_type.html
@@ -8,6 +8,9 @@
 
 {% endblock %}
 
+{% block form_required_fields_help_text %}
+{# commented out so it does not appear on this page #}
+{% endblock %}
 
 {% block form_fields %}
   {% with add_class="usa-radio__input--tile" add_legend_class="usa-sr-only" %}

From 6779c2ab0b0f9ab4fde2bd87e117d17b48eba584 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 13:29:09 -0800
Subject: [PATCH 21/85] got rid of required line text the right way

---
 .../templates/application_about_your_organization.html        | 4 ++++
 src/registrar/templates/application_org_election.html         | 4 ++++
 src/registrar/templates/application_org_federal.html          | 3 +++
 src/registrar/templates/application_purpose.html              | 4 ++++
 src/registrar/templates/application_requirements.html         | 4 ++++
 5 files changed, 19 insertions(+)

diff --git a/src/registrar/templates/application_about_your_organization.html b/src/registrar/templates/application_about_your_organization.html
index 4bf9d21f2..0d384b4f5 100644
--- a/src/registrar/templates/application_about_your_organization.html
+++ b/src/registrar/templates/application_about_your_organization.html
@@ -12,6 +12,10 @@
   </p>
 {% endblock %}
 
+{% block form_required_fields_help_text %}
+{# commented out so it does not appear on this page #}
+{% endblock %}
+
 {% block form_fields %}
     {% with attr_maxlength=1000 add_label_class="usa-sr-only" %}
       {% input_with_errors forms.0.about_your_organization %}
diff --git a/src/registrar/templates/application_org_election.html b/src/registrar/templates/application_org_election.html
index 7d3e092cb..ce79f5b22 100644
--- a/src/registrar/templates/application_org_election.html
+++ b/src/registrar/templates/application_org_election.html
@@ -12,6 +12,10 @@
 
 {% endblock %}
 
+{% block form_required_fields_help_text %}
+{# commented out so it does not appear on this page #}
+{% endblock %}
+
 {% block form_fields %}
   {% with add_class="usa-radio__input--tile" add_legend_class="usa-sr-only" %}
     {% input_with_errors forms.0.is_election_board %}
diff --git a/src/registrar/templates/application_org_federal.html b/src/registrar/templates/application_org_federal.html
index 6c8851af2..8a5a574b0 100644
--- a/src/registrar/templates/application_org_federal.html
+++ b/src/registrar/templates/application_org_federal.html
@@ -7,6 +7,9 @@
   </h2>
 {% endblock %}
 
+{% block form_required_fields_help_text %}
+{# commented out so it does not appear on this page #}
+{% endblock %}
 
 {% block form_fields %}
   {% with add_class="usa-radio__input--tile"  add_legend_class="usa-sr-only" %}
diff --git a/src/registrar/templates/application_purpose.html b/src/registrar/templates/application_purpose.html
index 3a225b880..8747a34c7 100644
--- a/src/registrar/templates/application_purpose.html
+++ b/src/registrar/templates/application_purpose.html
@@ -12,6 +12,10 @@ Read about <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{
 
 {% endblock %}
 
+{% block form_required_fields_help_text %}
+{# commented out so it does not appear on this page #}
+{% endblock %}
+
 {% block form_fields %}
     {% with attr_maxlength=1000 add_label_class="usa-sr-only" %}
       {% input_with_errors forms.0.purpose %}
diff --git a/src/registrar/templates/application_requirements.html b/src/registrar/templates/application_requirements.html
index ef0a4c7ef..c1600d523 100644
--- a/src/registrar/templates/application_requirements.html
+++ b/src/registrar/templates/application_requirements.html
@@ -50,6 +50,10 @@
   <p>We understand the critical importance of the availability of .gov domains. Suspending or terminating a .gov domain is reserved for prolonged, unresolved, serious violations where the registrant is non-responsive. We'll make extensive efforts to contact registrants and to identify potential solutions. We'll make reasonable accommodations for remediation timelines based on the severity of the issue.</p>
 {% endblock %}
 
+{% block form_required_fields_help_text %}
+{# commented out so it does not appear on this page #}
+{% endblock %}
+
 {% block form_fields %}
     <fieldset class="usa-fieldset">
       <legend>

From 3d177198ea0f1f785bdc90ae547fea8bf4b9d0dd Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 17:20:53 -0800
Subject: [PATCH 22/85] testing way to get rid of asterisk

---
 src/registrar/templates/django/forms/label.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index da90a372a..7f4e0e784 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,6 +8,8 @@
     {{ field.label }}
   {% endif %}
   {% if widget.attrs.required %}
-    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% if widget.label != "I read and agree to the requirements for operating .gov domains." %}
+      <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% endif %}
   {% endif %}
 </{{ label_tag }}>

From d5e662a78d1578b70ba5081e8dd3c035c8bcd708 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 17:30:42 -0800
Subject: [PATCH 23/85] trying another way of getting rid of asterisk

---
 src/registrar/templates/django/forms/label.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 7f4e0e784..17d528d4e 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -7,9 +7,4 @@
   {% else %}
     {{ field.label }}
   {% endif %}
-  {% if widget.attrs.required %}
-    {% if widget.label != "I read and agree to the requirements for operating .gov domains." %}
-      <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-    {% endif %}
-  {% endif %}
 </{{ label_tag }}>

From b3be667183f7cdcd5814bcfe1e93e6d94571f815 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 18:31:47 -0800
Subject: [PATCH 24/85] trying another way to get rid of asterisk in one-field
 forms

---
 src/registrar/forms/application_wizard.py       | 6 +++++-
 src/registrar/templates/django/forms/label.html | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index aa763b534..ee0c19605 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -170,10 +170,14 @@ class TribalGovernmentForm(RegistrarForm):
     )
 
     tribe_name = forms.CharField(
-        label="What is the name of the tribe you represent?",
+        label1="What is the name of the tribe you represent? "
+        label2="*",
+        label={label1+label2}
         error_messages={"required": "Enter the tribe you represent."},
     )
 
+    tribe_name.widget.attrs.update({"class": "no_asterisk"})
+
     def clean(self):
         """Needs to be either state or federally recognized."""
         if not (self.cleaned_data["federally_recognized_tribe"] or self.cleaned_data["state_recognized_tribe"]):
diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 17d528d4e..9a6fcad69 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -7,4 +7,9 @@
   {% else %}
     {{ field.label }}
   {% endif %}
+  <!---
+    {% if widget.attrs.required %}
+      <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% endif %}
+  -->
 </{{ label_tag }}>

From eaaf8e16d46a3c1679aa96c0b4262aeaffa08cb9 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 18:34:33 -0800
Subject: [PATCH 25/85] forgot comma

---
 src/registrar/forms/application_wizard.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index ee0c19605..7312fafc4 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -170,9 +170,9 @@ class TribalGovernmentForm(RegistrarForm):
     )
 
     tribe_name = forms.CharField(
-        label1="What is the name of the tribe you represent? "
+        label1="What is the name of the tribe you represent? ",
         label2="*",
-        label={label1+label2}
+        label={label1+label2},
         error_messages={"required": "Enter the tribe you represent."},
     )
 

From 9773abe12794c94819ea7eecbccf7f8d011c5382 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 18:42:27 -0800
Subject: [PATCH 26/85] trying another way to get rid of asterisk in one-field
 forms

---
 src/registrar/forms/application_wizard.py       | 6 +-----
 src/registrar/templates/django/forms/label.html | 7 ++++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index 7312fafc4..8aa528d3d 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -170,14 +170,10 @@ class TribalGovernmentForm(RegistrarForm):
     )
 
     tribe_name = forms.CharField(
-        label1="What is the name of the tribe you represent? ",
-        label2="*",
-        label={label1+label2},
+        label="What is the name of the tribe you represent? ",
         error_messages={"required": "Enter the tribe you represent."},
     )
 
-    tribe_name.widget.attrs.update({"class": "no_asterisk"})
-
     def clean(self):
         """Needs to be either state or federally recognized."""
         if not (self.cleaned_data["federally_recognized_tribe"] or self.cleaned_data["state_recognized_tribe"]):
diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 9a6fcad69..6924c1155 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -7,9 +7,10 @@
   {% else %}
     {{ field.label }}
   {% endif %}
-  <!---
     {% if widget.attrs.required %}
-      <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+      {% if widget.label != "What is the name of the tribe you represent? " %}
+        <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+      {% endif %}
     {% endif %}
-  -->
+
 </{{ label_tag }}>

From e619939ff27d289f145c9af35c96f9f007b8dd12 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 19:05:18 -0800
Subject: [PATCH 27/85] trying another way to get rid of asterisk in one-field
 forms

---
 src/registrar/forms/application_wizard.py       | 1 +
 src/registrar/templates/django/forms/label.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index 8aa528d3d..28220bd6b 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -638,3 +638,4 @@ class RequirementsForm(RegistrarForm):
             "required": ("Check the box if you read and agree to the requirements for operating .gov domains.")
         },
     )
+    
diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 6924c1155..05ca21795 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,7 +8,7 @@
     {{ field.label }}
   {% endif %}
     {% if widget.attrs.required %}
-      {% if widget.label != "What is the name of the tribe you represent? " %}
+      {% if widget.attrs.label != "I read and agree to the requirements for operating .gov domains." %}
         <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
       {% endif %}
     {% endif %}

From 508b1c8c4863a72d9e526349beed8e3160906b78 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 19:13:01 -0800
Subject: [PATCH 28/85] trying another way to get rid of asterisk in one-field
 forms

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 05ca21795..9ad4b021e 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,7 +8,7 @@
     {{ field.label }}
   {% endif %}
     {% if widget.attrs.required %}
-      {% if widget.attrs.label != "I read and agree to the requirements for operating .gov domains." %}
+      {% if field.label != "I read and agree to the requirements for operating .gov domains." %}
         <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
       {% endif %}
     {% endif %}

From ddc1298651dc3c02a7b755669dbfd7c941c1bcd8 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 19:30:36 -0800
Subject: [PATCH 29/85] get rid of asterisk in no other contacts page

---
 src/registrar/forms/application_wizard.py       | 5 ++---
 src/registrar/templates/django/forms/label.html | 5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index 28220bd6b..89d77e811 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -610,8 +610,7 @@ class NoOtherContactsForm(RegistrarForm):
         required=True,
         # label has to end in a space to get the label_suffix to show
         label=(
-            "Please explain why there are no other employees from your organization"
-            " we can contact to help us assess your eligibility for a .gov domain."
+            "Please explain why there are no other employees from your organization we can contact to help us assess your eligibility for a .gov domain."
         ),
         widget=forms.Textarea(),
     )
@@ -638,4 +637,4 @@ class RequirementsForm(RegistrarForm):
             "required": ("Check the box if you read and agree to the requirements for operating .gov domains.")
         },
     )
-    
+
diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 9ad4b021e..1ada1b089 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -9,7 +9,10 @@
   {% endif %}
     {% if widget.attrs.required %}
       {% if field.label != "I read and agree to the requirements for operating .gov domains." %}
-        <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+        {% if field.label != "Please explain why there are no other employees from your organization we can contact to help us assess your
+        eligibility for a .gov domain." %}
+            <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+        {% endif %}
       {% endif %}
     {% endif %}
 

From dff6e91ac8e4a49210a29379fb6e92e49a2c344e Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 19:36:59 -0800
Subject: [PATCH 30/85] undoing last push

---
 src/registrar/templates/django/forms/label.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 1ada1b089..af62e0605 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -9,10 +9,7 @@
   {% endif %}
     {% if widget.attrs.required %}
       {% if field.label != "I read and agree to the requirements for operating .gov domains." %}
-        {% if field.label != "Please explain why there are no other employees from your organization we can contact to help us assess your
-        eligibility for a .gov domain." %}
             <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-        {% endif %}
       {% endif %}
     {% endif %}
 

From 717ff7c3765ca468673735c1bce2368b8879a4b6 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 19:42:52 -0800
Subject: [PATCH 31/85] get rid of asterisk in no other contacts page

---
 src/registrar/templates/django/forms/label.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index af62e0605..9cf18bd49 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,7 +8,8 @@
     {{ field.label }}
   {% endif %}
     {% if widget.attrs.required %}
-      {% if field.label != "I read and agree to the requirements for operating .gov domains." %}
+      {% if field.label != "I read and agree to the requirements for operating .gov domains." or field.label != "Please explain why there are no other employees from your organization we can contact to help us assess your
+      eligibility for a .gov domain." %}
             <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
       {% endif %}
     {% endif %}

From 7cc6731a61d214b9ac1cd4aede14401bfeeb4544 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 19:50:50 -0800
Subject: [PATCH 32/85] undoing last push

---
 src/registrar/templates/django/forms/label.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 9cf18bd49..af62e0605 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,8 +8,7 @@
     {{ field.label }}
   {% endif %}
     {% if widget.attrs.required %}
-      {% if field.label != "I read and agree to the requirements for operating .gov domains." or field.label != "Please explain why there are no other employees from your organization we can contact to help us assess your
-      eligibility for a .gov domain." %}
+      {% if field.label != "I read and agree to the requirements for operating .gov domains." %}
             <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
       {% endif %}
     {% endif %}

From 6bd61743fbb687bfe7254d5cf31aee5c3090e28b Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 21 Nov 2023 19:59:36 -0800
Subject: [PATCH 33/85] get rid of asterisk in no other contacts page

---
 src/registrar/forms/application_wizard.py       | 3 ++-
 src/registrar/templates/django/forms/label.html | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index 89d77e811..7e88b49da 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -610,7 +610,8 @@ class NoOtherContactsForm(RegistrarForm):
         required=True,
         # label has to end in a space to get the label_suffix to show
         label=(
-            "Please explain why there are no other employees from your organization we can contact to help us assess your eligibility for a .gov domain."
+            "Please explain why there are no other employees from your organization "
+            "we can contact to help us assess your eligibility for a .gov domain."
         ),
         widget=forms.Textarea(),
     )
diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index af62e0605..beb09c17c 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -9,7 +9,9 @@
   {% endif %}
     {% if widget.attrs.required %}
       {% if field.label != "I read and agree to the requirements for operating .gov domains." %}
+        {% if field.label != "Please explain why there are no other employees from your organization" %}
             <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+        {% endif %}
       {% endif %}
     {% endif %}
 

From f9b54a5a8df0165fa1b72bc5c0d93a1802db8a6c Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 22 Nov 2023 09:43:25 -0800
Subject: [PATCH 34/85] correcting syntax mistake

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index beb09c17c..991f4d846 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -9,7 +9,7 @@
   {% endif %}
     {% if widget.attrs.required %}
       {% if field.label != "I read and agree to the requirements for operating .gov domains." %}
-        {% if field.label != "Please explain why there are no other employees from your organization" %}
+        {% if field.label != "Please explain why there are no other employees from your organization " %}
             <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
         {% endif %}
       {% endif %}

From c490cec333962c83dc7933719f918070d982e662 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 22 Nov 2023 09:51:19 -0800
Subject: [PATCH 35/85] undoing what I just did

---
 src/registrar/forms/application_wizard.py       | 3 +--
 src/registrar/templates/django/forms/label.html | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index 7e88b49da..89d77e811 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -610,8 +610,7 @@ class NoOtherContactsForm(RegistrarForm):
         required=True,
         # label has to end in a space to get the label_suffix to show
         label=(
-            "Please explain why there are no other employees from your organization "
-            "we can contact to help us assess your eligibility for a .gov domain."
+            "Please explain why there are no other employees from your organization we can contact to help us assess your eligibility for a .gov domain."
         ),
         widget=forms.Textarea(),
     )
diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 991f4d846..9ad4b021e 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -9,9 +9,7 @@
   {% endif %}
     {% if widget.attrs.required %}
       {% if field.label != "I read and agree to the requirements for operating .gov domains." %}
-        {% if field.label != "Please explain why there are no other employees from your organization " %}
-            <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-        {% endif %}
+        <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
       {% endif %}
     {% endif %}
 

From 3ad42bf42e80d3659471c189c50215b5aaa54320 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 22 Nov 2023 09:59:22 -0800
Subject: [PATCH 36/85] trying another way to get rid of asterisk in one-field
 forms

---
 src/registrar/forms/application_wizard.py       | 3 ++-
 src/registrar/templates/django/forms/label.html | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index 89d77e811..7e88b49da 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -610,7 +610,8 @@ class NoOtherContactsForm(RegistrarForm):
         required=True,
         # label has to end in a space to get the label_suffix to show
         label=(
-            "Please explain why there are no other employees from your organization we can contact to help us assess your eligibility for a .gov domain."
+            "Please explain why there are no other employees from your organization "
+            "we can contact to help us assess your eligibility for a .gov domain."
         ),
         widget=forms.Textarea(),
     )
diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 9ad4b021e..aa7f68032 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -7,10 +7,11 @@
   {% else %}
     {{ field.label }}
   {% endif %}
-    {% if widget.attrs.required %}
-      {% if field.label != "I read and agree to the requirements for operating .gov domains." %}
-        <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-      {% endif %}
+
+  {% if widget.attrs.required %}
+    {% if field.label == "I read and agree to the requirements for operating .gov domains." %}
+      <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
     {% endif %}
+  {% endif %}
 
 </{{ label_tag }}>

From 2de28edcc4b4abcda2d541fbaa934f0ab0cd8cb4 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 22 Nov 2023 11:39:46 -0800
Subject: [PATCH 37/85] fixing linting errors

---
 src/registrar/forms/application_wizard.py | 1 -
 src/registrar/forms/domain.py             | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index 7e88b49da..a862afc6c 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -638,4 +638,3 @@ class RequirementsForm(RegistrarForm):
             "required": ("Check the box if you read and agree to the requirements for operating .gov domains.")
         },
     )
-
diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index e6cdba1b4..44d752199 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -153,7 +153,7 @@ class ContactForm(forms.ModelForm):
 
         for field_name in self.required:
             self.fields[field_name].required = True
-            
+
         # Set custom form label
         self.fields["middle_name"].label = "Middle name (optional)"
 
@@ -195,7 +195,6 @@ class AuthorizingOfficialContactForm(ContactForm):
 class DomainSecurityEmailForm(forms.Form):
     """Form for adding or editing a security email to a domain."""
 
-
     security_email = forms.EmailField(
         label="Security email (optional)",
         required=False,
@@ -205,7 +204,6 @@ class DomainSecurityEmailForm(forms.Form):
     )
 
 
-
 class DomainOrgNameAddressForm(forms.ModelForm):
     """Form for updating the organization name and mailing address."""
 

From 1cf841013f60bf00a73b9785ee6e37be9226be24 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 22 Nov 2023 12:40:21 -0800
Subject: [PATCH 38/85] fixing migration issue

---
 ...e_and_more.py => 0048_alter_contact_middle_name_and_more.py} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/registrar/migrations/{0047_alter_contact_middle_name_and_more.py => 0048_alter_contact_middle_name_and_more.py} (92%)

diff --git a/src/registrar/migrations/0047_alter_contact_middle_name_and_more.py b/src/registrar/migrations/0048_alter_contact_middle_name_and_more.py
similarity index 92%
rename from src/registrar/migrations/0047_alter_contact_middle_name_and_more.py
rename to src/registrar/migrations/0048_alter_contact_middle_name_and_more.py
index acd3355fe..271264fc7 100644
--- a/src/registrar/migrations/0047_alter_contact_middle_name_and_more.py
+++ b/src/registrar/migrations/0048_alter_contact_middle_name_and_more.py
@@ -5,7 +5,7 @@ from django.db import migrations, models
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("registrar", "0046_transitiondomain_email_transitiondomain_first_name_and_more"),
+        ("registrar", "0047_transitiondomain_address_line_transitiondomain_city_and_more"),
     ]
 
     operations = [

From 339f9770e4c4e20b7f513c9277d2a1cb0c726c8f Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 22 Nov 2023 12:49:17 -0800
Subject: [PATCH 39/85] migrations

---
 ...domainapplication_urbanization_and_more.py | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 src/registrar/migrations/0049_alter_domainapplication_urbanization_and_more.py

diff --git a/src/registrar/migrations/0049_alter_domainapplication_urbanization_and_more.py b/src/registrar/migrations/0049_alter_domainapplication_urbanization_and_more.py
new file mode 100644
index 000000000..36a32cb25
--- /dev/null
+++ b/src/registrar/migrations/0049_alter_domainapplication_urbanization_and_more.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.7 on 2023-11-22 20:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0048_alter_contact_middle_name_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="domainapplication",
+            name="urbanization",
+            field=models.TextField(blank=True, help_text="Urbanization (required for Puerto Rico only)", null=True),
+        ),
+        migrations.AlterField(
+            model_name="domaininformation",
+            name="urbanization",
+            field=models.TextField(
+                blank=True,
+                help_text="Urbanization (required for Puerto Rico only)",
+                null=True,
+                verbose_name="Urbanization (required for Puerto Rico only)",
+            ),
+        ),
+    ]

From 991d7248a5b3f0cbde5e94a935b3b4341ae0ee8c Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 22 Nov 2023 14:15:29 -0800
Subject: [PATCH 40/85] putting back asterisks where they are needed, removing
 them on specific pages

---
 src/registrar/templates/django/forms/label.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index aa7f68032..5feb90e2b 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,9 +8,14 @@
     {{ field.label }}
   {% endif %}
 
+  <!-- One-field forms (pages that only have one question field) do not have an asterisk -->
   {% if widget.attrs.required %}
-    {% if field.label == "I read and agree to the requirements for operating .gov domains." %}
-      <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% if field.label != "I read and agree to the requirements for operating .gov domains." %}
+      {% if field.label != “What .gov domain do you want?” %}
+        {% if field.label != “"Is your organization an election office?"” %}
+          <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+        {% endif %}
+      {% endif %}
     {% endif %}
   {% endif %}
 

From 3e60ee2ad916a9c2f4993a8ae1dd58ee9afa972d Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Fri, 24 Nov 2023 10:49:48 -0800
Subject: [PATCH 41/85] Revert "putting back asterisks where they are needed,
 removing them on specific pages"

This reverts commit 991d7248a5b3f0cbde5e94a935b3b4341ae0ee8c.
---
 src/registrar/templates/django/forms/label.html | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 5feb90e2b..aa7f68032 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,14 +8,9 @@
     {{ field.label }}
   {% endif %}
 
-  <!-- One-field forms (pages that only have one question field) do not have an asterisk -->
   {% if widget.attrs.required %}
-    {% if field.label != "I read and agree to the requirements for operating .gov domains." %}
-      {% if field.label != “What .gov domain do you want?” %}
-        {% if field.label != “"Is your organization an election office?"” %}
-          <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-        {% endif %}
-      {% endif %}
+    {% if field.label == "I read and agree to the requirements for operating .gov domains." %}
+      <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
     {% endif %}
   {% endif %}
 

From 83017ecf5dcd887d0dac793c64fcc343a3a27137 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 07:14:08 -0800
Subject: [PATCH 42/85] adding asterisks to only non one-field forms

---
 .../templates/django/forms/label.html         | 43 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index aa7f68032..108c8b0a4 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,10 +8,51 @@
     {{ field.label }}
   {% endif %}
 
+
+{% if widget.attrs.required %}
+  {% if field.label != "Is your organization an election office?" and 
+  field.label != “What .gov domain do you want?” and 
+  field.label != "I read and agree to the requirements for operating .gov domains." %}
+    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+  {% endif %}
+{% endif %}
+
+  <!--
   {% if widget.attrs.required %}
-    {% if field.label == "I read and agree to the requirements for operating .gov domains." %}
+    {% if field.label == "What is the name of the tribe you represent? “ %}
       <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
     {% endif %}
+    {% if field.label == "Organization name" %}
+    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% endif %}
+    {% if field.label == "Street address" %}
+    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% endif %}
+    {% if field.label == "City" %}
+    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% endif %}
+    {% if field.label == "State, territory, or military post" %}
+    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% endif %}
+    {% if field.label == "Zip code" %}
+    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% endif %}
+    {% if field.label == "First name / given name" %}
+    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% endif %}
+    {% if field.label == "Last name / family name" %}
+    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% endif %}
+    {% if field.label == "Title or role in your organization" %}
+    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% endif %}
+    {% if field.label == "Email" %}
+    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% endif %}
+    {% if field.label == "Phone" %}
+    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% endif %}
   {% endif %}
+  -->
 
 </{{ label_tag }}>

From c7b128e85f52f71d0187f3c96c0946ad78916821 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 07:26:01 -0800
Subject: [PATCH 43/85] only adding asterisks to forms that have more than one
 field

---
 src/registrar/templates/django/forms/label.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 108c8b0a4..a55dfbc39 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,7 +8,7 @@
     {{ field.label }}
   {% endif %}
 
-
+<!--
 {% if widget.attrs.required %}
   {% if field.label != "Is your organization an election office?" and 
   field.label != “What .gov domain do you want?” and 
@@ -16,8 +16,8 @@
     <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
   {% endif %}
 {% endif %}
+-->
 
-  <!--
   {% if widget.attrs.required %}
     {% if field.label == "What is the name of the tribe you represent? “ %}
       <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
@@ -53,6 +53,5 @@
     <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
     {% endif %}
   {% endif %}
-  -->
 
 </{{ label_tag }}>

From 43e94383da815a19d372ebccfbe24bda4b04f074 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 07:36:22 -0800
Subject: [PATCH 44/85] adding asterisks to only non one-field forms

---
 src/registrar/templates/django/forms/label.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index a55dfbc39..a037c6315 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,7 +8,7 @@
     {{ field.label }}
   {% endif %}
 
-<!--
+
 {% if widget.attrs.required %}
   {% if field.label != "Is your organization an election office?" and 
   field.label != “What .gov domain do you want?” and 
@@ -16,8 +16,8 @@
     <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
   {% endif %}
 {% endif %}
--->
 
+<!--
   {% if widget.attrs.required %}
     {% if field.label == "What is the name of the tribe you represent? “ %}
       <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
@@ -53,5 +53,5 @@
     <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
     {% endif %}
   {% endif %}
-
+-->
 </{{ label_tag }}>

From d31a8f55a966e7733edbf2e8c3c8475629bec911 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 11:54:46 -0800
Subject: [PATCH 45/85] added comment

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index a037c6315..49106eb02 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,7 +8,7 @@
     {{ field.label }}
   {% endif %}
 
-
+<!--Don't include asterisk in one-field forms-->
 {% if widget.attrs.required %}
   {% if field.label != "Is your organization an election office?" and 
   field.label != “What .gov domain do you want?” and 

From 929e736f38e321638e65df83f86a296d9db6a485 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 11:59:58 -0800
Subject: [PATCH 46/85] fixed quotation mark

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 49106eb02..32ffdd097 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -11,7 +11,7 @@
 <!--Don't include asterisk in one-field forms-->
 {% if widget.attrs.required %}
   {% if field.label != "Is your organization an election office?" and 
-  field.label != “What .gov domain do you want?” and 
+  field.label != "What .gov domain do you want?" and 
   field.label != "I read and agree to the requirements for operating .gov domains." %}
     <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
   {% endif %}

From b997deec7f977b6833542cb503987cbe0e7868c8 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 12:06:05 -0800
Subject: [PATCH 47/85] why am I getting status 500 errors

---
 src/registrar/templates/django/forms/label.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 32ffdd097..354b76a5f 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -10,9 +10,7 @@
 
 <!--Don't include asterisk in one-field forms-->
 {% if widget.attrs.required %}
-  {% if field.label != "Is your organization an election office?" and 
-  field.label != "What .gov domain do you want?" and 
-  field.label != "I read and agree to the requirements for operating .gov domains." %}
+  {% if field.label != "Is your organization an election office?" and field.label != "What .gov domain do you want?" and field.label != "I read and agree to the requirements for operating .gov domains." %}
     <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
   {% endif %}
 {% endif %}

From e733c120283389d8af8acc881fc2a9da6d17ab73 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 12:15:36 -0800
Subject: [PATCH 48/85] why am I getting status 500 errors

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 354b76a5f..ca15abe3b 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -10,7 +10,7 @@
 
 <!--Don't include asterisk in one-field forms-->
 {% if widget.attrs.required %}
-  {% if field.label != "Is your organization an election office?" and field.label != "What .gov domain do you want?" and field.label != "I read and agree to the requirements for operating .gov domains." %}
+  {% if field.label != ("Is your organization an election office?" or "What .gov domain do you want?" or "I read and agree to the requirements for operating .gov domains.") %}
     <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
   {% endif %}
 {% endif %}

From 46e7988fa5ad7abbf6d1b892f5f9013188221139 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 13:03:48 -0800
Subject: [PATCH 49/85] fixing syntax error

---
 src/registrar/templates/django/forms/label.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index ca15abe3b..4cb1fd66f 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,12 +8,12 @@
     {{ field.label }}
   {% endif %}
 
-<!--Don't include asterisk in one-field forms-->
-{% if widget.attrs.required %}
-  {% if field.label != ("Is your organization an election office?" or "What .gov domain do you want?" or "I read and agree to the requirements for operating .gov domains.") %}
-    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+  {% if widget.attrs.required %}
+    <!--Don't include asterisk in one-field forms-->
+    {% if field.label !=("Is your organization an election office?" or "What .gov domain do you want?" or "I read and agree to the requirements for operating .gov domains.") %}
+      <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+    {% endif %}
   {% endif %}
-{% endif %}
 
 <!--
   {% if widget.attrs.required %}

From b8236180e4213368af463d6c2348af57b6672e8a Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 14:40:02 -0800
Subject: [PATCH 50/85] fixing syntax again

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 4cb1fd66f..f763d765c 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -10,7 +10,7 @@
 
   {% if widget.attrs.required %}
     <!--Don't include asterisk in one-field forms-->
-    {% if field.label !=("Is your organization an election office?" or "What .gov domain do you want?" or "I read and agree to the requirements for operating .gov domains.") %}
+    {% if (field.label != "Is your organization an election office?") or (field.label != "What .gov domain do you want?") or (field.label != "I read and agree to the requirements for operating .gov domains.") %}
       <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
     {% endif %}
   {% endif %}

From 3371ee5ffccd0bd81f902cddfe2ea820161fd32a Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 14:50:07 -0800
Subject: [PATCH 51/85] fixing syntax again

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index f763d765c..7db89ea36 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -10,7 +10,7 @@
 
   {% if widget.attrs.required %}
     <!--Don't include asterisk in one-field forms-->
-    {% if (field.label != "Is your organization an election office?") or (field.label != "What .gov domain do you want?") or (field.label != "I read and agree to the requirements for operating .gov domains.") %}
+    {% if field.label != "Is your organization an election office?" or field.label != "What .gov domain do you want?" or field.label != "I read and agree to the requirements for operating .gov domains." %}
       <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
     {% endif %}
   {% endif %}

From 8bb6706f04965df6654fabb4aa01227815d02eec Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 14:55:08 -0800
Subject: [PATCH 52/85] fixing syntax again

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 7db89ea36..520ac7903 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -10,7 +10,7 @@
 
   {% if widget.attrs.required %}
     <!--Don't include asterisk in one-field forms-->
-    {% if field.label != "Is your organization an election office?" or field.label != "What .gov domain do you want?" or field.label != "I read and agree to the requirements for operating .gov domains." %}
+    {% if field.label != "Is your organization an election office?" or field.label != "What .gov domain do you want?"" or field.label != "I read and agree to the requirements for operating .gov domains." %}
       <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
     {% endif %}
   {% endif %}

From 19064edae5841616d321685479b5af5c6d90008c Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 14:55:29 -0800
Subject: [PATCH 53/85] fixing syntax again

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 520ac7903..7db89ea36 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -10,7 +10,7 @@
 
   {% if widget.attrs.required %}
     <!--Don't include asterisk in one-field forms-->
-    {% if field.label != "Is your organization an election office?" or field.label != "What .gov domain do you want?"" or field.label != "I read and agree to the requirements for operating .gov domains." %}
+    {% if field.label != "Is your organization an election office?" or field.label != "What .gov domain do you want?" or field.label != "I read and agree to the requirements for operating .gov domains." %}
       <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
     {% endif %}
   {% endif %}

From 4f6639e8783cfd97620aa3d3833390bec2d77c13 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 15:01:19 -0800
Subject: [PATCH 54/85] fixing syntax again

---
 src/registrar/templates/django/forms/label.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 7db89ea36..d1461a9e8 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,12 +8,12 @@
     {{ field.label }}
   {% endif %}
 
-  {% if widget.attrs.required %}
-    <!--Don't include asterisk in one-field forms-->
-    {% if field.label != "Is your organization an election office?" or field.label != "What .gov domain do you want?" or field.label != "I read and agree to the requirements for operating .gov domains." %}
-      <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-    {% endif %}
+{% if widget.attrs.required %}
+  <!--Don't include asterisk in one-field forms-->
+  {% if field.label != "Is your organization an election office?" or field.label != "What .gov domain do you want?" or field.label != "I read and agree to the requirements for operating .gov domains." %}
+    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
   {% endif %}
+{% endif %}
 
 <!--
   {% if widget.attrs.required %}

From 8c4057172b5030b93a87565c8f9eeed5a2fb14e0 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 15:04:56 -0800
Subject: [PATCH 55/85] fixing syntax again

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index d1461a9e8..3471c52c4 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -10,7 +10,7 @@
 
 {% if widget.attrs.required %}
   <!--Don't include asterisk in one-field forms-->
-  {% if field.label != "Is your organization an election office?" or field.label != "What .gov domain do you want?" or field.label != "I read and agree to the requirements for operating .gov domains." %}
+  {% if field.label != "Is your organization an election office?" and field.label != "What .gov domain do you want?" and field.label != "I read and agree to the requirements for operating .gov domains." %}
     <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
   {% endif %}
 {% endif %}

From 21db51cfb09b96c7f9dcd26d33e44cd2631021c3 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 15:10:01 -0800
Subject: [PATCH 56/85] fixing syntax again

---
 src/registrar/templates/django/forms/label.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 3471c52c4..bfeffe0bb 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -9,12 +9,13 @@
   {% endif %}
 
 {% if widget.attrs.required %}
-  <!--Don't include asterisk in one-field forms-->
-  {% if field.label != "Is your organization an election office?" and field.label != "What .gov domain do you want?" and field.label != "I read and agree to the requirements for operating .gov domains." %}
+<!-- Don't include asterisk in one-field forms -->
+  % if field.label not in ["Is your organization an election office?", "What .gov domain do you want?", "I read and agree to the requirements for operating .gov domains."] %}
     <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
   {% endif %}
 {% endif %}
 
+
 <!--
   {% if widget.attrs.required %}
     {% if field.label == "What is the name of the tribe you represent? “ %}

From 2eb5ac89cefdb6728a3177b6be17a65306a6ee63 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 15:10:59 -0800
Subject: [PATCH 57/85] fixing syntax again

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index bfeffe0bb..f61d1fd5e 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -10,7 +10,7 @@
 
 {% if widget.attrs.required %}
 <!-- Don't include asterisk in one-field forms -->
-  % if field.label not in ["Is your organization an election office?", "What .gov domain do you want?", "I read and agree to the requirements for operating .gov domains."] %}
+  {% if field.label not in ["Is your organization an election office?", "What .gov domain do you want?", "I read and agree to the requirements for operating .gov domains."] %}
     <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
   {% endif %}
 {% endif %}

From db162b70d2102e9ddad12843b8bf5f6fa169e548 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 15:33:23 -0800
Subject: [PATCH 58/85] fixing syntax again

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index f61d1fd5e..05a932143 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -10,7 +10,7 @@
 
 {% if widget.attrs.required %}
 <!-- Don't include asterisk in one-field forms -->
-  {% if field.label not in ["Is your organization an election office?", "What .gov domain do you want?", "I read and agree to the requirements for operating .gov domains."] %}
+  {% if field.label != "Is your organization an election office?" and field.label != "What .gov domain do you want?" and field.label != "I read and agree to the requirements for operating .gov domains." %}
     <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
   {% endif %}
 {% endif %}

From f8baae75b8888d744620ca6e453ec91d30f8ed9b Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 15:40:38 -0800
Subject: [PATCH 59/85] fixing syntax again

---
 src/registrar/templates/django/forms/label.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 05a932143..f2f18eca9 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,12 +8,9 @@
     {{ field.label }}
   {% endif %}
 
-{% if widget.attrs.required %}
-<!-- Don't include asterisk in one-field forms -->
-  {% if field.label != "Is your organization an election office?" and field.label != "What .gov domain do you want?" and field.label != "I read and agree to the requirements for operating .gov domains." %}
+  {% if widget.attrs.required and field.label != "Is your organization an election office" and field.label != "What .gov domain do you want" and field.label != "I read and agree to the requirements for operating .gov domains" %}
     <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
   {% endif %}
-{% endif %}
 
 
 <!--

From fcba4074b52f575095aadd38766682a904b793f7 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 15:41:25 -0800
Subject: [PATCH 60/85] fixing syntax again

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index f2f18eca9..3bd6a1427 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,7 +8,7 @@
     {{ field.label }}
   {% endif %}
 
-  {% if widget.attrs.required and field.label != "Is your organization an election office" and field.label != "What .gov domain do you want" and field.label != "I read and agree to the requirements for operating .gov domains" %}
+  {% if widget.attrs.required and field.label != "Is your organization an election office" and field.label != "What .gov domain do you want" and field.label != "I read and agree to the requirements for operating .gov domains." %}
     <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
   {% endif %}
 

From 4c7cdf323fcf59e21f3407142537b666710623ca Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 15:56:19 -0800
Subject: [PATCH 61/85] fixing syntax again

---
 src/registrar/templates/django/forms/label.html | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 3bd6a1427..d1cc18bb7 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,11 +8,19 @@
     {{ field.label }}
   {% endif %}
 
-  {% if widget.attrs.required and field.label != "Is your organization an election office" and field.label != "What .gov domain do you want" and field.label != "I read and agree to the requirements for operating .gov domains." %}
-    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+  {% if widget.attrs.required %}
+    <!-- Don't include asterisk in one-field forms -->
+    {% if field.label != "Is your organization an election office" %}
+      {% if field.label != "What .gov domain do you want" %}
+        {% if field.label != "I read and agree to the requirements for operating .gov domains" %}
+          <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
+        {% endif %}
+      {% endif %}
+    {% endif %}
   {% endif %}
 
 
+
 <!--
   {% if widget.attrs.required %}
     {% if field.label == "What is the name of the tribe you represent? “ %}

From 81b7bac4825ad4817ed75a1c4ee4e7ffb7303c3d Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 16:14:26 -0800
Subject: [PATCH 62/85] trying a different approach

---
 src/registrar/forms/application_wizard.py     |  2 +-
 .../templates/application_org_election.html   |  4 +-
 .../templates/django/forms/label.html         | 70 +++++++------------
 3 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index a862afc6c..c974fe18d 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -170,7 +170,7 @@ class TribalGovernmentForm(RegistrarForm):
     )
 
     tribe_name = forms.CharField(
-        label="What is the name of the tribe you represent? ",
+        label="What is the name of the tribe you represent?",
         error_messages={"required": "Enter the tribe you represent."},
     )
 
diff --git a/src/registrar/templates/application_org_election.html b/src/registrar/templates/application_org_election.html
index ce79f5b22..04c8f2657 100644
--- a/src/registrar/templates/application_org_election.html
+++ b/src/registrar/templates/application_org_election.html
@@ -2,9 +2,7 @@
 {% load field_helpers %}
 
 {% block form_instructions %}
-  <h2 class="margin-bottom-05">
-    Is your organization an election office?
-  </h2>
+  <h2 class="margin-bottom-05">Is your organization an election office?</h2>
 
   <p>An election office is a government entity whose <em>primary</em> responsibility is overseeing elections and/or conducting voter registration.</p>
 
diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index d1cc18bb7..5aad3ccc4 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,54 +8,38 @@
     {{ field.label }}
   {% endif %}
 
+<!--
   {% if widget.attrs.required %}
-    <!-- Don't include asterisk in one-field forms -->
-    {% if field.label != "Is your organization an election office" %}
-      {% if field.label != "What .gov domain do you want" %}
-        {% if field.label != "I read and agree to the requirements for operating .gov domains" %}
+    
+    {% if field.label != "Is your organization an election office?" %}
+      {% if field.label != "What .gov domain do you want?" %}
+        {% if field.label != "I read and agree to the requirements for operating .gov domains." %}
           <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
         {% endif %}
       {% endif %}
     {% endif %}
   {% endif %}
-
-
-
-<!--
-  {% if widget.attrs.required %}
-    {% if field.label == "What is the name of the tribe you represent? “ %}
-      <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-    {% endif %}
-    {% if field.label == "Organization name" %}
-    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-    {% endif %}
-    {% if field.label == "Street address" %}
-    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-    {% endif %}
-    {% if field.label == "City" %}
-    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-    {% endif %}
-    {% if field.label == "State, territory, or military post" %}
-    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-    {% endif %}
-    {% if field.label == "Zip code" %}
-    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-    {% endif %}
-    {% if field.label == "First name / given name" %}
-    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-    {% endif %}
-    {% if field.label == "Last name / family name" %}
-    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-    {% endif %}
-    {% if field.label == "Title or role in your organization" %}
-    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-    {% endif %}
-    {% if field.label == "Email" %}
-    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-    {% endif %}
-    {% if field.label == "Phone" %}
-    <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-    {% endif %}
-  {% endif %}
 -->
+
+{% if widget.attrs.required %}
+  {% for required_label in [
+    "What is the name of the tribe you represent?",
+    "Organization name",
+    "Street address",
+    "City",
+    "State, territory, or military post",
+    "Zip code",
+    "First name / given name",
+    "Last name / family name",
+    "Title or role in your organization",
+    "Email",
+    "Phone"
+  ] %}
+    {% if field.label == required_label %}
+      <abbr class="usa-hint usa-hint--required" title="required"> *</abbr>
+    {% endif %}
+  {% endfor %}
+{% endif %}
+
+
 </{{ label_tag }}>

From 2e1ddd91e59b5d09f3fd9319d8c0a441ff024d29 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 16:25:27 -0800
Subject: [PATCH 63/85] avoiding for loop in django template tag

---
 .../templates/django/forms/label.html         | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 5aad3ccc4..3edaed1c9 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -21,25 +21,22 @@
   {% endif %}
 -->
 
-{% if widget.attrs.required %}
-  {% for required_label in [
-    "What is the name of the tribe you represent?",
-    "Organization name",
-    "Street address",
-    "City",
-    "State, territory, or military post",
-    "Zip code",
-    "First name / given name",
-    "Last name / family name",
-    "Title or role in your organization",
-    "Email",
-    "Phone"
-  ] %}
-    {% if field.label == required_label %}
-      <abbr class="usa-hint usa-hint--required" title="required"> *</abbr>
-    {% endif %}
-  {% endfor %}
+{% if widget.attrs.required and field.label in [
+  "What is the name of the tribe you represent?",
+  "Organization name",
+  "Street address",
+  "City",
+  "State, territory, or military post",
+  "Zip code",
+  "First name / given name",
+  "Last name / family name",
+  "Title or role in your organization",
+  "Email",
+  "Phone"
+] %}
+  <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
 {% endif %}
 
 
+
 </{{ label_tag }}>

From 9156cdc770c1eabac1e83b16fcaee2527c80ef82 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 16:30:41 -0800
Subject: [PATCH 64/85] simplified since I am still getting template syntax
 errors

---
 src/registrar/templates/django/forms/label.html | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 3edaed1c9..e9ac2809d 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -21,22 +21,13 @@
   {% endif %}
 -->
 
-{% if widget.attrs.required and field.label in [
-  "What is the name of the tribe you represent?",
-  "Organization name",
-  "Street address",
-  "City",
-  "State, territory, or military post",
-  "Zip code",
-  "First name / given name",
-  "Last name / family name",
-  "Title or role in your organization",
-  "Email",
-  "Phone"
-] %}
+{% if widget.attrs.required and field.label in ["What is the name of the tribe you represent?", "Organization name",
+"Street address", "City", "State, territory, or military post", "Zip code", "First name / given name", "Last name /
+family name", "Title or role in your organization", "Email", "Phone"] %}
   <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
 {% endif %}
 
 
 
+
 </{{ label_tag }}>

From 07df4b05d3afd7e4fe7d37240c42828e4c78b77a Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 16:39:18 -0800
Subject: [PATCH 65/85] simplified since I am still getting template syntax
 errors

---
 .../templates/django/forms/label.html         | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index e9ac2809d..339ef7b7e 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -8,26 +8,12 @@
     {{ field.label }}
   {% endif %}
 
-<!--
   {% if widget.attrs.required %}
-    
-    {% if field.label != "Is your organization an election office?" %}
-      {% if field.label != "What .gov domain do you want?" %}
-        {% if field.label != "I read and agree to the requirements for operating .gov domains." %}
-          <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-        {% endif %}
-      {% endif %}
+  <!--Don't add asterisk to one-field forms -->
+    {% if field.label == "Is your organization an election office?" or field.label == "What .gov domain do you want? or field.label == "I read and agree to the requirements for operating .gov domains." %}
+    {% else %}
+      <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
     {% endif %}
   {% endif %}
--->
-
-{% if widget.attrs.required and field.label in ["What is the name of the tribe you represent?", "Organization name",
-"Street address", "City", "State, territory, or military post", "Zip code", "First name / given name", "Last name /
-family name", "Title or role in your organization", "Email", "Phone"] %}
-  <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
-{% endif %}
-
-
-
 
 </{{ label_tag }}>

From ca861f1ec250e57d5ba0f8b10be48505740de4a5 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Mon, 27 Nov 2023 16:40:34 -0800
Subject: [PATCH 66/85] missing quotation mark

---
 src/registrar/templates/django/forms/label.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 339ef7b7e..3920bc66a 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -10,7 +10,7 @@
 
   {% if widget.attrs.required %}
   <!--Don't add asterisk to one-field forms -->
-    {% if field.label == "Is your organization an election office?" or field.label == "What .gov domain do you want? or field.label == "I read and agree to the requirements for operating .gov domains." %}
+    {% if field.label == "Is your organization an election office?" or field.label == "What .gov domain do you want?" or field.label == "I read and agree to the requirements for operating .gov domains." %}
     {% else %}
       <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
     {% endif %}

From 6d2701ec2b89b4a15c58bef7a4d0ac059cff565f Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 28 Nov 2023 09:18:26 -0800
Subject: [PATCH 67/85] added (optional) text to org contact and emphasized
 required fields sentence

---
 src/registrar/templates/application_other_contacts.html | 2 +-
 src/registrar/templates/includes/required_fields.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/application_other_contacts.html b/src/registrar/templates/application_other_contacts.html
index 679742281..bde203878 100644
--- a/src/registrar/templates/application_other_contacts.html
+++ b/src/registrar/templates/application_other_contacts.html
@@ -24,7 +24,7 @@
   {% for form in forms.0.forms %}
     <fieldset class="usa-fieldset">
       <legend>
-        <h2>Organization contact {{ forloop.counter }}</h2>
+        <h2>Organization contact {{ forloop.counter }} (optional)</h2>
       </legend>
 
       {% input_with_errors form.first_name %}
diff --git a/src/registrar/templates/includes/required_fields.html b/src/registrar/templates/includes/required_fields.html
index c710644c5..0087b048a 100644
--- a/src/registrar/templates/includes/required_fields.html
+++ b/src/registrar/templates/includes/required_fields.html
@@ -1,3 +1,3 @@
   <p class="margin-top-3">
-    <i>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required" title="required">*</abbr>).</i>
+    <em>Required fields are marked with an asterisk (<abbr class="usa-hint usa-hint--required" title="required">*</abbr>).</em>
   </p>

From 3357696661dd00bfceba59c15ab74ad4d3de7374 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 28 Nov 2023 10:44:45 -0800
Subject: [PATCH 68/85] include required fields sentence in Other Contacts page

---
 src/registrar/templates/application_other_contacts.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/registrar/templates/application_other_contacts.html b/src/registrar/templates/application_other_contacts.html
index bde203878..a3f0971dc 100644
--- a/src/registrar/templates/application_other_contacts.html
+++ b/src/registrar/templates/application_other_contacts.html
@@ -13,11 +13,9 @@
 {% endblock %}
 
 {% block form_required_fields_help_text %}
-{# there are no required fields on this page so don't show this #}
+{% include "includes/required_fields.html" %}
 {% endblock %}
 
-
-
 {% block form_fields %}
   {{ forms.0.management_form }}
   {# forms.0 is a formset and this iterates over its forms #}

From 1134b781004780f0e672808694f4a430bc0dac63 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 28 Nov 2023 18:30:53 -0800
Subject: [PATCH 69/85] adding (optional) text to anything else app page

---
 src/registrar/forms/application_wizard.py  | 2 +-
 src/registrar/models/domain_application.py | 2 +-
 src/registrar/models/domain_information.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index c974fe18d..98997aae8 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -620,7 +620,7 @@ class NoOtherContactsForm(RegistrarForm):
 class AnythingElseForm(RegistrarForm):
     anything_else = forms.CharField(
         required=False,
-        label="Anything else we should know?",
+        label="Anything else we should know? (optional)",
         widget=forms.Textarea(),
         validators=[
             MaxLengthValidator(
diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py
index 6418ff308..0ca768288 100644
--- a/src/registrar/models/domain_application.py
+++ b/src/registrar/models/domain_application.py
@@ -543,7 +543,7 @@ class DomainApplication(TimeStampedModel):
     anything_else = models.TextField(
         null=True,
         blank=True,
-        help_text="Anything else we should know?",
+        help_text="Anything else we should know? (optional)",
     )
 
     is_policy_acknowledged = models.BooleanField(
diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py
index 6e20f4c5e..83a818aa2 100644
--- a/src/registrar/models/domain_information.py
+++ b/src/registrar/models/domain_information.py
@@ -190,7 +190,7 @@ class DomainInformation(TimeStampedModel):
     anything_else = models.TextField(
         null=True,
         blank=True,
-        help_text="Anything else we should know?",
+        help_text="Anything else we should know? (optional)",
     )
 
     is_policy_acknowledged = models.BooleanField(

From deab78ccbe9f6e4d026b2ffd14f0b86a6ca66265 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 28 Nov 2023 18:48:20 -0800
Subject: [PATCH 70/85] migrations

---
 ...omainapplication_anything_else_and_more.py | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/registrar/migrations/0050_alter_domainapplication_anything_else_and_more.py

diff --git a/src/registrar/migrations/0050_alter_domainapplication_anything_else_and_more.py b/src/registrar/migrations/0050_alter_domainapplication_anything_else_and_more.py
new file mode 100644
index 000000000..6cc14a219
--- /dev/null
+++ b/src/registrar/migrations/0050_alter_domainapplication_anything_else_and_more.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.7 on 2023-11-29 02:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0049_alter_domainapplication_urbanization_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="domainapplication",
+            name="anything_else",
+            field=models.TextField(blank=True, help_text="Anything else we should know? (optional)", null=True),
+        ),
+        migrations.AlterField(
+            model_name="domaininformation",
+            name="anything_else",
+            field=models.TextField(blank=True, help_text="Anything else we should know? (optional)", null=True),
+        ),
+    ]

From 25a0ceb330cd974bd397e9e64e1797c6a2c2f935 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 28 Nov 2023 19:02:13 -0800
Subject: [PATCH 71/85] adding (optional) text to anything else app page

---
 src/registrar/admin.py             | 2 +-
 src/registrar/views/application.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 6585d602a..74b83e2a0 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -434,7 +434,7 @@ class DomainInformationAdmin(ListHeaderAdmin):
             "No other employees from your organization?",
             {"fields": ["no_other_contacts_rationale"]},
         ),
-        ("Anything else we should know?", {"fields": ["anything_else"]}),
+        ("Anything else we should know? (optional)", {"fields": ["anything_else"]}),
         (
             "Requirements for operating .gov domains",
             {"fields": ["is_policy_acknowledged"]},
diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index e907be8e5..e21f1a3ea 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -85,7 +85,7 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
         Step.YOUR_CONTACT: _("Your contact information"),
         Step.OTHER_CONTACTS: _("Other employees from your organization"),
         Step.NO_OTHER_CONTACTS: _("No other employees from your organization?"),
-        Step.ANYTHING_ELSE: _("Anything else we should know?"),
+        Step.ANYTHING_ELSE: _("Anything else we should know? (optional)"),
         Step.REQUIREMENTS: _("Requirements for operating .gov domains"),
         Step.REVIEW: _("Review and submit your domain request"),
     }

From cff5e39a173e0a3c46c45788b448f56d96c0487f Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 28 Nov 2023 19:20:32 -0800
Subject: [PATCH 72/85] add optional to title of security email page

---
 src/registrar/forms/domain.py                      | 2 +-
 src/registrar/templates/domain_security_email.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 6ba48a0eb..0305dadd5 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -223,7 +223,7 @@ class DomainSecurityEmailForm(forms.Form):
     """Form for adding or editing a security email to a domain."""
 
     security_email = forms.EmailField(
-        label="Security email (optional)",
+        label="Security email",
         required=False,
         error_messages={
             "invalid": str(SecurityEmailError(code=SecurityEmailErrorCodes.BAD_DATA)),
diff --git a/src/registrar/templates/domain_security_email.html b/src/registrar/templates/domain_security_email.html
index 4054186da..f52ef4549 100644
--- a/src/registrar/templates/domain_security_email.html
+++ b/src/registrar/templates/domain_security_email.html
@@ -6,7 +6,7 @@
 {% block domain_content %}
   {% include "includes/form_errors.html" with form=form %}
 
-  <h1>Security email</h1>
+  <h1>Security email (optional)</h1>
 
   <p>We strongly recommend that you provide a security email. This email will allow the  public to report observed or suspected security issues on your domain. Security emails are made public and included in the <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'about/data/' %}">.gov domain data</a> we provide.</p>
 

From c328e053982da9dacbf55f6d7fb02235661b19b4 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 29 Nov 2023 08:44:13 -0800
Subject: [PATCH 73/85] making anything else page format more consistent

---
 src/registrar/forms/application_wizard.py              | 2 +-
 src/registrar/models/domain_application.py             | 2 +-
 src/registrar/models/domain_information.py             | 2 +-
 src/registrar/templates/application_anything_else.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index 98997aae8..c974fe18d 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -620,7 +620,7 @@ class NoOtherContactsForm(RegistrarForm):
 class AnythingElseForm(RegistrarForm):
     anything_else = forms.CharField(
         required=False,
-        label="Anything else we should know? (optional)",
+        label="Anything else we should know?",
         widget=forms.Textarea(),
         validators=[
             MaxLengthValidator(
diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py
index 0ca768288..6418ff308 100644
--- a/src/registrar/models/domain_application.py
+++ b/src/registrar/models/domain_application.py
@@ -543,7 +543,7 @@ class DomainApplication(TimeStampedModel):
     anything_else = models.TextField(
         null=True,
         blank=True,
-        help_text="Anything else we should know? (optional)",
+        help_text="Anything else we should know?",
     )
 
     is_policy_acknowledged = models.BooleanField(
diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py
index 83a818aa2..6e20f4c5e 100644
--- a/src/registrar/models/domain_information.py
+++ b/src/registrar/models/domain_information.py
@@ -190,7 +190,7 @@ class DomainInformation(TimeStampedModel):
     anything_else = models.TextField(
         null=True,
         blank=True,
-        help_text="Anything else we should know? (optional)",
+        help_text="Anything else we should know?",
     )
 
     is_policy_acknowledged = models.BooleanField(
diff --git a/src/registrar/templates/application_anything_else.html b/src/registrar/templates/application_anything_else.html
index 1c598db9a..ac9c9787c 100644
--- a/src/registrar/templates/application_anything_else.html
+++ b/src/registrar/templates/application_anything_else.html
@@ -2,7 +2,7 @@
 {% load field_helpers %}
 
 {% block form_instructions %}
-  <p>Is there anything else we should know about your domain request?</p>
+  <h2>Is there anything else we should know about your domain request? (optional)</h2>
 {% endblock %}
 
 {% block form_required_fields_help_text %}

From d7984c69d6fb9ae6ada416634eddce9c60959c0f Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 29 Nov 2023 08:52:37 -0800
Subject: [PATCH 74/85] migrations

---
 ...omainapplication_anything_else_and_more.py | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/registrar/migrations/0051_alter_domainapplication_anything_else_and_more.py

diff --git a/src/registrar/migrations/0051_alter_domainapplication_anything_else_and_more.py b/src/registrar/migrations/0051_alter_domainapplication_anything_else_and_more.py
new file mode 100644
index 000000000..7c8f9c3f6
--- /dev/null
+++ b/src/registrar/migrations/0051_alter_domainapplication_anything_else_and_more.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.7 on 2023-11-29 16:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0050_alter_domainapplication_anything_else_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="domainapplication",
+            name="anything_else",
+            field=models.TextField(blank=True, help_text="Anything else we should know?", null=True),
+        ),
+        migrations.AlterField(
+            model_name="domaininformation",
+            name="anything_else",
+            field=models.TextField(blank=True, help_text="Anything else we should know?", null=True),
+        ),
+    ]

From 7cd037999ee6df6563c20126dfb4fc495f46eeee Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 29 Nov 2023 09:21:34 -0800
Subject: [PATCH 75/85] removing optional from title on anything else page

---
 src/registrar/views/application.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index e21f1a3ea..e907be8e5 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -85,7 +85,7 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
         Step.YOUR_CONTACT: _("Your contact information"),
         Step.OTHER_CONTACTS: _("Other employees from your organization"),
         Step.NO_OTHER_CONTACTS: _("No other employees from your organization?"),
-        Step.ANYTHING_ELSE: _("Anything else we should know? (optional)"),
+        Step.ANYTHING_ELSE: _("Anything else we should know?"),
         Step.REQUIREMENTS: _("Requirements for operating .gov domains"),
         Step.REVIEW: _("Review and submit your domain request"),
     }

From fa72f413abcfc1a4f20b8fdb69e674dfc0ecd4c2 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 29 Nov 2023 11:10:18 -0800
Subject: [PATCH 76/85] changing anything else page

---
 src/registrar/admin.py                        |  4 ++--
 src/registrar/forms/application_wizard.py     |  2 +-
 ...omainapplication_anything_else_and_more.py |  6 ++---
 ...omainapplication_anything_else_and_more.py | 22 -------------------
 src/registrar/models/domain_application.py    |  2 +-
 src/registrar/models/domain_information.py    |  2 +-
 .../templates/application_anything_else.html  |  2 +-
 .../templates/application_status.html         |  2 +-
 .../emails/includes/application_summary.txt   |  2 +-
 src/registrar/views/application.py            |  2 +-
 10 files changed, 12 insertions(+), 34 deletions(-)
 delete mode 100644 src/registrar/migrations/0051_alter_domainapplication_anything_else_and_more.py

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 74b83e2a0..82dba6e02 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -434,7 +434,7 @@ class DomainInformationAdmin(ListHeaderAdmin):
             "No other employees from your organization?",
             {"fields": ["no_other_contacts_rationale"]},
         ),
-        ("Anything else we should know? (optional)", {"fields": ["anything_else"]}),
+        ("Anything else?", {"fields": ["anything_else"]}),
         (
             "Requirements for operating .gov domains",
             {"fields": ["is_policy_acknowledged"]},
@@ -569,7 +569,7 @@ class DomainApplicationAdmin(ListHeaderAdmin):
             "No other employees from your organization?",
             {"fields": ["no_other_contacts_rationale"]},
         ),
-        ("Anything else we should know?", {"fields": ["anything_else"]}),
+        ("Anything else?", {"fields": ["anything_else"]}),
         (
             "Requirements for operating .gov domains",
             {"fields": ["is_policy_acknowledged"]},
diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index c974fe18d..ad11ebfd3 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -620,7 +620,7 @@ class NoOtherContactsForm(RegistrarForm):
 class AnythingElseForm(RegistrarForm):
     anything_else = forms.CharField(
         required=False,
-        label="Anything else we should know?",
+        label="Anything else?",
         widget=forms.Textarea(),
         validators=[
             MaxLengthValidator(
diff --git a/src/registrar/migrations/0050_alter_domainapplication_anything_else_and_more.py b/src/registrar/migrations/0050_alter_domainapplication_anything_else_and_more.py
index 6cc14a219..a84e7e1c4 100644
--- a/src/registrar/migrations/0050_alter_domainapplication_anything_else_and_more.py
+++ b/src/registrar/migrations/0050_alter_domainapplication_anything_else_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.7 on 2023-11-29 02:47
+# Generated by Django 4.2.7 on 2023-11-29 19:05
 
 from django.db import migrations, models
 
@@ -12,11 +12,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="domainapplication",
             name="anything_else",
-            field=models.TextField(blank=True, help_text="Anything else we should know? (optional)", null=True),
+            field=models.TextField(blank=True, help_text="Anything else?", null=True),
         ),
         migrations.AlterField(
             model_name="domaininformation",
             name="anything_else",
-            field=models.TextField(blank=True, help_text="Anything else we should know? (optional)", null=True),
+            field=models.TextField(blank=True, help_text="Anything else?", null=True),
         ),
     ]
diff --git a/src/registrar/migrations/0051_alter_domainapplication_anything_else_and_more.py b/src/registrar/migrations/0051_alter_domainapplication_anything_else_and_more.py
deleted file mode 100644
index 7c8f9c3f6..000000000
--- a/src/registrar/migrations/0051_alter_domainapplication_anything_else_and_more.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 4.2.7 on 2023-11-29 16:51
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("registrar", "0050_alter_domainapplication_anything_else_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="domainapplication",
-            name="anything_else",
-            field=models.TextField(blank=True, help_text="Anything else we should know?", null=True),
-        ),
-        migrations.AlterField(
-            model_name="domaininformation",
-            name="anything_else",
-            field=models.TextField(blank=True, help_text="Anything else we should know?", null=True),
-        ),
-    ]
diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py
index 6418ff308..d10539145 100644
--- a/src/registrar/models/domain_application.py
+++ b/src/registrar/models/domain_application.py
@@ -543,7 +543,7 @@ class DomainApplication(TimeStampedModel):
     anything_else = models.TextField(
         null=True,
         blank=True,
-        help_text="Anything else we should know?",
+        help_text="Anything else?",
     )
 
     is_policy_acknowledged = models.BooleanField(
diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py
index 6e20f4c5e..62b0362ec 100644
--- a/src/registrar/models/domain_information.py
+++ b/src/registrar/models/domain_information.py
@@ -190,7 +190,7 @@ class DomainInformation(TimeStampedModel):
     anything_else = models.TextField(
         null=True,
         blank=True,
-        help_text="Anything else we should know?",
+        help_text="Anything else?",
     )
 
     is_policy_acknowledged = models.BooleanField(
diff --git a/src/registrar/templates/application_anything_else.html b/src/registrar/templates/application_anything_else.html
index ac9c9787c..f69b7e70e 100644
--- a/src/registrar/templates/application_anything_else.html
+++ b/src/registrar/templates/application_anything_else.html
@@ -2,7 +2,7 @@
 {% load field_helpers %}
 
 {% block form_instructions %}
-  <h2>Is there anything else we should know about your domain request? (optional)</h2>
+  <p>Is there anything else you'd like us to know about your domain request? This question is optional.</p>
 {% endblock %}
 
 {% block form_required_fields_help_text %}
diff --git a/src/registrar/templates/application_status.html b/src/registrar/templates/application_status.html
index 79d0f7ff9..3bf02f0e0 100644
--- a/src/registrar/templates/application_status.html
+++ b/src/registrar/templates/application_status.html
@@ -111,7 +111,7 @@
 
     {% include "includes/summary_item.html" with title='Other employees from your organization' value=domainapplication.other_contacts.all contact='true' list='true' heading_level=heading_level %}
 
-    {% include "includes/summary_item.html" with title='Anything else we should know' value=domainapplication.anything_else|default:"No" heading_level=heading_level %}
+    {% include "includes/summary_item.html" with title='Anything else?' value=domainapplication.anything_else|default:"No" heading_level=heading_level %}
 
   {% endwith %}
   </div>
diff --git a/src/registrar/templates/emails/includes/application_summary.txt b/src/registrar/templates/emails/includes/application_summary.txt
index 293dad2e4..c628e1074 100644
--- a/src/registrar/templates/emails/includes/application_summary.txt
+++ b/src/registrar/templates/emails/includes/application_summary.txt
@@ -34,6 +34,6 @@ Other employees from your organization:
 {% for other in application.other_contacts.all %}
 {% spaceless %}{% include "emails/includes/contact.txt" with contact=other %}{% endspaceless %}
 {% endfor %}{% endif %}{% if application.anything_else %}
-Anything else we should know?
+Anything else?
 {{ application.anything_else }}
 {% endif %}
\ No newline at end of file
diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py
index e907be8e5..dd185198f 100644
--- a/src/registrar/views/application.py
+++ b/src/registrar/views/application.py
@@ -85,7 +85,7 @@ class ApplicationWizard(ApplicationWizardPermissionView, TemplateView):
         Step.YOUR_CONTACT: _("Your contact information"),
         Step.OTHER_CONTACTS: _("Other employees from your organization"),
         Step.NO_OTHER_CONTACTS: _("No other employees from your organization?"),
-        Step.ANYTHING_ELSE: _("Anything else we should know?"),
+        Step.ANYTHING_ELSE: _("Anything else?"),
         Step.REQUIREMENTS: _("Requirements for operating .gov domains"),
         Step.REVIEW: _("Review and submit your domain request"),
     }

From 462ebe4454017881ace448e6fb6cd0212e22d4c1 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 29 Nov 2023 11:15:24 -0800
Subject: [PATCH 77/85] updating test_emails.py to reflect new anything else
 title

---
 src/registrar/tests/test_emails.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/tests/test_emails.py b/src/registrar/tests/test_emails.py
index 7bce52668..eb6da072d 100644
--- a/src/registrar/tests/test_emails.py
+++ b/src/registrar/tests/test_emails.py
@@ -158,7 +158,7 @@ class TestEmails(TestCase):
         _, kwargs = self.mock_client.send_email.call_args
         body = kwargs["Content"]["Simple"]["Body"]["Text"]["Data"]
         # spacing should be right between adjacent elements
-        self.assertRegex(body, r"5557\n\nAnything else we should know?")
+        self.assertRegex(body, r"5557\n\nAnything else?")
 
     @boto3_mocking.patching
     def test_submission_confirmation_no_anything_else_spacing(self):
@@ -168,6 +168,6 @@ class TestEmails(TestCase):
             application.submit()
         _, kwargs = self.mock_client.send_email.call_args
         body = kwargs["Content"]["Simple"]["Body"]["Text"]["Data"]
-        self.assertNotIn("Anything else we should know", body)
+        self.assertNotIn("Anything else", body)
         # spacing should be right between adjacent elements
         self.assertRegex(body, r"5557\n\n----")

From f465e2e06b8403a42b297d9b407951b92956c247 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 29 Nov 2023 17:53:11 -0800
Subject: [PATCH 78/85] remove (optional) from security email title and put it
 in label instead

---
 src/registrar/forms/domain.py                      | 2 +-
 src/registrar/templates/domain_security_email.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 0305dadd5..6ba48a0eb 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -223,7 +223,7 @@ class DomainSecurityEmailForm(forms.Form):
     """Form for adding or editing a security email to a domain."""
 
     security_email = forms.EmailField(
-        label="Security email",
+        label="Security email (optional)",
         required=False,
         error_messages={
             "invalid": str(SecurityEmailError(code=SecurityEmailErrorCodes.BAD_DATA)),
diff --git a/src/registrar/templates/domain_security_email.html b/src/registrar/templates/domain_security_email.html
index f52ef4549..4054186da 100644
--- a/src/registrar/templates/domain_security_email.html
+++ b/src/registrar/templates/domain_security_email.html
@@ -6,7 +6,7 @@
 {% block domain_content %}
   {% include "includes/form_errors.html" with form=form %}
 
-  <h1>Security email (optional)</h1>
+  <h1>Security email</h1>
 
   <p>We strongly recommend that you provide a security email. This email will allow the  public to report observed or suspected security issues on your domain. Security emails are made public and included in the <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'about/data/' %}">.gov domain data</a> we provide.</p>
 

From 63cbd1908d84fbb1b71e35fa56639f290c20a17f Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 29 Nov 2023 18:42:04 -0800
Subject: [PATCH 79/85] Add Optionally to Current Sites page and remove
 asterisk from No Other Conacts page

---
 src/registrar/templates/application_current_sites.html | 2 +-
 src/registrar/templates/django/forms/label.html        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/application_current_sites.html b/src/registrar/templates/application_current_sites.html
index 627727ae3..3cada9e0e 100644
--- a/src/registrar/templates/application_current_sites.html
+++ b/src/registrar/templates/application_current_sites.html
@@ -2,7 +2,7 @@
 {% load static field_helpers %}
 
 {% block form_instructions %}
-  <p>Enter your organization’s current public website, if you have one. For example,
+  <p>Optionally, enter your organization’s current public website, if you have one. For example,
   www.city.com. We can better evaluate your domain request if we know about domains 
 you’re already using. If you already have any .gov domains please include them.</p>
 {% endblock %}
diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 3920bc66a..033296ab1 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -10,7 +10,7 @@
 
   {% if widget.attrs.required %}
   <!--Don't add asterisk to one-field forms -->
-    {% if field.label == "Is your organization an election office?" or field.label == "What .gov domain do you want?" or field.label == "I read and agree to the requirements for operating .gov domains." %}
+    {% if field.label == "Is your organization an election office?" or field.label == "What .gov domain do you want?" or field.label == "I read and agree to the requirements for operating .gov domains." or field.label == "Please explain why there are no other employees from your organization" %}
     {% else %}
       <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
     {% endif %}

From 44f8b0189d9a2e6b4aa249e6823ee13381278db1 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 29 Nov 2023 20:06:02 -0800
Subject: [PATCH 80/85] add 'this question is optional' to current sites page
 and removing required fields sentence for no other contacts page

---
 src/registrar/templates/application_current_sites.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/application_current_sites.html b/src/registrar/templates/application_current_sites.html
index 3cada9e0e..67343aee9 100644
--- a/src/registrar/templates/application_current_sites.html
+++ b/src/registrar/templates/application_current_sites.html
@@ -2,9 +2,9 @@
 {% load static field_helpers %}
 
 {% block form_instructions %}
-  <p>Optionally, enter your organization’s current public website, if you have one. For example,
+  <p>Enter your organization’s current public website, if you have one. For example,
   www.city.com. We can better evaluate your domain request if we know about domains 
-you’re already using. If you already have any .gov domains please include them.</p>
+you’re already using. If you already have any .gov domains please include them. This question is optional.</p>
 {% endblock %}
 
 {% block form_required_fields_help_text %}

From f21ca59e0466ce6dbb750fa9a272374c379f6422 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 29 Nov 2023 20:14:52 -0800
Subject: [PATCH 81/85] trying another way

---
 src/registrar/templates/application_form.html   | 5 ++++-
 src/registrar/templates/django/forms/label.html | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/application_form.html b/src/registrar/templates/application_form.html
index 6830033b5..53f8d7a52 100644
--- a/src/registrar/templates/application_form.html
+++ b/src/registrar/templates/application_form.html
@@ -49,7 +49,10 @@
 {% endblock %}
 
 {% block form_required_fields_help_text %}
-  {% include "includes/required_fields.html" %}
+<!-- The "No other employees from your organization?" page is a one-field form and should not have the required fields sentence -->
+  {% if field.label != "Please explain why there are no other employees from your organization we can contact to help us assess your eligibility for a .gov domain." %}
+    {% include "includes/required_fields.html" %}
+  {% endif %}
 {% endblock %}
 
         <form id="step__{{steps.current}}" class="usa-form usa-form--large" method="post" novalidate>
diff --git a/src/registrar/templates/django/forms/label.html b/src/registrar/templates/django/forms/label.html
index 033296ab1..18d24a7bd 100644
--- a/src/registrar/templates/django/forms/label.html
+++ b/src/registrar/templates/django/forms/label.html
@@ -10,7 +10,7 @@
 
   {% if widget.attrs.required %}
   <!--Don't add asterisk to one-field forms -->
-    {% if field.label == "Is your organization an election office?" or field.label == "What .gov domain do you want?" or field.label == "I read and agree to the requirements for operating .gov domains." or field.label == "Please explain why there are no other employees from your organization" %}
+    {% if field.label == "Is your organization an election office?" or field.label == "What .gov domain do you want?" or field.label == "I read and agree to the requirements for operating .gov domains." or field.label == "Please explain why there are no other employees from your organization we can contact to help us assess your eligibility for a .gov domain." %}
     {% else %}
       <abbr class="usa-hint usa-hint--required" title="required">*</abbr>
     {% endif %}

From 6b4c6e9f376522ad1b06ce52550a8b55d69b225f Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Wed, 29 Nov 2023 20:30:15 -0800
Subject: [PATCH 82/85] trying another way of getting rid of required sentence
 for no other contacts page

---
 src/registrar/templates/application_form.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/registrar/templates/application_form.html b/src/registrar/templates/application_form.html
index 53f8d7a52..744f4e5f2 100644
--- a/src/registrar/templates/application_form.html
+++ b/src/registrar/templates/application_form.html
@@ -48,12 +48,12 @@
 {% block form_instructions %}
 {% endblock %}
 
-{% block form_required_fields_help_text %}
 <!-- The "No other employees from your organization?" page is a one-field form and should not have the required fields sentence -->
-  {% if field.label != "Please explain why there are no other employees from your organization we can contact to help us assess your eligibility for a .gov domain." %}
+{% if steps.current != "no_other_contacts" %}
+  {% block form_required_fields_help_text %}
     {% include "includes/required_fields.html" %}
-  {% endif %}
-{% endblock %}
+  {% endblock %}
+{% endif %}
 
         <form id="step__{{steps.current}}" class="usa-form usa-form--large" method="post" novalidate>
           {% csrf_token %}

From 9ced76a27a399db88ec3cc7fbb4d4c4bd72e4254 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 5 Dec 2023 11:28:21 -0800
Subject: [PATCH 83/85] renaming migration files to avoid issues

---
 ...ondomain_status.py => 0051_alter_transitiondomain_status.py} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/registrar/migrations/{0048_alter_transitiondomain_status.py => 0051_alter_transitiondomain_status.py} (87%)

diff --git a/src/registrar/migrations/0048_alter_transitiondomain_status.py b/src/registrar/migrations/0051_alter_transitiondomain_status.py
similarity index 87%
rename from src/registrar/migrations/0048_alter_transitiondomain_status.py
rename to src/registrar/migrations/0051_alter_transitiondomain_status.py
index d67c91e4b..73386bada 100644
--- a/src/registrar/migrations/0048_alter_transitiondomain_status.py
+++ b/src/registrar/migrations/0051_alter_transitiondomain_status.py
@@ -5,7 +5,7 @@ from django.db import migrations, models
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("registrar", "0047_transitiondomain_address_line_transitiondomain_city_and_more"),
+        ("registrar", "0050_alter_domainapplication_anything_else_and_more"),
     ]
 
     operations = [

From f3916a28376c7c2cf15934498d348668216a6207 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 5 Dec 2023 13:14:37 -0700
Subject: [PATCH 84/85] Remove if

---
 .github/workflows/deploy-development.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/deploy-development.yaml b/.github/workflows/deploy-development.yaml
index 13aeb3993..562b2b11f 100644
--- a/.github/workflows/deploy-development.yaml
+++ b/.github/workflows/deploy-development.yaml
@@ -15,7 +15,6 @@ on:
 
 jobs:
   deploy-development:
-    if: ${{ github.ref_type == 'tag' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

From f2afd293179e2682ef74939b8a1fd121447f0d13 Mon Sep 17 00:00:00 2001
From: Kristina Yin <kristina.yin@cisa.dhs.gov>
Date: Tue, 5 Dec 2023 13:27:43 -0800
Subject: [PATCH 85/85] solved migrations issues

---
 ... => 0048_alter_transitiondomain_status.py} |  2 +-
 ...inapplication_current_websites_and_more.py | 36 +++++++++++++++++++
 ...050_alter_contact_middle_name_and_more.py} |  2 +-
 ...omainapplication_urbanization_and_more.py} |  2 +-
 ...mainapplication_anything_else_and_more.py} |  2 +-
 5 files changed, 40 insertions(+), 4 deletions(-)
 rename src/registrar/migrations/{0051_alter_transitiondomain_status.py => 0048_alter_transitiondomain_status.py} (87%)
 create mode 100644 src/registrar/migrations/0049_alter_domainapplication_current_websites_and_more.py
 rename src/registrar/migrations/{0048_alter_contact_middle_name_and_more.py => 0050_alter_contact_middle_name_and_more.py} (92%)
 rename src/registrar/migrations/{0049_alter_domainapplication_urbanization_and_more.py => 0051_alter_domainapplication_urbanization_and_more.py} (92%)
 rename src/registrar/migrations/{0050_alter_domainapplication_anything_else_and_more.py => 0052_alter_domainapplication_anything_else_and_more.py} (90%)

diff --git a/src/registrar/migrations/0051_alter_transitiondomain_status.py b/src/registrar/migrations/0048_alter_transitiondomain_status.py
similarity index 87%
rename from src/registrar/migrations/0051_alter_transitiondomain_status.py
rename to src/registrar/migrations/0048_alter_transitiondomain_status.py
index 73386bada..d67c91e4b 100644
--- a/src/registrar/migrations/0051_alter_transitiondomain_status.py
+++ b/src/registrar/migrations/0048_alter_transitiondomain_status.py
@@ -5,7 +5,7 @@ from django.db import migrations, models
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("registrar", "0050_alter_domainapplication_anything_else_and_more"),
+        ("registrar", "0047_transitiondomain_address_line_transitiondomain_city_and_more"),
     ]
 
     operations = [
diff --git a/src/registrar/migrations/0049_alter_domainapplication_current_websites_and_more.py b/src/registrar/migrations/0049_alter_domainapplication_current_websites_and_more.py
new file mode 100644
index 000000000..4341bdad6
--- /dev/null
+++ b/src/registrar/migrations/0049_alter_domainapplication_current_websites_and_more.py
@@ -0,0 +1,36 @@
+# Generated by Django 4.2.7 on 2023-12-05 10:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0048_alter_transitiondomain_status"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="domainapplication",
+            name="current_websites",
+            field=models.ManyToManyField(
+                blank=True, related_name="current+", to="registrar.website", verbose_name="websites"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="domainapplication",
+            name="other_contacts",
+            field=models.ManyToManyField(
+                blank=True, related_name="contact_applications", to="registrar.contact", verbose_name="contacts"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="domaininformation",
+            name="other_contacts",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="contact_applications_information",
+                to="registrar.contact",
+                verbose_name="contacts",
+            ),
+        ),
+    ]
diff --git a/src/registrar/migrations/0048_alter_contact_middle_name_and_more.py b/src/registrar/migrations/0050_alter_contact_middle_name_and_more.py
similarity index 92%
rename from src/registrar/migrations/0048_alter_contact_middle_name_and_more.py
rename to src/registrar/migrations/0050_alter_contact_middle_name_and_more.py
index 271264fc7..4009d17d9 100644
--- a/src/registrar/migrations/0048_alter_contact_middle_name_and_more.py
+++ b/src/registrar/migrations/0050_alter_contact_middle_name_and_more.py
@@ -5,7 +5,7 @@ from django.db import migrations, models
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("registrar", "0047_transitiondomain_address_line_transitiondomain_city_and_more"),
+        ("registrar", "0049_alter_domainapplication_current_websites_and_more"),
     ]
 
     operations = [
diff --git a/src/registrar/migrations/0049_alter_domainapplication_urbanization_and_more.py b/src/registrar/migrations/0051_alter_domainapplication_urbanization_and_more.py
similarity index 92%
rename from src/registrar/migrations/0049_alter_domainapplication_urbanization_and_more.py
rename to src/registrar/migrations/0051_alter_domainapplication_urbanization_and_more.py
index 36a32cb25..9b012042d 100644
--- a/src/registrar/migrations/0049_alter_domainapplication_urbanization_and_more.py
+++ b/src/registrar/migrations/0051_alter_domainapplication_urbanization_and_more.py
@@ -5,7 +5,7 @@ from django.db import migrations, models
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("registrar", "0048_alter_contact_middle_name_and_more"),
+        ("registrar", "0050_alter_contact_middle_name_and_more"),
     ]
 
     operations = [
diff --git a/src/registrar/migrations/0050_alter_domainapplication_anything_else_and_more.py b/src/registrar/migrations/0052_alter_domainapplication_anything_else_and_more.py
similarity index 90%
rename from src/registrar/migrations/0050_alter_domainapplication_anything_else_and_more.py
rename to src/registrar/migrations/0052_alter_domainapplication_anything_else_and_more.py
index a84e7e1c4..1d5607aad 100644
--- a/src/registrar/migrations/0050_alter_domainapplication_anything_else_and_more.py
+++ b/src/registrar/migrations/0052_alter_domainapplication_anything_else_and_more.py
@@ -5,7 +5,7 @@ from django.db import migrations, models
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("registrar", "0049_alter_domainapplication_urbanization_and_more"),
+        ("registrar", "0051_alter_domainapplication_urbanization_and_more"),
     ]
 
     operations = [