From 423af9916af663b93db319027492047aaded87e6 Mon Sep 17 00:00:00 2001 From: Lauryn Menard Date: Fri, 23 Feb 2024 16:48:59 +0100 Subject: [PATCH] remote-support: Add specific class for support section headers. --- corporate/tests/test_support_views.py | 8 ++++---- templates/corporate/support/current_plan_details.html | 2 +- templates/corporate/support/next_plan_details.html | 2 +- .../corporate/support/next_plan_forms_support.html | 2 +- templates/corporate/support/remote_realm_details.html | 10 +++++----- templates/corporate/support/remote_server_support.html | 4 ++-- .../corporate/support/sponsorship_forms_support.html | 2 +- web/styles/portico/activity.css | 9 ++++++++- 8 files changed, 23 insertions(+), 16 deletions(-) diff --git a/corporate/tests/test_support_views.py b/corporate/tests/test_support_views.py index deac772227..f0ad1f4705 100644 --- a/corporate/tests/test_support_views.py +++ b/corporate/tests/test_support_views.py @@ -243,11 +243,11 @@ class TestRemoteServerSupportEndpoint(ZulipTestCase): def check_legacy_plan_with_upgrade(result: "TestHttpResponse") -> None: self.assert_in_success_response( [ - "

📅 Current plan information:

", + "📅 Current plan information:", "Plan name: Free (legacy plan)
", "Status: New plan scheduled
", "End date: 01 February 2050
", - "

⏱️ Next plan information:

", + "⏱️ Next plan information:", "Plan name: Zulip Basic
", "Status: Never started
", "Start date: 01 February 2050
", @@ -262,7 +262,7 @@ class TestRemoteServerSupportEndpoint(ZulipTestCase): def check_legacy_plan_without_upgrade(result: "TestHttpResponse") -> None: self.assert_in_success_response( [ - "

📅 Current plan information:

", + "📅 Current plan information:", "Plan name: Free (legacy plan)
", "Status: Active
", "End date: 01 February 2050
", @@ -271,7 +271,7 @@ class TestRemoteServerSupportEndpoint(ZulipTestCase): ) self.assert_not_in_success_response( [ - "

⏱️ Next plan information:

", + "⏱️ Next plan information:", ], result, ) diff --git a/templates/corporate/support/current_plan_details.html b/templates/corporate/support/current_plan_details.html index 9ae36f3d12..9a3fc3aa1f 100644 --- a/templates/corporate/support/current_plan_details.html +++ b/templates/corporate/support/current_plan_details.html @@ -1,5 +1,5 @@
-

📅 Current plan information:

+

📅 Current plan information:

{% if plan_data.warning %}
{{ plan_data.warning }} diff --git a/templates/corporate/support/next_plan_details.html b/templates/corporate/support/next_plan_details.html index 9cc346c65e..77d419f8de 100644 --- a/templates/corporate/support/next_plan_details.html +++ b/templates/corporate/support/next_plan_details.html @@ -1,5 +1,5 @@
-

⏱️ Next plan information:

+

⏱️ Next plan information:

Plan name: {{ plan_data.next_plan.name }}
Status: {{ plan_data.next_plan.get_plan_status_as_text() }}
{% if plan_data.next_plan.price_per_license %} diff --git a/templates/corporate/support/next_plan_forms_support.html b/templates/corporate/support/next_plan_forms_support.html index f92412e862..8c28b48cfd 100644 --- a/templates/corporate/support/next_plan_forms_support.html +++ b/templates/corporate/support/next_plan_forms_support.html @@ -1,4 +1,4 @@ -

⏱️ Schedule fixed price plan:

+

⏱️ Schedule fixed price plan:

Fixed price
{% if not is_current_plan_billable %} diff --git a/templates/corporate/support/remote_realm_details.html b/templates/corporate/support/remote_realm_details.html index 9e8fe4ccc6..6e33922202 100644 --- a/templates/corporate/support/remote_realm_details.html +++ b/templates/corporate/support/remote_realm_details.html @@ -3,19 +3,19 @@ remote realm

{{ remote_realm.name }}

{% if remote_realm.realm_locally_deleted %} -

Remote realm is locally deleted 🛑

+

Remote realm is locally deleted 🛑

{% endif %} {% if remote_realm.registration_deactivated %} -

Remote realm registration deactivated 🛑

+

Remote realm registration deactivated 🛑

{% endif %} {% if remote_realm.realm_deactivated %} -

Remote realm is deactivated on remote server 🛑

+

Remote realm is deactivated on remote server 🛑

{% endif %} {% if remote_realm.plan_type == SPONSORED_PLAN_TYPE %} -

On 100% sponsored Zulip Community plan 🎉

+

On 100% sponsored Zulip Community plan 🎉

{% endif %} {% if support_data[remote_realm.id].sponsorship_data.default_discount %} -

Has a discount 💸

+

Has a discount 💸

{% endif %} Remote realm host: {{ remote_realm.host }}
Date created: {{ support_data[remote_realm.id].date_created.strftime('%d %B %Y') }}
diff --git a/templates/corporate/support/remote_server_support.html b/templates/corporate/support/remote_server_support.html index 31c8faee05..b0f5e3f192 100644 --- a/templates/corporate/support/remote_server_support.html +++ b/templates/corporate/support/remote_server_support.html @@ -39,10 +39,10 @@ remote server

{{ remote_server.hostname }} {{ server_analytics_link(remote_server.id ) }}

{% if remote_server.plan_type == SPONSORED_PLAN_TYPE %} -

On 100% sponsored Zulip Community plan 🎉

+

On 100% sponsored Zulip Community plan 🎉

{% endif %} {% if remote_servers_support_data[remote_server.id].sponsorship_data.default_discount %} -

Has a discount 💸

+

Has a discount 💸

{% endif %} Contact email: {{ remote_server.contact_email }} diff --git a/templates/corporate/support/sponsorship_forms_support.html b/templates/corporate/support/sponsorship_forms_support.html index 0fec76ef97..36895d3faa 100644 --- a/templates/corporate/support/sponsorship_forms_support.html +++ b/templates/corporate/support/sponsorship_forms_support.html @@ -64,7 +64,7 @@ {% if sponsorship_data.sponsorship_pending %}
-

Sponsorship request information:

+

Sponsorship request information:

{% if sponsorship_data.latest_sponsorship_request %}
  • Organization type: {{ sponsorship_data.latest_sponsorship_request.org_type }}
    • diff --git a/web/styles/portico/activity.css b/web/styles/portico/activity.css index 1249fa9b91..d6804b1a3c 100644 --- a/web/styles/portico/activity.css +++ b/web/styles/portico/activity.css @@ -269,7 +269,14 @@ tr.admin td:first-child { .realm-support-information, .remote-server-information, .remote-realm-information { - padding-bottom: 15px; + margin-bottom: 10px; +} + +.support-section-header { + font-size: 1.2em; + font-weight: bold; + line-height: 20px; + margin: 0 0 8px; } .support-realm-icon {