mirror of
https://github.com/zulip/zulip.git
synced 2025-10-23 04:52:12 +00:00
templates: Fix invalid lists inside <p>.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
committed by
Tim Abbott
Tim Abbott
parent
9a5c41cb9d
commit
d3238e9a1b
@@ -65,11 +65,12 @@
|
||||
|
||||
<p>
|
||||
You can get set up to participate on an encrypted Zephyr class using Zulip by either:
|
||||
</p>
|
||||
|
||||
<ol>
|
||||
<li><p>E-mailing us at <a href="mailto:{{ support_email }}">{{ support_email }}</a> to get set up, or</p></li>
|
||||
<li><p>Someone who is already set up to participate on that encrypted Zephyr class using Zulip can use Zulip to invite you</p></li>
|
||||
</ol>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
</tbody>
|
||||
</table>
|
||||
<h2>Useful management commands</h2>
|
||||
<p>Development-specific <a href="https://zulip.readthedocs.io/en/latest/production/management-commands.html">management commands</a> live in <code>zilencer/management/commands</code>. Highlights include:
|
||||
<p>Development-specific <a href="https://zulip.readthedocs.io/en/latest/production/management-commands.html">management commands</a> live in <code>zilencer/management/commands</code>. Highlights include:</p>
|
||||
<ul>
|
||||
<li><code>./manage.py populate_db</code>: Rebuilds database. Has options to, for example, create 3K users for testing.</li>
|
||||
<li><code>./manage.py mark_all_messages_unread</code>: Useful for testing reading messages.</li>
|
||||
@@ -110,7 +110,6 @@
|
||||
to add the data you're testing.
|
||||
</li>
|
||||
</ul>
|
||||
</p>
|
||||
<p>We also have
|
||||
<a href="https://zulip.readthedocs.io/en/latest/development/authentication.html">documentation on testing LDAP, Google & GitHub authentication</a> in the development environment.
|
||||
</p>
|
||||
|
||||
@@ -30,7 +30,8 @@
|
||||
|
||||
<p>
|
||||
{% trans apps_page_link="https://zulip.com/apps/" %}You will use the following info to log into the Zulip web, <a href="{{ apps_page_link }}">mobile and desktop</a> apps:{% endtrans %}
|
||||
<ul>
|
||||
</p>
|
||||
<ul>
|
||||
<li>{% trans organization_url=macros.link_tag(realm_url) %}Organization URL: {{ organization_url }}{% endtrans %}<br /></li>
|
||||
{% if ldap %}
|
||||
{% if ldap_username %}
|
||||
@@ -41,7 +42,8 @@
|
||||
{% else %}
|
||||
<li>{% trans email=macros.email_tag(email) %}Your account email: {{ email }}{% endtrans %}<br /></li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</ul>
|
||||
<p>
|
||||
<a class="button" href="{{ realm_url }}">{{ _('Go to organization') }}</a>
|
||||
</p>
|
||||
|
||||
|
||||
@@ -5,30 +5,32 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<p>
|
||||
{% if create_realm %}
|
||||
<p>
|
||||
{{ _("You have requested a new Zulip organization:") }}
|
||||
</p>
|
||||
<ul>
|
||||
<li>{% trans %}Organization URL: {{ organization_url }}{% endtrans %}</li>
|
||||
<li>{% trans %}Organization type: {{ organization_type }}{% endtrans %}</li>
|
||||
</ul>
|
||||
{% else %}
|
||||
<p>
|
||||
{{ _("You recently signed up for Zulip. Awesome!") }}
|
||||
</p>
|
||||
{% endif %}
|
||||
</p>
|
||||
<p>
|
||||
<p>
|
||||
{% if create_realm %}
|
||||
{{ _("Click the button below to create the organization and register your account. You'll be able to update the information above if you like.") }}
|
||||
{% else %}
|
||||
{{ _("Click the button below to complete registration.") }}
|
||||
{% endif %}
|
||||
<a class="button" href="{{ activate_url }}">{{ _("Complete registration") }}</a>
|
||||
</p>
|
||||
<p>
|
||||
</p>
|
||||
<p>
|
||||
{% if corporate_enabled %}
|
||||
{{macros.contact_us_zulip_cloud(support_email)}}
|
||||
{% else %}
|
||||
{{macros.contact_us_self_hosted(support_email)}}
|
||||
{% endif %}
|
||||
</p>
|
||||
</p>
|
||||
{% endblock %}
|
||||
|
||||
@@ -10,8 +10,7 @@
|
||||
|
||||
{% block content %}
|
||||
<p>{{ _("We noticed a recent login for the following Zulip account.") }}</p>
|
||||
<p>
|
||||
<ul>
|
||||
<ul>
|
||||
<li>
|
||||
{% trans organization_link=macros.link_tag(realm_url) %}Organization: {{ organization_link }}{% endtrans %}
|
||||
</li>
|
||||
@@ -27,8 +26,7 @@
|
||||
<li>
|
||||
{% trans %}IP address: {{ device_ip }}{% endtrans %}
|
||||
</li>
|
||||
</ul>
|
||||
</p>
|
||||
</ul>
|
||||
|
||||
<p>{{ _("If this was you, great! There's nothing else you need to do.") }}</p>
|
||||
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
</p>
|
||||
<p>
|
||||
{% trans %}Otherwise, here is some advice we often hear from customers for evaluating <i>any</i> team chat product:{% endtrans %}
|
||||
<ol>
|
||||
</p>
|
||||
<ol>
|
||||
<li>{% trans %}<a href="{{ invite_users }}"><b>Invite your teammates</b></a> to explore with you and share their unique perspectives.{% endtrans %}
|
||||
{% trans %}Use the app itself to chat about your impressions.{% endtrans %}
|
||||
</li>
|
||||
<li>{% trans %}<a href="{{ trying_out_zulip}}"><b>Run a week-long trial</b></a> with your team, without using any other chat tools. This is the only way to truly experience how a new chat app will help your team communicate.{% endtrans %}
|
||||
</li>
|
||||
</ol>
|
||||
</p>
|
||||
</ol>
|
||||
<p>
|
||||
{% trans %}Zulip is designed to <a href="{{ why_zulip }}">enable efficient communication</a>, and we hope these tips help your team experience it in action.{% endtrans %}
|
||||
</p>
|
||||
|
||||
@@ -21,18 +21,20 @@
|
||||
{% trans %}You do not have an account in that Zulip organization.{% endtrans %}
|
||||
{% endif %}
|
||||
</p>
|
||||
<p>
|
||||
{% if other_realm_urls %}
|
||||
<p>
|
||||
{{ _("You do have active accounts in the following organization(s).") }}
|
||||
</p>
|
||||
<ul>
|
||||
{% for realm_url in other_realm_urls %}
|
||||
<li>{{ realm_url }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<p>
|
||||
{% trans %}You can try logging in or resetting your password in the organization(s) above.{% endtrans %}
|
||||
{% endif %}
|
||||
</p>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
<p>
|
||||
{% trans %}If you do not recognize this activity, you can safely ignore this email.{% endtrans %}
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
<p>
|
||||
{{#tr}}Archiving this channel will:{{/tr}}
|
||||
</p>
|
||||
<p>
|
||||
<ul>
|
||||
<ul>
|
||||
<li>{{#tr}}Remove it from the left sidebar for all users.{{/tr}}</li>
|
||||
<li>{{#tr}}Prevent new messages from being sent to this channel.{{/tr}}</li>
|
||||
<li>{{#tr}}Prevent messages in this channel from being edited, deleted, or moved.{{/tr}}</li>
|
||||
{{#if is_announcement_stream}}
|
||||
<li>{{#tr}}Disable announcements that are currently sent to this channel:{{/tr}}</li>
|
||||
<li>{{#tr}}Disable announcements that are currently sent to this channel:{{/tr}}
|
||||
<ul>
|
||||
{{#if is_new_stream_announcements_stream}}
|
||||
<li>{{#tr}}New channel announcements{{/tr}}</li>
|
||||
@@ -19,8 +18,10 @@
|
||||
<li>{{#tr}}Zulip update announcements{{/tr}}</li>
|
||||
{{/if}}
|
||||
</ul>
|
||||
</li>
|
||||
{{/if}}
|
||||
</ul>
|
||||
</ul>
|
||||
<p>
|
||||
{{#tr}}
|
||||
Users can still search for messages in archived channels.
|
||||
You can always unarchive this channel.
|
||||
|
||||
@@ -11,15 +11,17 @@
|
||||
<strong>{username}</strong> has {number_of_invites_by_user, plural, one {# unexpired invitation} other {# unexpired invitations}}.
|
||||
{{/tr}}
|
||||
{{/if}}
|
||||
{{#if bots_owned_by_user}}
|
||||
</p>
|
||||
{{#if bots_owned_by_user}}
|
||||
<p>
|
||||
{{t "They administer the following bots:"}}
|
||||
</p>
|
||||
<ul>
|
||||
{{#each bots_owned_by_user}}
|
||||
<li>{{this.full_name}}</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
{{/if}}
|
||||
</p>
|
||||
{{/if}}
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" class="send_email" />
|
||||
<span class="rendered-checkbox"></span>
|
||||
|
||||
@@ -11,12 +11,10 @@
|
||||
{{/tr}}
|
||||
{{/if}}
|
||||
</div>
|
||||
<p>
|
||||
<ul>
|
||||
<ul>
|
||||
{{#each attachments_list}}
|
||||
<li>
|
||||
<a href="/user_uploads/{{this.path_id}}" rel="noopener noreferrer" target="_blank">{{this.name}}</a>
|
||||
</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
</p>
|
||||
</ul>
|
||||
|
||||
@@ -12,17 +12,15 @@
|
||||
{{/tr}}
|
||||
{{/if}}
|
||||
</p>
|
||||
<p>
|
||||
<div>
|
||||
<div>
|
||||
{{#if (eq deleted_options_count 1)}}
|
||||
{{t "Deleted option:" }}
|
||||
{{else}}
|
||||
{{t "Deleted options:" }}
|
||||
{{/if}}
|
||||
</div>
|
||||
<ul>
|
||||
</div>
|
||||
<ul>
|
||||
{{#each deleted_values}}
|
||||
<li>{{this}}</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
</p>
|
||||
</ul>
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
<p>
|
||||
{{#tr}}Unarchiving this channel will:{{/tr}}
|
||||
</p>
|
||||
<p>
|
||||
<ul>
|
||||
<ul>
|
||||
<li>{{#tr}}Make it appear in the left sidebar for all subscribers.{{/tr}}</li>
|
||||
<li>{{#tr}}Allow sending new messages to this channel.{{/tr}}</li>
|
||||
<li>{{#tr}}Allow messages in this channel to be edited, deleted, or moved.{{/tr}}</li>
|
||||
</ul>
|
||||
</p>
|
||||
</ul>
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
</p>
|
||||
<p>
|
||||
{{t 'Click on a conversation to view it. To return here, you can:'}}
|
||||
</p>
|
||||
<ul>
|
||||
<li>
|
||||
{{#tr}}
|
||||
@@ -50,5 +51,4 @@
|
||||
</li>
|
||||
{{/if}}
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
<p>
|
||||
{{t "Explore how hundreds of community participants use Zulip to brainstorm ideas, discuss technical challenges, ask questions, and give feedback:" }}
|
||||
</p>
|
||||
|
||||
<ul>
|
||||
<ul>
|
||||
<li>
|
||||
{{#tr}}
|
||||
You'll see a list of <z-highlight>recent conversations</z-highlight>, where each conversation is
|
||||
@@ -19,8 +20,9 @@
|
||||
{{#*inline "z-highlight"}}<b class="highlighted-element">{{> @partial-block}}</b>{{/inline}}
|
||||
{{/tr}}
|
||||
</li>
|
||||
</ul>
|
||||
</ul>
|
||||
|
||||
<p>
|
||||
{{#tr}}
|
||||
If you have any questions, please post in the <z-highlight>#user questions</z-highlight> channel, and we'll be happy to help.
|
||||
{{#*inline "z-highlight"}}<b class="highlighted-element">{{> @partial-block}}</b>{{/inline}}
|
||||
|
||||
Reference in New Issue
Block a user