From 275dbc776800cf4c5e91366a5e7e28ee9dbd6859 Mon Sep 17 00:00:00 2001 From: igorkorenfeld Date: Wed, 9 Nov 2022 18:30:06 -0500 Subject: [PATCH] Remove colon from field lables, update content --- src/registrar/forms/application_wizard.py | 30 ++++++++------- .../application_authorizing_official.html | 12 +++++- .../templates/application_dotgov_domain.html | 38 ++++++++++--------- .../templates/application_org_contact.html | 10 +++-- .../templates/application_other_contacts.html | 1 + .../templates/application_purpose.html | 4 +- 6 files changed, 57 insertions(+), 38 deletions(-) diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py index a9a14ea35..beb8df05b 100644 --- a/src/registrar/forms/application_wizard.py +++ b/src/registrar/forms/application_wizard.py @@ -11,8 +11,12 @@ from formtools.wizard.views import NamedUrlSessionWizardView # type: ignore logger = logging.getLogger(__name__) +class RegistrarForm(forms.Form): + def __init__(self, *args, **kwargs): + kwargs.setdefault('label_suffix', '') + super(RegistrarForm, self).__init__(*args, **kwargs) -class OrganizationForm(forms.Form): +class OrganizationForm(RegistrarForm): organization_type = forms.ChoiceField( required=True, choices=[ @@ -61,7 +65,7 @@ class OrganizationForm(forms.Form): ) -class OrgContactForm(forms.Form): +class OrgContactForm(RegistrarForm): organization_name = forms.CharField(label="Organization Name") address_line1 = forms.CharField(label="Address line 1") address_line2 = forms.CharField( @@ -74,7 +78,7 @@ class OrgContactForm(forms.Form): ) zipcode = forms.CharField(label="ZIP code") -class AuthorizingOfficialForm(forms.Form): +class AuthorizingOfficialForm(RegistrarForm): given_name = forms.CharField(label="First name/given name") middle_name = forms.CharField( required=False, @@ -85,22 +89,22 @@ class AuthorizingOfficialForm(forms.Form): email = forms.EmailField(label="Email") phone = forms.CharField(label="Phone") -class CurrentSitesForm(forms.Form): +class CurrentSitesForm(RegistrarForm): current_site = forms.CharField( required=False, label="Enter your organization’s public website, if you have one. For example, www.city.com.") -class DotGovDomainForm(forms.Form): +class DotGovDomainForm(RegistrarForm): dotgov_domain = forms.CharField(label="What .gov domain do you want?") alternative_domain = forms.CharField( required = False, label="Are there other domains you’d like if we can’t give you your first choice? Entering alternative domains is optional.", ) -class PurposeForm(forms.Form): +class PurposeForm(RegistrarForm): purpose_field = forms.CharField(label="Purpose", widget=forms.Textarea()) -class YourContactForm(forms.Form): +class YourContactForm(RegistrarForm): given_name = forms.CharField(label="First name/given name") middle_name = forms.CharField( required=False, @@ -111,7 +115,7 @@ class YourContactForm(forms.Form): email = forms.EmailField(label="Email") phone = forms.CharField(label="Phone") -class OtherContactsForm(forms.Form): +class OtherContactsForm(RegistrarForm): given_name = forms.CharField(label="First name/given name") middle_name = forms.CharField( required=False, @@ -122,23 +126,23 @@ class OtherContactsForm(forms.Form): email = forms.EmailField(label="Email") phone = forms.CharField(label="Phone") -class SecurityEmailForm(forms.Form): +class SecurityEmailForm(RegistrarForm): email = forms.EmailField( required=False, - label="Email", + label="Security email", ) -class AnythingElseForm(forms.Form): +class AnythingElseForm(RegistrarForm): anything_else = forms.CharField( required=False, label="Anything else we should know", widget=forms.Textarea() ) -class RequirementsForm(forms.Form): +class RequirementsForm(RegistrarForm): agree_check = forms.BooleanField(label="I read and agree to the .gov domain requirements.") -class ReviewForm(forms.Form): +class ReviewForm(RegistrarForm): pass # List of forms in our wizard. Each entry is a tuple of a name and a form diff --git a/src/registrar/templates/application_authorizing_official.html b/src/registrar/templates/application_authorizing_official.html index 5361b91d5..9442711d9 100644 --- a/src/registrar/templates/application_authorizing_official.html +++ b/src/registrar/templates/application_authorizing_official.html @@ -7,8 +7,16 @@

