From 0952c9d216a8a9f356332a879a5f6a85b115964a Mon Sep 17 00:00:00 2001 From: asaki222 Date: Wed, 23 Oct 2024 23:01:27 -0400 Subject: [PATCH 1/5] made text changes --- src/registrar/templates/domain_request_dotgov_domain.html | 7 +------ .../portfolio_domain_request_additional_details.html | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/registrar/templates/domain_request_dotgov_domain.html b/src/registrar/templates/domain_request_dotgov_domain.html index 764154254..1456a61c2 100644 --- a/src/registrar/templates/domain_request_dotgov_domain.html +++ b/src/registrar/templates/domain_request_dotgov_domain.html @@ -6,7 +6,7 @@

@@ -19,11 +19,6 @@

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

- -

Domain examples for your type of organization

-
- {% include "includes/domain_example.html" %} -
{% endblock %} diff --git a/src/registrar/templates/portfolio_domain_request_additional_details.html b/src/registrar/templates/portfolio_domain_request_additional_details.html index 3b004354f..4ea830f0b 100644 --- a/src/registrar/templates/portfolio_domain_request_additional_details.html +++ b/src/registrar/templates/portfolio_domain_request_additional_details.html @@ -9,12 +9,13 @@
+

Required fields are marked with an asterisk (*).

Is there anything else you’d like us to know about your domain request?
-

Provide details below. *

+

Provide details below. *

{% with attr_maxlength=2000 add_label_class="usa-sr-only" %} {% input_with_errors forms.0.anything_else %} {% endwith %} From 337e6e5705c203887a7ef9b04484160d8493d3cc Mon Sep 17 00:00:00 2001 From: asaki222 Date: Thu, 24 Oct 2024 13:39:33 -0400 Subject: [PATCH 2/5] updated with org model flag --- .../templates/domain_request_dotgov_domain.html | 10 ++++++++++ .../portfolio_domain_request_additional_details.html | 11 ++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/registrar/templates/domain_request_dotgov_domain.html b/src/registrar/templates/domain_request_dotgov_domain.html index 1456a61c2..b81a59662 100644 --- a/src/registrar/templates/domain_request_dotgov_domain.html +++ b/src/registrar/templates/domain_request_dotgov_domain.html @@ -6,7 +6,11 @@
  • Be available
  • Relate to your organization’s name, location, and/or services
    • + {% if has_organization_feature_flag %}
  • Be clear to the general public. Your domain name must not be easily confused with other organizations.
    • + {% else %} +
  • Be unlikely to mislead or confuse the general public (even if your domain is only intended for a specific audience)
    • + {% end %}

@@ -19,6 +23,12 @@

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

+ {% if not has_organization_feature_flag%} +

Domain examples for your type of organization

+
+ {% include "includes/domain_example.html" %} +
+ {% endif %} {% endblock %} diff --git a/src/registrar/templates/portfolio_domain_request_additional_details.html b/src/registrar/templates/portfolio_domain_request_additional_details.html index 4ea830f0b..f04fedef2 100644 --- a/src/registrar/templates/portfolio_domain_request_additional_details.html +++ b/src/registrar/templates/portfolio_domain_request_additional_details.html @@ -7,15 +7,20 @@ {% block form_fields %} -
- -

Required fields are marked with an asterisk (*).

+
+ {% if has_organization_feature_flag %} +

Required fields are marked with an asterisk (*).

+ {% endif %}

Is there anything else you’d like us to know about your domain request?

+ {% if has_organization_feature_flag %}

Provide details below. *

+ {% else %} +

Provide details below. *

+ {% end %} {% with attr_maxlength=2000 add_label_class="usa-sr-only" %} {% input_with_errors forms.0.anything_else %} {% endwith %} From dc666e4699c68e628e12083c3cd941098f304ca3 Mon Sep 17 00:00:00 2001 From: asaki222 Date: Thu, 24 Oct 2024 14:34:44 -0400 Subject: [PATCH 3/5] fixed issues --- src/registrar/templates/domain_request_dotgov_domain.html | 2 +- .../portfolio_domain_request_additional_details.html | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/registrar/templates/domain_request_dotgov_domain.html b/src/registrar/templates/domain_request_dotgov_domain.html index b81a59662..9765edb11 100644 --- a/src/registrar/templates/domain_request_dotgov_domain.html +++ b/src/registrar/templates/domain_request_dotgov_domain.html @@ -10,7 +10,7 @@
  • Be clear to the general public. Your domain name must not be easily confused with other organizations.
    • {% else %}
  • Be unlikely to mislead or confuse the general public (even if your domain is only intended for a specific audience)
    • - {% end %} + {% endif %}

    diff --git a/src/registrar/templates/portfolio_domain_request_additional_details.html b/src/registrar/templates/portfolio_domain_request_additional_details.html index f04fedef2..49097fbe9 100644 --- a/src/registrar/templates/portfolio_domain_request_additional_details.html +++ b/src/registrar/templates/portfolio_domain_request_additional_details.html @@ -16,11 +16,7 @@
    - {% if has_organization_feature_flag %}

    Provide details below. *

    - {% else %} -

    Provide details below. *

    - {% end %} {% with attr_maxlength=2000 add_label_class="usa-sr-only" %} {% input_with_errors forms.0.anything_else %} {% endwith %} From 5c9f0bdc23b3f318679117330a591e9dd1e91fb4 Mon Sep 17 00:00:00 2001 From: asaki222 Date: Thu, 24 Oct 2024 14:47:37 -0400 Subject: [PATCH 4/5] fixed issues --- .../portfolio_domain_request_additional_details.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/registrar/templates/portfolio_domain_request_additional_details.html b/src/registrar/templates/portfolio_domain_request_additional_details.html index 49097fbe9..3c5b50d6b 100644 --- a/src/registrar/templates/portfolio_domain_request_additional_details.html +++ b/src/registrar/templates/portfolio_domain_request_additional_details.html @@ -7,10 +7,7 @@ {% block form_fields %} -
    - {% if has_organization_feature_flag %} -

    Required fields are marked with an asterisk (*).

    - {% endif %} +

    Is there anything else you’d like us to know about your domain request?

    From 8a24194a545a38e6c9d232a3dd0920bd4cd1e684 Mon Sep 17 00:00:00 2001 From: asaki222 Date: Mon, 28 Oct 2024 11:13:37 -0400 Subject: [PATCH 5/5] adjusted to portfolio check instead of organization feature flag --- src/registrar/templates/domain_request_dotgov_domain.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/domain_request_dotgov_domain.html b/src/registrar/templates/domain_request_dotgov_domain.html index 9765edb11..18e04f305 100644 --- a/src/registrar/templates/domain_request_dotgov_domain.html +++ b/src/registrar/templates/domain_request_dotgov_domain.html @@ -6,7 +6,7 @@
    • Be available
    • Relate to your organization’s name, location, and/or services
      • - {% if has_organization_feature_flag %} + {% if portfolio %}
    • Be clear to the general public. Your domain name must not be easily confused with other organizations.
      • {% else %}
    • Be unlikely to mislead or confuse the general public (even if your domain is only intended for a specific audience)
      • @@ -23,7 +23,7 @@

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

      - {% if not has_organization_feature_flag%} + {% if not portfolio %}

      Domain examples for your type of organization

      {% include "includes/domain_example.html" %}