Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

plans_page: Adjust /plans content. 

[squash]: Update sponsorsip and question boxes for Cloud.

[squash]: Update tabs subtitles.

[squash]: Content for info boxes for self-hosted plans.

[squash]: Adjust content to fit design.

portico: Tweak /plans text.
This commit is contained in:
Alya Abbott 2023-11-22 16:21:00 -08:00 committed by Tim Abbott
parent dbaef860bf
commit 6f796e0cbd
3 changed files with 55 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
templates/corporate/plans.html
View File

@ -23,31 +23,32 @@
<div class="additional-pricing-information cloud-additional-pricing"> <div class="additional-pricing-information cloud-additional-pricing">
<div class="discounts-section"> <div class="discounts-section">
<header> <header>
<h2>Cloud Discounts?</h2> <h2>Sponsorship and discounts</h2>
<p> <p>
We sponsor hundreds of worthy organizations We sponsor over 1000 organizations.
</p> </p>
</header> </header>
<div class="text-content"> <div class="text-content">
<div class="discounted-community-plan"> <div class="discounted-community-plan">
<h3>Community plan</h3> <h3>Eligible for free Standard plan
</h3>
<ul> <ul>
<li> <li>
<a href="/for/open-source/">Open source projects</a> <a href="/for/open-source/">Open source projects</a>
</li> </li>
<li> <li>
<a href="/for/research/">Research groups or departments</a> <a href="/for/research/">Researchers and academics</a>
</li> </li>
<li> <li>
<a href="/for/events/">Academic conferences and most other non-profit events</a> <a href="/for/events/">Academic conferences and other non-profit events</a>
</li> </li>
</ul> </ul>
</div> </div>
<div class="discounted-business-plan"> <div class="discounted-business-plan">
<h3>Business plan with 85% discount</h3> <h3>Eligible for 85+% discount</h3>
<ul> <ul>
<li> <li>
<a href="/for/education/">Education</a> (online or in-person) <a href="/for/education/">Education</a> (for-profit and non-profit)
</li> </li>
<li> <li>
<a href="/for/communities/">Non-profits and communities</a> <a href="/for/communities/">Non-profits and communities</a>
@ -55,8 +56,11 @@
</ul> </ul>
<a href="{{ sponsorship_url }}" class="sponsorship-button">Request sponsorship</a> <a href="{{ sponsorship_url }}" class="sponsorship-button">Request sponsorship</a>
<p class="contact-note"> <p class="contact-note">
If you don’t have a Zulip account yet, contact us via Wondering if your organization will qualify, but not
<a href="mailto:contact@zulip.com">contact@zulip.com</a> ready to request sponsorship yet? E-mail us at <a
href="mailto:sales@zulip.com">sales@zulip.com</a>.
Discounts are also available for organizations based in
the developing world.
</p> </p>
</div> </div>
</div> </div>
@ -67,31 +71,31 @@
<h2>Other questions?</h2> <h2>Other questions?</h2>
<p> <p>
See our <a href="/help/zulip-cloud-billing">billing help page</a> for See our <a href="/help/zulip-cloud-billing">billing help page</a> for
additional details additional details.
</p> </p>
</header> </header>
<div class="text-content"> <div class="text-content">
<ul> <ul>
<li> <li>
<a href="/help/zulip-cloud-billing#differences-between-zulip-cloud-plans">Differences between Zulip Cloud plans</a> <a href="/help/trying-out-zulip">How can I try out Zulip for free?</a>
</li> </li>
<li> <li>
<a href="/help/zulip-cloud-billing#payment-methods">Payment methods</a> <a href="/help/zulip-cloud-or-self-hosting">How do I choose between Zulip Cloud and self-hosting?</a>
</li> </li>
<li> <li>
<a href="/help/zulip-cloud-billing#temporary-users-and-guests">Temporary users and guests</a> <a href="/help/migrating-from-other-chat-tools">Can I import data from other chat tools?</a>
</li>
</ul>
<ul>
<li>
<a href="/help/migrating-from-other-chat-tools">Migrating from other chat tools</a>
</li> </li>
<li> <li>
<a href="https://zulip.com/help/trying-out-zulip">Trying out Zulip</a> <a href="/help/zulip-cloud-billing#temporary-users-and-guests">Are there discounts for guest users?</a>
</li>
<li>
<a
href="/help/zulip-cloud-billing#how-does-having-10000-messages-of-search-history-on-zulip-cloud-free-work">How does limited search history on the Free plan work?</a>
</li> </li>
</ul> </ul>
<p> <p>
If you have any other questions, please don’t hesitate to reach out to If you have any other questions, please don’t hesitate to
contact
<a href="mailto:sales@zulip.com">sales@zulip.com</a>. <a href="mailto:sales@zulip.com">sales@zulip.com</a>.
</p> </p>
</div> </div>
@ -103,14 +107,15 @@
<div class="additional-pricing-information self-hosted-additional-pricing"> <div class="additional-pricing-information self-hosted-additional-pricing">
<div class="discounts-section"> <div class="discounts-section">
<header> <header>
<h2>Self-Hosted Discounts?</h2> <h2>Sponsorship and discounts</h2>
<p> <p>
We sponsor hundreds of worthy organizations Contact <a href="mailto:sales@zulip.com">sales@zulip.com</a>
to discuss Enterprise pricing.
</p> </p>
</header> </header>
<div class="text-content"> <div class="text-content">
<div class="discounted-community-plan"> <div class="discounted-community-plan">
<h3>Community plan</h3> <h3>Eligible for discounts</h3>
<ul> <ul>
<li> <li>
<a href="/for/open-source/">Open source projects</a> <a href="/for/open-source/">Open source projects</a>
@ -121,23 +126,16 @@
<li> <li>
<a href="/for/events/">Academic conferences and most other non-profit events</a> <a href="/for/events/">Academic conferences and most other non-profit events</a>
</li> </li>
</ul>
</div>
<div class="discounted-business-plan">
<h3>Business plan with 85% discount</h3>
<ul>
<li> <li>
<a href="/for/education/">Education</a> (online or in-person) <a href="/for/education/">Education</a> (online or in-person)
</li> </li>
<li> <li>
<a href="/for/communities/">Non-profits and communities</a> <a href="/for/communities/">Non-profits and communities</a>
</li> </li>
<li>
Organizations based in the developing world
</li>
</ul> </ul>
<a href="{{ sponsorship_url }}" class="sponsorship-button">Request sponsorship</a>
<p class="contact-note">
If you don’t have a Zulip account yet, contact us via
<a href="mailto:contact@zulip.com">contact@zulip.com</a>
</p>
</div> </div>
</div> </div>
</div> </div>
@ -146,28 +144,19 @@
<header> <header>
<h2>Other questions?</h2> <h2>Other questions?</h2>
<p> <p>
See our <a href="/help/zulip-cloud-billing">billing help page</a> for Learn about <a href="/self-hosting">self-hosting Zulip</a>.
additional details
</p> </p>
</header> </header>
<div class="text-content"> <div class="text-content">
<ul> <ul>
<li> <li>
<a href="/help/zulip-cloud-billing#differences-between-zulip-cloud-plans">Differences between Zulip Cloud plans</a> <a href="/help/trying-out-zulip">How can I try out Zulip for free?</a>
</li> </li>
<li> <li>
<a href="/help/zulip-cloud-billing#payment-methods">Payment methods</a> <a href="/help/zulip-cloud-or-self-hosting">How do I choose between Zulip Cloud and self-hosting?</a>
</li> </li>
<li> <li>
<a href="/help/zulip-cloud-billing#temporary-users-and-guests">Temporary users and guests</a> <a href="/help/migrating-from-other-chat-tools">Can I import data from other chat tools?</a>
</li>
</ul>
<ul>
<li>
<a href="/help/migrating-from-other-chat-tools">Migrating from other chat tools</a>
</li>
<li>
<a href="https://zulip.com/help/trying-out-zulip">Trying out Zulip</a>
</li> </li>
</ul> </ul>
<p> <p>

