Sync branch with main

src/docker-compose.yml

@@ -25,6 +25,8 @@ services:
       - DJANGO_SECRET_KEY=really-long-random-string-BNPecI7+s8jMahQcGHZ3XQ5yUfRrSibdapVLIz0UemdktVPofDKcoy
       # Run Django in debug mode on local
       - DJANGO_DEBUG=True
+      # Run Django without production flags
+      - IS_PRODUCTION=False
       # Tell Django where it is being hosted
       - DJANGO_BASE_URL=http://localhost:8080
       # Public site URL link

src/registrar/assets/sass/_theme/_buttons.scss

@@ -26,6 +26,24 @@ a.usa-button {
   text-decoration: none;
 }
 
+a.usa-button.disabled-link {
+  background-color: #ccc !important;
+  color: #454545 !important
+}
+
+a.usa-button.disabled-link:hover {
+  background-color: #ccc !important;
+  cursor: not-allowed !important;
+  color: #454545 !important
+}
+
+a.usa-button.disabled-link:focus {
+  background-color: #ccc !important;
+  cursor: not-allowed !important;
+  outline: none !important;
+  color: #454545 !important
+}
+
 a.usa-button:not(.usa-button--unstyled, .usa-button--outline) {
   color: color('white');
 }

src/registrar/assets/sass/_theme/_uswds-theme.scss

@@ -132,4 +132,10 @@ in the form $setting: value,
   $theme-table-sorted-background-color: "accent-cool-lightest",
   $theme-table-sorted-icon-color: "primary-darker",
   $theme-table-unsorted-icon-color: "primary",
+
+  /*----------------------------
+  # Tooltip Settings
+  -----------------------------*/
+  $theme-tooltip-background-color: "accent-cool-lightest",
+  $theme-tooltip-font-color: "black"
 );

src/registrar/config/settings.py

@@ -46,6 +46,7 @@ path = Path(__file__)
 
 env_db_url = env.dj_db_url("DATABASE_URL")
 env_debug = env.bool("DJANGO_DEBUG", default=False)
+env_is_production = env.bool("IS_PRODUCTION", default=False)
 env_log_level = env.str("DJANGO_LOG_LEVEL", "DEBUG")
 env_base_url = env.str("DJANGO_BASE_URL")
 env_getgov_public_site_url = env.str("GETGOV_PUBLIC_SITE_URL", "")
@@ -73,6 +74,8 @@ BASE_DIR = path.resolve().parent.parent.parent
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = env_debug
 
+# Controls production specific feature toggles
+IS_PRODUCTION = env_is_production
 
 # Applications are modular pieces of code.
 # They are provided by Django, by third-parties, or by yourself.
@@ -300,7 +303,7 @@ CSP_FORM_ACTION = allowed_sources
 # Sets clients that allow access control to manage.get.gov
 # TODO: remove :8080 to see if we can have all localhost access
 CORS_ALLOWED_ORIGINS = ["http://localhost:8080", "https://beta.get.gov"]
-
+CORS_ALLOWED_ORIGIN_REGEXES = [r"https://[\w-]+\.sites\.pages\.cloud\.gov"]
 
 # Content-Length header is set by django.middleware.common.CommonMiddleware
 

src/registrar/management/commands/generate_test_transition_domains.py

@@ -15,7 +15,7 @@ class Command(BaseCommand):
     # Running this script removes all existing transition domains, so use with caution.
     # Transition domains are created with email addresses provided as command line
     # argument. Email addresses for testing are passed as comma delimited list of
-    # email addresses, and are required to be provided.  Email addresses from the list
+    # email addresses, and are required to be provided. Email addresses from the list
     # are assigned to transition domains at time of creation.
 
     def add_arguments(self, parser):

src/registrar/templates/emails/transition_domain_invitation.txt

