diff --git a/templates/zerver/realm_redirect.html b/templates/zerver/realm_redirect.html index 0f7dafdd3e2ef..451cacdb4d0a9 100644 --- a/templates/zerver/realm_redirect.html +++ b/templates/zerver/realm_redirect.html @@ -19,10 +19,10 @@
{{ _("Enter your organization's Zulip URL:") }}
+{{ _("Organization URL") }}
.{{external_host}}+
{{ _("Don't know your organization URL?") }} {{ _("Find your organization.") }}
+ diff --git a/tools/lib/capitalization.py b/tools/lib/capitalization.py index 6d127d3f10c60..7cde496006a7c 100644 --- a/tools/lib/capitalization.py +++ b/tools/lib/capitalization.py @@ -128,7 +128,7 @@ # Emoji name placeholder r"leafy green vegetable", # Subdomain placeholder - r"your-organization-url", + r"your-organization", # Used in invite modal r"or", # Units diff --git a/web/styles/portico/portico_signin.css b/web/styles/portico/portico_signin.css index 190af1fcf7857..0077cf6f610f6 100644 --- a/web/styles/portico/portico_signin.css +++ b/web/styles/portico/portico_signin.css @@ -46,6 +46,11 @@ html { } } +.left-text { + text-align: left; + margin-top: 0; +} + #new-realm-creation { .get-started { font-size: 2rem; @@ -1210,6 +1215,9 @@ button#register_auth_button_gitlab { #realm_redirect_description { top: 15px; position: relative; + text-align: left; + font-weight: 600; + margin-bottom: -5px; } #enter-realm-button { diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py index 743b46c1b533e..5c320fa1d2214 100644 --- a/zerver/tests/test_signup.py +++ b/zerver/tests/test_signup.py @@ -4698,7 +4698,7 @@ def test_whitelisted_disposable_domains(self) -> None: class RealmRedirectTest(ZulipTestCase): def test_realm_redirect_without_next_param(self) -> None: result = self.client_get("/accounts/go/") - self.assert_in_success_response(["Enter your organization's Zulip URL"], result) + self.assert_in_success_response(["Organization URL"], result) result = self.client_post("/accounts/go/", {"subdomain": "zephyr"}) self.assertEqual(result.status_code, 302) @@ -4710,7 +4710,7 @@ def test_realm_redirect_without_next_param(self) -> None: def test_realm_redirect_with_next_param(self) -> None: result = self.client_get("/accounts/go/", {"next": "billing"}) self.assert_in_success_response( - ["Enter your organization's Zulip URL", 'action="/accounts/go/?next=billing"'], result + ["Organization URL", 'action="/accounts/go/?next=billing"'], result ) result = self.client_post("/accounts/go/?next=billing", {"subdomain": "lear"})