diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 6b5cbf002..aca246a08 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -454,7 +454,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?", {"fields": ["anything_else"]}), ( "Requirements for operating .gov domains", {"fields": ["is_policy_acknowledged"]}, @@ -600,7 +600,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 03207087f..9a8899e2b 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", @@ -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): @@ -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", @@ -407,7 +407,7 @@ class AlternativeDomainForm(RegistrarForm): alternative_domain = forms.CharField( required=False, - label="Alternative domain", + label="", ) @@ -533,7 +533,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", @@ -562,7 +562,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", @@ -614,8 +614,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(), ) @@ -624,7 +624,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/forms/domain.py b/src/registrar/forms/domain.py index 39bda2f20..ff41b9268 100644 --- a/src/registrar/forms/domain.py +++ b/src/registrar/forms/domain.py @@ -181,6 +181,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)" + # Set custom error messages self.fields["first_name"].error_messages = {"required": "Enter your first name / given name."} self.fields["last_name"].error_messages = {"required": "Enter your last name / family name."} @@ -220,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/migrations/0050_alter_contact_middle_name_and_more.py b/src/registrar/migrations/0050_alter_contact_middle_name_and_more.py new file mode 100644 index 000000000..4009d17d9 --- /dev/null +++ b/src/registrar/migrations/0050_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", "0049_alter_domainapplication_current_websites_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), + ), + ] diff --git a/src/registrar/migrations/0051_alter_domainapplication_urbanization_and_more.py b/src/registrar/migrations/0051_alter_domainapplication_urbanization_and_more.py new file mode 100644 index 000000000..9b012042d --- /dev/null +++ b/src/registrar/migrations/0051_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", "0050_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)", + ), + ), + ] diff --git a/src/registrar/migrations/0052_alter_domainapplication_anything_else_and_more.py b/src/registrar/migrations/0052_alter_domainapplication_anything_else_and_more.py new file mode 100644 index 000000000..1d5607aad --- /dev/null +++ b/src/registrar/migrations/0052_alter_domainapplication_anything_else_and_more.py @@ -0,0 +1,22 @@ +# Generated by Django 4.2.7 on 2023-11-29 19:05 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("registrar", "0051_alter_domainapplication_urbanization_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="domainapplication", + name="anything_else", + 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?", null=True), + ), + ] 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/domain_application.py b/src/registrar/models/domain_application.py index 9ab3908d4..ebaa5f6b9 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, @@ -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( @@ -545,7 +545,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 9f0d654b0..097035f46 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, @@ -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( @@ -191,7 +191,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/models/transition_domain.py b/src/registrar/models/transition_domain.py index 9e6d40cf1..28bdc4fc7 100644 --- a/src/registrar/models/transition_domain.py +++ b/src/registrar/models/transition_domain.py @@ -84,7 +84,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, diff --git a/src/registrar/templates/application_about_your_organization.html b/src/registrar/templates/application_about_your_organization.html index f1b843b7a..0d384b4f5 100644 --- a/src/registrar/templates/application_about_your_organization.html +++ b/src/registrar/templates/application_about_your_organization.html @@ -13,7 +13,7 @@ {% endblock %} {% block form_required_fields_help_text %} -
*This question is required.
+{# commented out so it does not appear on this page #} {% endblock %} {% block form_fields %} diff --git a/src/registrar/templates/application_anything_else.html b/src/registrar/templates/application_anything_else.html index 1c598db9a..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 %} -Is there anything else we should know about your domain request?
+Is there anything else you'd like us to know about your domain request? This question is optional.
{% endblock %} {% block form_required_fields_help_text %} diff --git a/src/registrar/templates/application_current_sites.html b/src/registrar/templates/application_current_sites.html index 627727ae3..67343aee9 100644 --- a/src/registrar/templates/application_current_sites.html +++ b/src/registrar/templates/application_current_sites.html @@ -4,7 +4,7 @@ {% block form_instructions %}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.
+you’re already using. If you already have any .gov domains please include them. This question is optional. {% endblock %} {% block form_required_fields_help_text %} diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html index 0d11203ad..bd3c4a473 100644 --- a/src/registrar/templates/application_dotgov_domain.html +++ b/src/registrar/templates/application_dotgov_domain.html @@ -38,8 +38,7 @@