mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	remote-support: Add specific class for support section headers.
This commit is contained in:
		
				
					committed by
					
						
						Tim Abbott
					
				
			
			
				
	
			
			
			
						parent
						
							1e625bc43b
						
					
				
				
					commit
					423af9916a
				
			@@ -243,11 +243,11 @@ class TestRemoteServerSupportEndpoint(ZulipTestCase):
 | 
				
			|||||||
        def check_legacy_plan_with_upgrade(result: "TestHttpResponse") -> None:
 | 
					        def check_legacy_plan_with_upgrade(result: "TestHttpResponse") -> None:
 | 
				
			||||||
            self.assert_in_success_response(
 | 
					            self.assert_in_success_response(
 | 
				
			||||||
                [
 | 
					                [
 | 
				
			||||||
                    "<h4>📅 Current plan information:</h4>",
 | 
					                    "📅 Current plan information:",
 | 
				
			||||||
                    "<b>Plan name</b>: Free (legacy plan)<br />",
 | 
					                    "<b>Plan name</b>: Free (legacy plan)<br />",
 | 
				
			||||||
                    "<b>Status</b>: New plan scheduled<br />",
 | 
					                    "<b>Status</b>: New plan scheduled<br />",
 | 
				
			||||||
                    "<b>End date</b>: 01 February 2050<br />",
 | 
					                    "<b>End date</b>: 01 February 2050<br />",
 | 
				
			||||||
                    "<h4>⏱️ Next plan information:</h4>",
 | 
					                    "⏱️ Next plan information:",
 | 
				
			||||||
                    "<b>Plan name</b>: Zulip Basic<br />",
 | 
					                    "<b>Plan name</b>: Zulip Basic<br />",
 | 
				
			||||||
                    "<b>Status</b>: Never started<br />",
 | 
					                    "<b>Status</b>: Never started<br />",
 | 
				
			||||||
                    "<b>Start date</b>: 01 February 2050<br />",
 | 
					                    "<b>Start date</b>: 01 February 2050<br />",
 | 
				
			||||||
@@ -262,7 +262,7 @@ class TestRemoteServerSupportEndpoint(ZulipTestCase):
 | 
				
			|||||||
        def check_legacy_plan_without_upgrade(result: "TestHttpResponse") -> None:
 | 
					        def check_legacy_plan_without_upgrade(result: "TestHttpResponse") -> None:
 | 
				
			||||||
            self.assert_in_success_response(
 | 
					            self.assert_in_success_response(
 | 
				
			||||||
                [
 | 
					                [
 | 
				
			||||||
                    "<h4>📅 Current plan information:</h4>",
 | 
					                    "📅 Current plan information:",
 | 
				
			||||||
                    "<b>Plan name</b>: Free (legacy plan)<br />",
 | 
					                    "<b>Plan name</b>: Free (legacy plan)<br />",
 | 
				
			||||||
                    "<b>Status</b>: Active<br />",
 | 
					                    "<b>Status</b>: Active<br />",
 | 
				
			||||||
                    "<b>End date</b>: 01 February 2050<br />",
 | 
					                    "<b>End date</b>: 01 February 2050<br />",
 | 
				
			||||||
@@ -271,7 +271,7 @@ class TestRemoteServerSupportEndpoint(ZulipTestCase):
 | 
				
			|||||||
            )
 | 
					            )
 | 
				
			||||||
            self.assert_not_in_success_response(
 | 
					            self.assert_not_in_success_response(
 | 
				
			||||||
                [
 | 
					                [
 | 
				
			||||||
                    "<h4>⏱️ Next plan information:</h4>",
 | 
					                    "⏱️ Next plan information:",
 | 
				
			||||||
                ],
 | 
					                ],
 | 
				
			||||||
                result,
 | 
					                result,
 | 
				
			||||||
            )
 | 
					            )
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
<div class="current-plan-information">
 | 
					<div class="current-plan-information">
 | 
				
			||||||
    <h4>📅 Current plan information:</h4>
 | 
					    <p class="support-section-header">📅 Current plan information:</p>
 | 
				
			||||||
    {% if plan_data.warning %}
 | 
					    {% if plan_data.warning %}
 | 
				
			||||||
    <div class="current-plan-data-missing">
 | 
					    <div class="current-plan-data-missing">
 | 
				
			||||||
        {{ plan_data.warning }}
 | 
					        {{ plan_data.warning }}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
<div class="next-plan-information">
 | 
					<div class="next-plan-information">
 | 
				
			||||||
    <h4>⏱️ Next plan information:</h4>
 | 
					    <p class="support-section-header">⏱️ Next plan information:</p>
 | 
				
			||||||
    <b>Plan name</b>: {{ plan_data.next_plan.name }}<br />
 | 
					    <b>Plan name</b>: {{ plan_data.next_plan.name }}<br />
 | 
				
			||||||
    <b>Status</b>: {{ plan_data.next_plan.get_plan_status_as_text() }}<br />
 | 
					    <b>Status</b>: {{ plan_data.next_plan.get_plan_status_as_text() }}<br />
 | 
				
			||||||
    {% if plan_data.next_plan.price_per_license %}
 | 
					    {% if plan_data.next_plan.price_per_license %}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
<h4>⏱️ Schedule fixed price plan:</h4>
 | 
					<p class="support-section-header">⏱️ Schedule fixed price plan:</p>
 | 
				
			||||||
<form method="POST" class="remote-form">
 | 
					<form method="POST" class="remote-form">
 | 
				
			||||||
    <b>Fixed price</b><br />
 | 
					    <b>Fixed price</b><br />
 | 
				
			||||||
    {% if not is_current_plan_billable %}
 | 
					    {% if not is_current_plan_billable %}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,19 +3,19 @@
 | 
				
			|||||||
        <span class="label">remote realm</span>
 | 
					        <span class="label">remote realm</span>
 | 
				
			||||||
        <h3>{{ remote_realm.name }}</h3>
 | 
					        <h3>{{ remote_realm.name }}</h3>
 | 
				
			||||||
        {% if remote_realm.realm_locally_deleted %}
 | 
					        {% if remote_realm.realm_locally_deleted %}
 | 
				
			||||||
            <h4>Remote realm is locally deleted 🛑</h4>
 | 
					            <p class="support-section-header">Remote realm is locally deleted 🛑</p>
 | 
				
			||||||
        {% endif %}
 | 
					        {% endif %}
 | 
				
			||||||
        {% if remote_realm.registration_deactivated %}
 | 
					        {% if remote_realm.registration_deactivated %}
 | 
				
			||||||
            <h4>Remote realm registration deactivated 🛑</h4>
 | 
					            <p class="support-section-header">Remote realm registration deactivated 🛑</p>
 | 
				
			||||||
        {% endif %}
 | 
					        {% endif %}
 | 
				
			||||||
        {% if remote_realm.realm_deactivated %}
 | 
					        {% if remote_realm.realm_deactivated %}
 | 
				
			||||||
            <h4>Remote realm is deactivated on remote server 🛑</h4>
 | 
					            <p class="support-section-header">Remote realm is deactivated on remote server 🛑</p>
 | 
				
			||||||
        {% endif %}
 | 
					        {% endif %}
 | 
				
			||||||
        {% if remote_realm.plan_type == SPONSORED_PLAN_TYPE %}
 | 
					        {% if remote_realm.plan_type == SPONSORED_PLAN_TYPE %}
 | 
				
			||||||
            <h4>On 100% sponsored Zulip Community plan 🎉</h4>
 | 
					            <p class="support-section-header">On 100% sponsored Zulip Community plan 🎉</p>
 | 
				
			||||||
        {% endif %}
 | 
					        {% endif %}
 | 
				
			||||||
        {% if support_data[remote_realm.id].sponsorship_data.default_discount %}
 | 
					        {% if support_data[remote_realm.id].sponsorship_data.default_discount %}
 | 
				
			||||||
            <h4>Has a discount 💸</h4>
 | 
					            <p class="support-section-header">Has a discount 💸</p>
 | 
				
			||||||
        {% endif %}
 | 
					        {% endif %}
 | 
				
			||||||
        <b>Remote realm host:</b> {{ remote_realm.host }}<br />
 | 
					        <b>Remote realm host:</b> {{ remote_realm.host }}<br />
 | 
				
			||||||
        <b>Date created</b>: {{ support_data[remote_realm.id].date_created.strftime('%d %B %Y') }}<br />
 | 
					        <b>Date created</b>: {{ support_data[remote_realm.id].date_created.strftime('%d %B %Y') }}<br />
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,10 +39,10 @@
 | 
				
			|||||||
                    <span class="label">remote server</span>
 | 
					                    <span class="label">remote server</span>
 | 
				
			||||||
                    <h3>{{ remote_server.hostname }} {{ server_analytics_link(remote_server.id ) }}</h3>
 | 
					                    <h3>{{ remote_server.hostname }} {{ server_analytics_link(remote_server.id ) }}</h3>
 | 
				
			||||||
                    {% if remote_server.plan_type == SPONSORED_PLAN_TYPE %}
 | 
					                    {% if remote_server.plan_type == SPONSORED_PLAN_TYPE %}
 | 
				
			||||||
                        <h4>On 100% sponsored Zulip Community plan 🎉</h4>
 | 
					                        <p class="support-section-header">On 100% sponsored Zulip Community plan 🎉</p>
 | 
				
			||||||
                    {% endif %}
 | 
					                    {% endif %}
 | 
				
			||||||
                    {% if remote_servers_support_data[remote_server.id].sponsorship_data.default_discount %}
 | 
					                    {% if remote_servers_support_data[remote_server.id].sponsorship_data.default_discount %}
 | 
				
			||||||
                        <h4>Has a discount 💸</h4>
 | 
					                        <p class="support-section-header">Has a discount 💸</p>
 | 
				
			||||||
                    {% endif %}
 | 
					                    {% endif %}
 | 
				
			||||||
                    <b>Contact email</b>: {{ remote_server.contact_email }}
 | 
					                    <b>Contact email</b>: {{ remote_server.contact_email }}
 | 
				
			||||||
                    <a title="Copy email" class="copy-button" data-copytext="{{ remote_server.contact_email }}">
 | 
					                    <a title="Copy email" class="copy-button" data-copytext="{{ remote_server.contact_email }}">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -64,7 +64,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
{% if sponsorship_data.sponsorship_pending %}
 | 
					{% if sponsorship_data.sponsorship_pending %}
 | 
				
			||||||
<div class="">
 | 
					<div class="">
 | 
				
			||||||
    <h4>Sponsorship request information:</h4>
 | 
					    <p class="support-section-header">Sponsorship request information:</p>
 | 
				
			||||||
    {% if sponsorship_data.latest_sponsorship_request %}
 | 
					    {% if sponsorship_data.latest_sponsorship_request %}
 | 
				
			||||||
    <ul>
 | 
					    <ul>
 | 
				
			||||||
        <li><b>Organization type</b>: {{ sponsorship_data.latest_sponsorship_request.org_type }}</li>
 | 
					        <li><b>Organization type</b>: {{ sponsorship_data.latest_sponsorship_request.org_type }}</li>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -269,7 +269,14 @@ tr.admin td:first-child {
 | 
				
			|||||||
.realm-support-information,
 | 
					.realm-support-information,
 | 
				
			||||||
.remote-server-information,
 | 
					.remote-server-information,
 | 
				
			||||||
.remote-realm-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 {
 | 
					.support-realm-icon {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user