Who is the authorizing official for your organization

-

Your authorizing official is the person within your organization who can authorize your domain request. This is generally the highest ranking or highest elected official in your organization. Read more about who can serve as an authorizing official. -

+
+

Your authorizing official is the person within your organization who can authorize your domain request. This is generally the highest ranking or highest elected official in your organization. Read more about who can serve as an authorizing official. +

+ +
+

Domain requests from cities must be authorized by the mayor or the equivalent highest elected official.

+
+ +

We’ll contact your authorizing official to let them know that you made this request and to double check that they approve it.

+

All fields are required unless they are marked optional.

diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html index 306a2ec0e..368183d7b 100644 --- a/src/registrar/templates/application_dotgov_domain.html +++ b/src/registrar/templates/application_dotgov_domain.html @@ -12,27 +12,28 @@

-

Note that only federal agencies can request generic terms like vote.gov.

+

Note that only federal agencies can request generic terms like vote.gov.

We’ll try to give you the domain you want. We first need to make sure your request meets our requirements. We’ll work with you to find the best domain for your organization.

Here are a few domain examples for your type of organization.

- -

Most city domains must include the two-letter state abbreviation or clearly spell out the state name. Using phrases like “City of” or “Town of” is optional.

-

Examples: -

-

-

Some cities don’t have to refer to their state. -

-

+
+

Most city domains must include the two-letter state abbreviation or clearly spell out the state name. Using phrases like “City of” or “Town of” is optional.

+

Examples: +

+

+

Some cities don’t have to refer to their state. +

+

+

What .gov domain do you want?

@@ -46,6 +47,7 @@ {{ wizard.form.dotgov_domain|add_class:"usa-input"|attr:"aria-describedby:domain_instructions" }} .gov +

Alternative domains

@@ -64,6 +66,8 @@ +

If you’re not sure this is the domain you want, that’s okay. You can change it later.

+ {{ block.super }}
diff --git a/src/registrar/templates/application_org_contact.html b/src/registrar/templates/application_org_contact.html index eeb4943dd..2c866e662 100644 --- a/src/registrar/templates/application_org_contact.html +++ b/src/registrar/templates/application_org_contact.html @@ -6,10 +6,14 @@

What is the name and mailing address of your organization?

-

Enter the name of the organization your represent. Your organization might be part -of a larger entity. If so, enter information about your part of the larger entity.

+
+

Enter the name of the organization your represent. Your organization might be part + of a larger entity. If so, enter information about your part of the larger entity.

-

All fields are required unless they are marked optional.

+

Once your domain is approved, the name of your organization will be publicly listed as the domain registrant.

+ +

All fields are required unless they are marked optional.

+
{{ wizard.management_form }} diff --git a/src/registrar/templates/application_other_contacts.html b/src/registrar/templates/application_other_contacts.html index 5882710e5..352650655 100644 --- a/src/registrar/templates/application_other_contacts.html +++ b/src/registrar/templates/application_other_contacts.html @@ -12,6 +12,7 @@ {{ wizard.management_form }} {% csrf_token %} +

Contact 2

{{ wizard.form.given_name|add_label_class:"usa-label" }} {{ wizard.form.given_name|add_class:"usa-input"|attr:"aria-describedby:instructions" }} diff --git a/src/registrar/templates/application_purpose.html b/src/registrar/templates/application_purpose.html index 6b98d06f5..5d3a84b22 100644 --- a/src/registrar/templates/application_purpose.html +++ b/src/registrar/templates/application_purpose.html @@ -4,9 +4,7 @@ {% block form_content %} -

Explain how you plan to use this domain. Will you use it for a website and/or email? Are you moving your website from another top-level domain (like .com or .org)?Read about activities that are prohibited on .gov domains.

- -

All fields are required unless they are marked optional.

+

Describe your organization’s mission or the reason for your domain request. Explain how you plan to use this domain. Will you use it for a website and/or email? Are you moving your website from another top-level domain (like .com or .org)? Read about activities that are prohibited on .gov domains.