diff --git a/src/registrar/templates/application_authorizing_official.html b/src/registrar/templates/application_authorizing_official.html index 79badd433..b7fde0fb9 100644 --- a/src/registrar/templates/application_authorizing_official.html +++ b/src/registrar/templates/application_authorizing_official.html @@ -12,29 +12,7 @@
We’ll contact your authorizing official to let them know that you made this request and to double check that they approve it.
diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html index 607bee459..0c80a8692 100644 --- a/src/registrar/templates/application_dotgov_domain.html +++ b/src/registrar/templates/application_dotgov_domain.html @@ -17,8 +17,8 @@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.
-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.
+ + {% 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. +
+ + {% elif federal_type == 'legislative' %} +Domain requests from the U.S. Senate must come from the Senate Sergeant at Arms.
+ +Domain requests from the U.S. House of Representatives must come from the House Chief Administrative Officer. + +
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. +
+ + {% endif %} + +{% elif organization_type == 'city' %} +Domain requests from cities must be authorized by the mayor or the equivalent highest elected official.
+ +{% elif organization_type == 'county' %} +Domain requests from counties must be authorized by the chair of the county commission or the equivalent highest elected official.
+ +{% 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.
+ +{% elif organization_type == 'school_district' %} +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.
+ +{% elif organization_type == 'state_or_territory' %} +Domain requests from states and territories must be authorized by the governor or the state Chief Information Officer.
+Domain requests from state legislatures and courts must be authorized by an agency’s Chief Information Officer or highest-ranking executive.
+ +{% elif organization_type == 'tribal' %} +Domain requests from federally-recognized tribal governments must be authorized by the leader of the tribe, as recognized by the as noted by the Bureau of Indian Affairs.
+ +{% endif %} diff --git a/src/registrar/templates/includes/ao_example__city.html b/src/registrar/templates/includes/ao_example__city.html deleted file mode 100644 index 6da683e23..000000000 --- a/src/registrar/templates/includes/ao_example__city.html +++ /dev/null @@ -1 +0,0 @@ -Domain requests from cities must be authorized by the mayor or the equivalent highest elected official.
diff --git a/src/registrar/templates/includes/ao_example__county.html b/src/registrar/templates/includes/ao_example__county.html deleted file mode 100644 index 8f37a3419..000000000 --- a/src/registrar/templates/includes/ao_example__county.html +++ /dev/null @@ -1,2 +0,0 @@ -Domain requests from counties must be authorized by the chair of the county commission or the equivalent highest elected official.
- diff --git a/src/registrar/templates/includes/ao_example__exec.html b/src/registrar/templates/includes/ao_example__exec.html deleted file mode 100644 index 8be0843c8..000000000 --- a/src/registrar/templates/includes/ao_example__exec.html +++ /dev/null @@ -1,3 +0,0 @@ -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.
- diff --git a/src/registrar/templates/includes/ao_example__interstate.html b/src/registrar/templates/includes/ao_example__interstate.html deleted file mode 100644 index f3c05e62a..000000000 --- a/src/registrar/templates/includes/ao_example__interstate.html +++ /dev/null @@ -1,2 +0,0 @@ -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.
- diff --git a/src/registrar/templates/includes/ao_example__judicial.html b/src/registrar/templates/includes/ao_example__judicial.html deleted file mode 100644 index 773f13cb6..000000000 --- a/src/registrar/templates/includes/ao_example__judicial.html +++ /dev/null @@ -1,4 +0,0 @@ -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. -
- diff --git a/src/registrar/templates/includes/ao_example__legislative.html b/src/registrar/templates/includes/ao_example__legislative.html deleted file mode 100644 index f0398c101..000000000 --- a/src/registrar/templates/includes/ao_example__legislative.html +++ /dev/null @@ -1,10 +0,0 @@ -Domain requests from the U.S. Senate must come from the Senate Sergeant at Arms.
- -Domain requests from the U.S. House of Representatives must come from the House Chief Administrative Officer. - -
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. -
diff --git a/src/registrar/templates/includes/ao_example__school-district.html b/src/registrar/templates/includes/ao_example__school-district.html deleted file mode 100644 index 142e433af..000000000 --- a/src/registrar/templates/includes/ao_example__school-district.html +++ /dev/null @@ -1,3 +0,0 @@ -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). -
- diff --git a/src/registrar/templates/includes/ao_example__special-district.html b/src/registrar/templates/includes/ao_example__special-district.html deleted file mode 100644 index eb4b48d9c..000000000 --- a/src/registrar/templates/includes/ao_example__special-district.html +++ /dev/null @@ -1,2 +0,0 @@ -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.
- diff --git a/src/registrar/templates/includes/ao_example__state-territory.html b/src/registrar/templates/includes/ao_example__state-territory.html deleted file mode 100644 index f08a59f5f..000000000 --- a/src/registrar/templates/includes/ao_example__state-territory.html +++ /dev/null @@ -1,4 +0,0 @@ -Domain requests from states and territories must be authorized by the governor or the state Chief Information Officer.
-Domain requests from state legislatures and courts must be authorized by an agency’s Chief Information Officer or highest-ranking executive.
diff --git a/src/registrar/templates/includes/ao_example__tribal.html b/src/registrar/templates/includes/ao_example__tribal.html deleted file mode 100644 index 8184d4822..000000000 --- a/src/registrar/templates/includes/ao_example__tribal.html +++ /dev/null @@ -1,2 +0,0 @@ -Domain requests from federally-recognized tribal governments must be authorized by tribal chiefs as noted by the Bureau of Indian Affairs.
- diff --git a/src/registrar/templates/includes/domain_example.html b/src/registrar/templates/includes/domain_example.html new file mode 100644 index 000000000..ed9ee7504 --- /dev/null +++ b/src/registrar/templates/includes/domain_example.html @@ -0,0 +1,94 @@ +{% if is_federal %} + {% if federal_type == 'executive' %} +Examples:
+Examples:
++
Examples:
+Examples:
+State .gov domains must include the two-letter state abbreviation or clearly spell out the state name.
+Examples:
+Tribal domains may include the suffix -nsn, for native sovereign nation.
+Examples:
+Most county .gov domains must include the two-letter state abbreviation or the full state name. County names that aren’t shared by any other city, county, parish, town, borough, village or equivalent in the U.S., at the time a domain is granted, can be requested without referring to the state. Counties can include “county” in their domain to distinguish it from other places with similar names. We use the Census Bureau’s National Places Gazetteer Files to determine if county names are unique.
+Examples:
+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. +
Domain names must represent your organization or institutional name, not solely the services you provide. It also needs to include your two-letter state abbreviation or clearly spell out the state name.
+Examples:
+Domain names must represent your organization or institutional name.
+Example: mckinneyISDTX.gov
+ + +{%endif %} + diff --git a/src/registrar/templates/includes/domain_example__city.html b/src/registrar/templates/includes/domain_example__city.html deleted file mode 100644 index 438ea005d..000000000 --- a/src/registrar/templates/includes/domain_example__city.html +++ /dev/null @@ -1,15 +0,0 @@ -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. -