From 26530f68bb59a6ff2d6159a64bd25384f5f0f115 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Tue, 12 Dec 2023 15:07:40 -0800 Subject: [PATCH 1/6] updated all AO examples --- .../templates/includes/ao_example.html | 56 +++++++++++-------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/src/registrar/templates/includes/ao_example.html b/src/registrar/templates/includes/ao_example.html index dfdbb3775..e0821fd39 100644 --- a/src/registrar/templates/includes/ao_example.html +++ b/src/registrar/templates/includes/ao_example.html @@ -1,50 +1,60 @@ {% if is_federal %} {% if federal_type == 'executive' %} -

Domain requests from executive branch agencies must be authorized by Chief Information Officers or agency heads.

-

Domain requests from executive branch agencies are subject to guidance issued by the U.S. Office of Management and Budget.

+

Executive branch federal agencies

+

Domain requests from executive branch federal agencies must be authorized by the agency's CIO or the head of the agency.

+

See OMB Memorandum M-23-10 for more information.

{% elif federal_type == 'judicial' %} -

Domain requests from the U.S. Supreme Court must be authorized by the director of information technology for the U.S. Supreme Court.

-

Domain requests from other judicial branch agencies must be authorized by the director or Chief Information Officer of the Administrative Office (AO) of the United States Courts. -

+

Judicial branch federal agencies

+

Domain requests for judicial branch federal agencies, except the U.S. Supreme Court, must be authorized by the director or CIO of the Administrative Office (AO) of the United States Courts.

+

Domain requests from the U.S. Supreme Court must be authorized by the director of information technology for the U.S. Supreme Court.

{% elif federal_type == 'legislative' %} -

U.S. Senate

-

Domain requests from the U.S. Senate must come from the Senate Sergeant at Arms.

+

Legislative branch federal agencies

-

U.S. House of Representatives

-

Domain requests from the U.S. House of Representatives must come from the House Chief Administrative Officer. +

U.S. Senate

+

Domain requests from the U.S. Senate must come from the Senate Sergeant at Arms.

-

Other legislative branch agencies

-

Domain requests from legislative branch agencies must come from the agency’s head or Chief Information Officer.

-

Domain requests from legislative commissions must come from the head of the commission, or the head or Chief Information Officer of the parent agency, if there is one. -

+

U.S. House of Representatives

+

Domain requests from the U.S. House of Representatives must come from the House Chief Administrative Officer.

+ +

Other legislative branch agencies

+

Domain requests from legislative branch agencies must come from the agency’s head or CIO.

+

Domain requests from legislative commissions must come from the head of the commission, or the head or CIO of the parent agency, if there is one.

{% endif %} {% elif organization_type == 'city' %} -

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

+

Cities

+

Domain requests from cities must be authorized by someone in a role of significant, executive responsibility within the city (mayor, council president, city manager, township/village supervisor, select board chairperson, chief, senior technology officer, or equivalent).

{% elif organization_type == 'county' %} -

Domain requests from counties must be authorized by the chair of the county commission or the equivalent highest-elected official.

+

Counties

+

Domain requests from counties must be authorized by the commission chair or someone in a role of significant, executive responsibility within the county (county judge, county mayor, parish/borough president, senior technology officer, or equivalent). Other county-level offices (county clerk, sheriff, county auditor, comptroller) may qualify, as well, in some instances.

{% elif organization_type == 'interstate' %} -

Domain requests from interstate organizations must be authorized by the highest-ranking executive (president, director, chair, or equivalent) or one of the state’s governors or Chief Information Officers.

+

Interstate organizations

+

Domain requests from interstate organizations must be authorized by someone in a role of significant, executive responsibility within the organization (president, director, chair, senior technology officer, or equivalent) or one of the state’s governors or CIOs.

{% elif organization_type == 'school_district' %} +

School districts

Domain requests from school district governments must be authorized by the highest-ranking executive (the chair of a school district’s board or a superintendent).

{% elif organization_type == 'special_district' %} -

Domain requests from special districts must be authorized by the highest-ranking executive (president, director, chair, or equivalent) or state Chief Information Officers for state-based organizations.

+

Special districts

+

Domain requests from school district governments must be authorized by someone in a role of significant, executive responsibility within the district (board chair, superintendent, senior technology officer, or equivalent).

{% elif organization_type == 'state_or_territory' %} -

States and territories: executive branch

-

Domain requests from states and territories must be authorized by the governor or the state Chief Information Officer.

-

States and territories: judicial and legislative branches

-

Domain requests from state legislatures and courts must be authorized by an agency’s Chief Information Officer or highest-ranking executive.

+

U.S. states and territories

+ +

States and territories: executive branch

+

Domain requests from states and territories must be authorized by the governor or someone in a role of significant, executive responsibility within the agency (department secretary, senior technology officer, or equivalent).

+ +

States and territories: judicial and legislative branches

+

Domain requests from state legislatures and courts must be authorized by an agency’s CIO or someone in a role of significant, executive responsibility within the agency.

{% elif organization_type == 'tribal' %} -

Domain requests from federally-recognized tribal governments must be authorized by the leader of the tribe, as recognized by the Bureau of Indian Affairs.

-

Domain requests from state-recognized tribal governments must be authorized by the leader of the tribe, as determined by the state’s tribal recognition initiative.

+

Tribal governments

+

Domain requests from federally recognized tribal governments must be authorized by the tribal leader the Bureau of Indian Affairs recognizes.