31
templates/corporate/pricing_model.html
View File

@ -11,10 +11,9 @@
</div> </div>
<div class="pricing-container"> <div class="pricing-container">
<div id="cloud" class="cloud-plan-title pricing-tab"> <div id="cloud" class="cloud-plan-title pricing-tab">
<h2>Cloud</h2> <h2>Zulip Cloud</h2>
<p> <p>
Always updated to the latest version of Zulip. Simple managed solution.<br />Always up to date.
Simple managed solution, with no setup or maintenance.
</p> </p>
</div> </div>
@ -56,7 +55,7 @@
<li><a href="/help/message-retention-policy">Message retention policies</a></li> <li><a href="/help/message-retention-policy">Message retention policies</a></li>
<li>Brand Zulip with your logo</li> <li>Brand Zulip with your logo</li>
<li>Priority commercial support</li> <li>Priority commercial support</li>
<li>Funds the Zulip open source project</li> <li><a href="/help/public-access-option">Public access option</a></li>
</ul> </ul>
</div> </div>
<div class="bottom"> <div class="bottom">
@ -73,7 +72,7 @@
{% if not realm %} {% if not realm %}
<a href="/upgrade/" class="button green"> <a href="/upgrade/" class="button green">
{% if free_trial_days %} {% if free_trial_days %}
Start {{ free_trial_days }} day free trial Start {{ free_trial_days }}-day free trial
{% else %} {% else %}
Upgrade to Standard Upgrade to Standard
{% endif %} {% endif %}
@ -93,7 +92,7 @@
{% else %} {% else %}
<a href="/upgrade/" class="button green"> <a href="/upgrade/" class="button green">
{% if free_trial_days %} {% if free_trial_days %}
Start {{ free_trial_days }} day free trial Start {{ free_trial_days }}-day free trial
{% else %} {% else %}
Upgrade to Standard Upgrade to Standard
{% endif %} {% endif %}
@ -106,16 +105,25 @@
<div class="text-content"> <div class="text-content">
<h2>Plus</h2> <h2>Plus</h2>
<ul class="feature-list"> <ul class="feature-list">
<li>All Zulip Standard features</li> <li>All Standard plan features</li>
<li><a href="/help/saml-authentication">SSO with SAML</a> (Okta, OneLogIn, etc.)</li>
<li><a href="/help/scim">SCIM user sync</a></li>
<li>Custom domain</li> <li>Custom domain</li>
<li>SSO with SAML (Okta, OneLogIn, etc.)</li> <li>Limit user list access for <a href="/help/guest-users">guests</a></li>
<li>SCIM user sync</li>
<li>Limited guest role</li>
<li>Priority commercial support</li> <li>Priority commercial support</li>
</ul> </ul>
</div> </div>
<div class="bottom"> <div class="bottom">
<div class="text-content"> <div class="text-content">
<div class="standard-price-box">
<div class="price"><span class="currency-symbol">$</span>13.34</div>
<div class="details">
<p>
/user/month billed annually or
<b>$16</b> billed monthly
</p>
</div>
</div>
<a href="mailto:sales@zulip.com" target="_blank" rel="noopener noreferrer" class="no-action button green"> <a href="mailto:sales@zulip.com" target="_blank" rel="noopener noreferrer" class="no-action button green">
Contact sales Contact sales
</a> </a>
@ -127,8 +135,7 @@
<div id="self-hosted" class="self-hosted-plan-title pricing-tab"> <div id="self-hosted" class="self-hosted-plan-title pricing-tab">
<h2>Self-hosted</h2> <h2>Self-hosted</h2>
<p> <p>
Retain full control over your data and simplify compliance by self-hosting. Retain full control over your data.<br />100% open-source software.
Customize Zulip for all your needs.
</p> </p>
</div> </div>

2
zerver/tests/test_docs.py
View File

@ -575,7 +575,7 @@ class PlansPageTest(ZulipTestCase):
with self.settings(FREE_TRIAL_DAYS=60): with self.settings(FREE_TRIAL_DAYS=60):
result = self.client_get("/plans/", subdomain="zulip") result = self.client_get("/plans/", subdomain="zulip")
self.assert_in_success_response([current_plan, "Start 60 day free trial"], result) self.assert_in_success_response([current_plan, "Start 60-day free trial"], result)
self.assert_not_in_success_response( self.assert_not_in_success_response(
[sign_up_now, sponsorship_pending, upgrade_to_standard], result [sign_up_now, sponsorship_pending, upgrade_to_standard], result
) )