Reorder and cleanup project settings page

Fixes #9530

Author: ericholscher

readthedocs/projects/forms.py

@@ -407,30 +407,29 @@ class Meta:
             # Basics and repo settings
             "name",
             "repo",
-            "repo_type",
-            "default_branch",
             "language",
-            "description",
-            # Project related settings
             "default_version",
             "privacy_level",
             "versioning_scheme",
-            "external_builds_enabled",
-            "external_builds_privacy_level",
+            "default_branch",
             "readthedocs_yaml_path",
-            "analytics_code",
-            "analytics_disabled",
-            "show_version_warning",
             # Meta data
             "programming_language",
             "project_url",
+            "description",
             "tags",
+            # Booleans
+            "external_builds_enabled",
+            "external_builds_privacy_level",
+            # Deprecated
+            "analytics_code",
+            "analytics_disabled",
+            "show_version_warning",
         )
 
     description = forms.CharField(
         required=False,
         max_length=150,
-        widget=forms.Textarea,
     )
 
     def __init__(self, *args, **kwargs):
@@ -466,6 +465,11 @@ def __init__(self, *args, **kwargs):
             for field in ["privacy_level", "external_builds_privacy_level"]:
                 self.fields.pop(field)
 
+        # Remove analytics from new dashboard
+        if settings.RTD_EXT_THEME_ENABLED:
+            for field in ["analytics_code", "analytics_disabled"]:
+                self.fields.pop(field)
+
         default_choice = (None, "-" * 9)
         versions_choices = (
             self.instance.versions(manager=INTERNAL)

readthedocs/projects/models.py

@@ -257,7 +257,7 @@ class Project(models.Model):
         _("Repository URL"),
         max_length=255,
         validators=[validate_repository_url],
-        help_text=_("Hosted documentation repository URL"),
+        help_text=_("Git repository URL"),
         db_index=True,
     )