{% endif %} From a422a7cbdb8e00e0ff796cddb71774666e51b7e2 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Tue, 12 Dec 2023 16:33:05 -0800 Subject: [PATCH 2/6] updated python test since first line of ao_example.html was changed --- src/registrar/tests/test_views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py index 3c98c5fe7..da6fe6205 100644 --- a/src/registrar/tests/test_views.py +++ b/src/registrar/tests/test_views.py @@ -804,7 +804,7 @@ class DomainApplicationTests(TestWithUser, WebTest): # ---- AO CONTACT PAGE ---- self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) ao_page = org_contact_result.follow() - self.assertContains(ao_page, "Domain requests from executive branch agencies") + self.assertContains(ao_page, "Executive branch federal agencies") # Go back to organization type page and change type self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) From 2c5d6c8488ef4da4789784e1e9083bd29dc652a5 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Tue, 12 Dec 2023 17:34:09 -0800 Subject: [PATCH 3/6] accidently mixing up special district and school district descriptions --- src/registrar/templates/includes/ao_example.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/includes/ao_example.html b/src/registrar/templates/includes/ao_example.html index e0821fd39..976deb34d 100644 --- a/src/registrar/templates/includes/ao_example.html +++ b/src/registrar/templates/includes/ao_example.html @@ -38,11 +38,12 @@ {% elif organization_type == 'school_district' %}

School districts

-

Domain requests from school district governments must be authorized by the highest-ranking executive (the chair of a school district’s board or a superintendent).

+

Domain requests from school district governments must be authorized by someone in a role of significant, executive responsibility within the district (board chair, superintendent, senior technology officer, or equivalent).

{% elif organization_type == 'special_district' %}

Special districts

-

Domain requests from school district governments must be authorized by someone in a role of significant, executive responsibility within the district (board chair, superintendent, senior technology officer, or equivalent).

+

Domain requests from special districts must be authorized by someone in a role of significant, executive responsibility within the district (CEO, chair, executive director, senior technology officer, or equivalent). +

{% elif organization_type == 'state_or_territory' %}

U.S. states and territories

From 2497b00fa3b40369e910c400c11d457b877a9f27 Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Tue, 12 Dec 2023 19:58:23 -0800 Subject: [PATCH 4/6] missed part of Tribal AO ex description --- src/registrar/templates/includes/ao_example.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/registrar/templates/includes/ao_example.html b/src/registrar/templates/includes/ao_example.html index 976deb34d..38bbe20ff 100644 --- a/src/registrar/templates/includes/ao_example.html +++ b/src/registrar/templates/includes/ao_example.html @@ -57,5 +57,6 @@ {% elif organization_type == 'tribal' %}

Tribal governments

Domain requests from federally recognized tribal governments must be authorized by the tribal leader the Bureau of Indian Affairs recognizes.

+

Domain requests from state-recognized tribal governments must be authorized by the tribal leader the individual state recognizes.

{% endif %} From e70324443183807bd75f42cd62843468824a5c2c Mon Sep 17 00:00:00 2001 From: Michelle Rago <60157596+michelle-rago@users.noreply.github.com> Date: Wed, 13 Dec 2023 09:26:37 -0500 Subject: [PATCH 5/6] Hyphenated "federally-recognized" --- src/registrar/templates/includes/ao_example.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/includes/ao_example.html b/src/registrar/templates/includes/ao_example.html index 38bbe20ff..be5f4624d 100644 --- a/src/registrar/templates/includes/ao_example.html +++ b/src/registrar/templates/includes/ao_example.html @@ -56,7 +56,7 @@ {% elif organization_type == 'tribal' %}

Tribal governments

-

Domain requests from federally recognized tribal governments must be authorized by the tribal leader the Bureau of Indian Affairs recognizes.

+

Domain requests from federally-recognized tribal governments must be authorized by the tribal leader the Bureau of Indian Affairs recognizes.

Domain requests from state-recognized tribal governments must be authorized by the tribal leader the individual state recognizes.

{% endif %} From d2242c7667720ce5108d88c3536ecde11dd2e66d Mon Sep 17 00:00:00 2001 From: Kristina Yin Date: Wed, 13 Dec 2023 10:04:05 -0800 Subject: [PATCH 6/6] made sure external link icon shows up --- src/registrar/templates/includes/ao_example.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/includes/ao_example.html b/src/registrar/templates/includes/ao_example.html index be5f4624d..85df174aa 100644 --- a/src/registrar/templates/includes/ao_example.html +++ b/src/registrar/templates/includes/ao_example.html @@ -2,7 +2,7 @@ {% if federal_type == 'executive' %}

Executive branch federal agencies

Domain requests from executive branch federal agencies must be authorized by the agency's CIO or the head of the agency.

-

See OMB Memorandum M-23-10 for more information.

+

See OMB Memorandum M-23-10 for more information.

{% elif federal_type == 'judicial' %}

Judicial branch federal agencies

@@ -56,7 +56,7 @@ {% elif organization_type == 'tribal' %}

Tribal governments

-

Domain requests from federally-recognized tribal governments must be authorized by the tribal leader the Bureau of Indian Affairs recognizes.

+

Domain requests from federally-recognized tribal governments must be authorized by the tribal leader the Bureau of Indian Affairs recognizes.

Domain requests from state-recognized tribal governments must be authorized by the tribal leader the individual state recognizes.

{% endif %}