Merge pull request readthedocs#5764 from rtfd/davidfischer/domain-ui-improvements

Domain UI improvements

Author: ericholscher

readthedocs/projects/views/private.py

@@ -4,6 +4,7 @@
 
 from allauth.socialaccount.models import SocialAccount
 from celery import chain
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
@@ -720,6 +721,9 @@ class DomainList(DomainMixin, ListViewWithForm):
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
 
+        # Get the default docs domain
+        ctx['default_domain'] = settings.PUBLIC_DOMAIN if settings.USE_SUBDOMAIN else settings.PRODUCTION_DOMAIN
+
         # Retry validation on all domains if applicable
         for domain in ctx['domain_list']:
             retry_domain_verification.delay(domain_pk=domain.pk)

readthedocs/templates/projects/domain_form.html

@@ -27,6 +27,9 @@
       <strong>{% trans 'SSL certificate status' %}: </strong>
       <span>{{ domain.domainssl.status }}</span>
     </p>
+    {% if domain.domainssl.status == 'pending_validation' %}
+      <p class="help_text"><small>{% trans 'Did you setup a CNAME record in DNS pointing at "readthedocs.io"?' %}</small></p>
+    {% endif %}
   {% endif %}
 
   {% if domain %}

readthedocs/templates/projects/domain_list.html

@@ -12,11 +12,10 @@
 {% block project_edit_content_header %}{% trans "Domains" %}{% endblock %}
 
 {% block project_edit_content %}
-  {# Remove anytime after 2018-10-01 #}
-  <p class="empty">{% blocktrans %}Recently we added HTTPS support for custom domains. Depending on your setup, you may need to take action for your domain to support HTTPS. <a href="https://docs.readthedocs.io/page/custom_domains.html#custom-domain-ssl">See our docs</a> for details.{% endblocktrans %}</p>
-
   <p class="help_text">
-    {% trans "This allows you to add domains to your project. This allows them to live in the same namespace in the URLConf for a subdomain or CNAME." %}
+    {% blocktrans trimmed with docs_url='https://docs.readthedocs.io/page/custom_domains.html' %}
+        Configuring a custom domain allows you to serve your documentation from a domain other than "{{ default_domain }}". <a href="{{ docs_url }}">Learn more</a>.
+    {% endblocktrans %}
   </p>
 
   {% if object_list %}