diff --git a/src/registrar/migrations/0144_domainrequest_eop_stakeholder_email_and_more.py b/src/registrar/migrations/0144_domainrequest_eop_stakeholder_email_and_more.py index b23b6c107..2fcc86aa0 100644 --- a/src/registrar/migrations/0144_domainrequest_eop_stakeholder_email_and_more.py +++ b/src/registrar/migrations/0144_domainrequest_eop_stakeholder_email_and_more.py @@ -13,17 +13,17 @@ class Migration(migrations.Migration): migrations.AddField( model_name="domainrequest", name="eop_stakeholder_email", - field=models.EmailField(blank=True, max_length=254, null=True, verbose_name="EOP Stakeholder Email"), + field=models.EmailField(blank=True, max_length=254, null=True, verbose_name="EOP contact email"), ), migrations.AddField( model_name="domainrequest", name="eop_stakeholder_first_name", - field=models.CharField(blank=True, null=True, verbose_name="EOP Stakeholder First Name"), + field=models.CharField(blank=True, null=True, verbose_name="EOP contact first name"), ), migrations.AddField( model_name="domainrequest", name="eop_stakeholder_last_name", - field=models.CharField(blank=True, null=True, verbose_name="EOP Stakeholder Last Name"), + field=models.CharField(blank=True, null=True, verbose_name="EOP contact last name"), ), migrations.AddField( model_name="domainrequest", diff --git a/src/registrar/migrations/0145_remove_domainrequest_eop_stakeholder_email_and_more.py b/src/registrar/migrations/0145_remove_domainrequest_eop_stakeholder_email_and_more.py index 303ff7698..1b81bb5da 100644 --- a/src/registrar/migrations/0145_remove_domainrequest_eop_stakeholder_email_and_more.py +++ b/src/registrar/migrations/0145_remove_domainrequest_eop_stakeholder_email_and_more.py @@ -17,7 +17,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="domainrequest", name="feb_naming_requirements", - field=models.BooleanField(blank=True, null=True, verbose_name="Meets Naming Requirements"), + field=models.BooleanField(blank=True, null=True, verbose_name="Meets naming requirements"), ), migrations.AlterField( model_name="domainrequest", diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index 11cc53a7f..287712516 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -515,7 +515,7 @@ class DomainRequest(TimeStampedModel): feb_naming_requirements = models.BooleanField( null=True, blank=True, - verbose_name="Meets Naming Requirements", + verbose_name="Meets naming requirements", ) feb_naming_requirements_details = models.TextField( @@ -540,13 +540,13 @@ class DomainRequest(TimeStampedModel): eop_stakeholder_first_name = models.CharField( null=True, blank=True, - verbose_name="EOP Stakeholder First Name", + verbose_name="EOP contact first name", ) eop_stakeholder_last_name = models.CharField( null=True, blank=True, - verbose_name="EOP Stakeholder Last Name", + verbose_name="EOP contact last name", ) # This field is alternately used for generic domain purpose explanations diff --git a/src/registrar/templates/emails/includes/portfolio_domain_request_summary.txt b/src/registrar/templates/emails/includes/portfolio_domain_request_summary.txt index 42d75e4b2..63a32fa11 100644 --- a/src/registrar/templates/emails/includes/portfolio_domain_request_summary.txt +++ b/src/registrar/templates/emails/includes/portfolio_domain_request_summary.txt @@ -9,7 +9,7 @@ Current websites: {% for site in domain_request.current_websites.all %} .gov domain: {{ domain_request.requested_domain.name }} {% if requires_feb_questions %} - Meets Naming Requirements + Meets naming requirements {% if domain_request.feb_naming_requirements %} {{ domain_request.feb_naming_requirements }} {% else %} @@ -41,7 +41,7 @@ No {{ domain_request.purpose }} {% endif %} {% if requires_feb_questions %} -EOP Stakeholder: +EOP contact: {% if domain_request.working_with_eop %} {{ domain_request.eop_contact.first_name }} {{ domain_request.eop_contact.last_name }} {{ domain_request.eop_contact.email }} diff --git a/src/registrar/templates/includes/portfolio_request_review_steps.html b/src/registrar/templates/includes/portfolio_request_review_steps.html index 0855931b3..238fe2c30 100644 --- a/src/registrar/templates/includes/portfolio_request_review_steps.html +++ b/src/registrar/templates/includes/portfolio_request_review_steps.html @@ -54,7 +54,7 @@ {% endif %} {% if requires_feb_questions %} -

Meets Naming Requirements

+

Meets naming requirements

{% if domain_request.feb_naming_requirements is None %}

Incomplete

{% elif domain_request.feb_naming_requirements %} @@ -78,7 +78,7 @@ {% else %}

Incomplete

{% endif %} -

Target Time Frame

+

Target time frame

{% if domain_request.has_timeframe is None %}

Incomplete

{% elif domain_request.has_timeframe %} @@ -86,7 +86,7 @@ {% else %}

No

{% endif %} -

Interagency Initiative

+

Interagency initiative

{% if domain_request.is_interagency_initiative is None %}

Incomplete

{% elif domain_request.is_interagency_initiative %} @@ -102,11 +102,11 @@ {% endif %} {% if step == Step.ADDITIONAL_DETAILS %} - {% with title=form_titles|get_item:step value=domain_request.anything_else|default:"None" %} - {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %} - {% endwith %} {% if requires_feb_questions %} -

EOP Stakeholder

+ {% with title=form_titles|get_item:step %} + {% include "includes/summary_item.html" with title=title value=" " heading_level=heading_level editable=is_editable edit_link=domain_request_url %} + {% endwith %} +

EOP contact

{% if domain_request.working_with_eop is None %}

Incomplete

{% elif domain_request.working_with_eop %} @@ -114,6 +114,16 @@ {% else %}

No

{% endif %} +

Anything else

+ {% if domain_request.anything_else %} +

{{domain_request.anything_else}}

+ {% else %} +

None

+ {% endif %} + {% else %} + {% with title=form_titles|get_item:step value=domain_request.anything_else|default:"None" %} + {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %} + {% endwith %} {% endif %} {% endif %} diff --git a/src/registrar/templates/portfolio_domain_request_additional_details.html b/src/registrar/templates/portfolio_domain_request_additional_details.html index 84bf9ec83..4107e7bc1 100644 --- a/src/registrar/templates/portfolio_domain_request_additional_details.html +++ b/src/registrar/templates/portfolio_domain_request_additional_details.html @@ -6,6 +6,7 @@ {% endblock %} {% block form_fields %} + {% include "includes/required_fields.html" %} {% if requires_feb_questions %}
{{forms.0.management_form}} @@ -13,6 +14,7 @@ {{forms.2.management_form}} {{forms.3.management_form}}

Are you working with someone in the Executive Office of the President (EOP) on this request?

+

Working with the EOP is not required to request a .gov domain.

Select one. *

@@ -21,8 +23,8 @@ {% endwith %}