templates: Fix invalid lists inside <p>.

Signed-off-by: Anders Kaseorg <anders@zulip.com>

templates/corporate/zephyr.html

@@ -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>

templates/zerver/development/dev_tools.html

@@ -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 &amp; GitHub authentication</a> in the development environment.
         </p>

templates/zerver/emails/account_registered.html

@@ -30,6 +30,7 @@
 
 <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 %}
+</p>
 <ul>
     <li>{% trans organization_url=macros.link_tag(realm_url) %}Organization URL: {{ organization_url }}{% endtrans %}<br /></li>
     {% if ldap %}
@@ -42,6 +43,7 @@
         <li>{% trans email=macros.email_tag(email) %}Your account email: {{ email }}{% endtrans %}<br /></li>
     {% endif %}
 </ul>
+<p>
     <a class="button" href="{{ realm_url }}">{{ _('Go to organization') }}</a>
 </p>
 

templates/zerver/emails/confirm_registration.html

@@ -5,17 +5,19 @@
 {% 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!") }}
-    {% endif %}
         </p>
+    {% endif %}
     <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.") }}

templates/zerver/emails/notify_new_login.html

@@ -10,7 +10,6 @@
 
 {% block content %}
 <p>{{ _("We noticed a recent login for the following Zulip account.") }}</p>
-<p>
 <ul>
     <li>
         {% trans organization_link=macros.link_tag(realm_url) %}Organization: {{ organization_link }}{% endtrans %}
@@ -28,7 +27,6 @@
         {% trans %}IP address: {{ device_ip }}{% endtrans %}
     </li>
 </ul>
-</p>
 
 <p>{{ _("If this was you, great! There's nothing else you need to do.") }}</p>
 

templates/zerver/emails/onboarding_team_to_zulip.html

@@ -11,6 +11,7 @@
 </p>
 <p>
     {% trans %}Otherwise, here is some advice we often hear from customers for evaluating <i>any</i> team chat product:{% endtrans %}
+</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 %}
@@ -18,7 +19,6 @@
     <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>
 <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>

templates/zerver/emails/password_reset.html

@@ -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 %}

web/templates/confirm_dialog/confirm_deactivate_stream.hbs

@@ -1,13 +1,12 @@
 <p>
     {{#tr}}Archiving this channel will:{{/tr}}
 </p>
-<p>
 <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>
+<p>
     {{#tr}}
         Users can still search for messages in archived channels.
         You can always unarchive this channel.

web/templates/confirm_dialog/confirm_deactivate_user.hbs

@@ -11,15 +11,17 @@
             <strong>{username}</strong> has {number_of_invites_by_user, plural, one {# unexpired invitation} other {# unexpired invitations}}.
         {{/tr}}
     {{/if}}
+</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>
 <label class="checkbox">
     <input type="checkbox" class="send_email" />
     <span class="rendered-checkbox"></span>

web/templates/confirm_dialog/confirm_delete_detached_attachments.hbs

@@ -11,7 +11,6 @@
         {{/tr}}
     {{/if}}
 </div>
-<p>
 <ul>
     {{#each attachments_list}}
         <li>
@@ -19,4 +18,3 @@
         </li>
     {{/each}}
 </ul>
-</p>

web/templates/confirm_dialog/confirm_delete_profile_field_option.hbs

@@ -12,7 +12,6 @@
         {{/tr}}
     {{/if}}
 </p>
-<p>
 <div>
     {{#if (eq deleted_options_count 1)}}
         {{t "Deleted option:" }}
@@ -25,4 +24,3 @@
         <li>{{this}}</li>
     {{/each}}
 </ul>
-</p>

web/templates/confirm_dialog/confirm_reactivate_stream.hbs

@@ -1,10 +1,8 @@
 <p>
     {{#tr}}Unarchiving this channel will:{{/tr}}
 </p>
-<p>
 <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>

web/templates/introduce_zulip_view_modal.hbs

@@ -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>

web/templates/try_zulip_modal.hbs

@@ -1,5 +1,6 @@
 <p>
     {{t "Explore how hundreds of community participants use Zulip to brainstorm ideas, discuss technical challenges, ask questions, and give feedback:" }}
+</p>
 
 <ul>
     <li>
@@ -21,6 +22,7 @@
     </li>
 </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}}