@@ -1,20 +1,41 @@
 {% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
-Hi.
+Hello from .gov.
 
-You have been added as a manager on {% if domains|length > 1 %}multiple domains (listed below){% else %}{{ domains.0 }}{% endif %}.
+Our new domain management system—the .gov registrar—is now available. The organization, contacts, and DNS information for your .gov domain{% if domains|length > 1 %}s{% endif %} have been transferred to our new registrar. 
+
+Your .gov domain{% if domains|length > 1 %}s{% endif %}:
+{% for domain in domains %} - {{ domain }}
+{% endfor %}
+If you’re not affiliated with the above domain{% if domains|length > 1 %}s{% endif %} or think you received this message in error, let us know in a reply to this email. 
+
+
+CREATE A LOGIN.GOV ACCOUNT
+
+You can’t use your old credentials to access the new registrar. Access is now managed through Login.gov, a simple and secure process for signing into many government services with one account. Follow these steps to create your Login.gov account <https://login.gov/help/get-started/create-your-account/>. 
+
+When creating an account, you’ll need to provide the same email address you used to log in to the old registrar. That will ensure your domains are linked to your Login.gov account. 
+
+If you need help finding the email address you used in the past, let us know in a reply to this email.
+
+CHECK YOUR .GOV DOMAIN CONTACTS
+
+This is a good time to check who has access to your .gov domain{% if domains|length > 1 %}s{% endif %}. The admin, technical, and billing contacts listed for your domain{% if domains|length > 1 %}s{% endif %} in our old system also received this email. In our new registrar, these contacts are all considered “domain managers.” We no longer have the admin, technical, and billing roles, and you aren’t limited to three domain managers like in the old system. 
+
+    1. Once you have your Login.gov account, sign in to the new registrar at <https://manage.get.gov>.
+    2. Click the “Manage” link next to your .gov domain, then click on “Domain managers” to see who has access to your domain. 
+    3. If any of these users should not have access to your domain, let us know in a reply to this email.
+
+After verifying who has access to your domain{% if domains|length > 1 %}s{% endif %}, we also suggest reviewing your contact information and organization mailing address to ensure those are up to date. 
+
+
+DOMAIN EXPIRATION DATES EXTENDED BY ONE YEAR
+
+Expiration dates for .gov domains in good standing have been extended for one year. Expiration dates won't be shown in the new registrar yet. 
 
-YOU NEED A LOGIN.GOV ACCOUNT
-You’ll need a Login.gov account to manage your .gov domain{% if domains|length > 1 %}s{% endif %}. Login.gov provides a simple and secure process for signing into many government services with one account. If you don’t already have one, follow these steps to create your Login.gov account <https://login.gov/help/get-started/create-your-account/>. 
 
-DOMAIN MANAGEMENT
-As a .gov domain manager you can add or update information about your domain{% if domains|length > 1 %}s{% endif %}. You’ll also serve as a contact for your .gov domain{% if domains|length > 1 %}s{% endif %}. Please keep your contact information updated. Learn more about domain management <https://get.gov/help/>.
-{% if domains|length > 1 %}
-DOMAINS
-{% for domain in domains %} {{ domain }}
-{% endfor %}{% else %}
-{% endif %}
 SOMETHING WRONG?
-If you’re not affiliated with {{ domain }} or think you received this message in error, contact the .gov team <https://get.gov/help/#contact-us>. 
+
+If you think you received this message in error or have a question, let us know in a reply to this email. 
 
 
 THANK YOU
@@ -24,6 +45,8 @@ THANK YOU
 ----------------------------------------------------------------
 
 The .gov team
-Contact us: <https://get.gov/contact/>
-Visit <https://get.gov>
+
+.Gov blog <https://get.gov/updates/> 
+Domain management <https://manage.get.gov>
+Get.gov <https://get.gov>
 {% endautoescape %}

src/registrar/templates/emails/transition_domain_invitation_subject.txt

@@ -1 +1 @@
-You've been added to a .gov domain
+(Action required) Manage your .gov domain{% if domains|length > 1 %}s{% endif %} in the new registrar

src/registrar/templates/home.html

@@ -13,9 +13,22 @@
   <h1>Manage your domains</h2>
 
   <p class="margin-top-4">
-    <a href="{% url 'application:' %}" class="usa-button">
+    {% if is_production %}
+    <a href="javascript:void(0)" 
+    class="usa-button usa-tooltip disabled-link"
+    data-position="right"
+    title="Coming in 2024"
+    aria-disabled="true"
+    data-tooltip="true"
+    >
       Start a new domain request
     </a>
+    {% else %}
+    <a href="{% url 'application:' %}" class="usa-button"
+    >
+      Start a new domain request
+    </a>
+    {% endif %}
   </p>
 
   <section class="section--outlined tablet:grid-col-11 desktop:grid-col-10">
@@ -130,7 +143,7 @@
     {% endif %}
   </section>
 
-  {# Note: Reimplement this after MVP.. #}
+  {# Note: Reimplement this after MVP #}
   <!--
   <section class="section--outlined tablet:grid-col-11 desktop:grid-col-10">
     <h2>Archived domains</h2>

src/registrar/views/index.py

@@ -2,6 +2,7 @@ from django.db.models import F
 from django.shortcuts import render
 
 from registrar.models import DomainApplication
+from django.conf import settings
 
 
 def index(request):
@@ -22,4 +23,5 @@ def index(request):
             state=F("domain__state"),
         )
         context["domains"] = domains
+        context["is_production"] = settings.IS_PRODUCTION
     return render(request, "home.html", context)