paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

templates: Fix invalid lists inside <p>.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2025-09-05 14:34:58 -07:00
committed by Tim Abbott
parent 9a5c41cb9d
commit d3238e9a1b
14 changed files with 188 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
web/templates/confirm_dialog/confirm_deactivate_stream.hbs
View File

@@ -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>
<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}}
<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>
{{/if}}
</ul>
</li>
{{/if}}
</ul>
<p>
{{#tr}}
Users can still search for messages in archived channels.
You can always unarchive this channel.

18
web/templates/confirm_dialog/confirm_deactivate_user.hbs
View File

@@ -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}}
{{t "They administer the following bots:"}}
<ul>
{{#each bots_owned_by_user}}
<li>{{this.full_name}}</li>
{{/each}}
</ul>
{{/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}}
<label class="checkbox">
<input type="checkbox" class="send_email" />
<span class="rendered-checkbox"></span>

16
web/templates/confirm_dialog/confirm_delete_detached_attachments.hbs
View File

@@ -11,12 +11,10 @@
{{/tr}}
{{/if}}
</div>
<p>
<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>
{{#each attachments_list}}
<li>
<a href="/user_uploads/{{this.path_id}}" rel="noopener noreferrer" target="_blank">{{this.name}}</a>
</li>
{{/each}}
</ul>

26
web/templates/confirm_dialog/confirm_delete_profile_field_option.hbs
View File

@@ -12,17 +12,15 @@
{{/tr}}
{{/if}}
</p>
<p>
<div>
{{#if (eq deleted_options_count 1)}}
{{t "Deleted option:" }}
{{else}}
{{t "Deleted options:" }}
{{/if}}
</div>
<ul>
{{#each deleted_values}}
<li>{{this}}</li>
{{/each}}
</ul>
</p>
<div>
{{#if (eq deleted_options_count 1)}}
{{t "Deleted option:" }}
{{else}}
{{t "Deleted options:" }}
{{/if}}
</div>
<ul>
{{#each deleted_values}}
<li>{{this}}</li>
{{/each}}
</ul>

12
web/templates/confirm_dialog/confirm_reactivate_stream.hbs
View File

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

56
web/templates/introduce_zulip_view_modal.hbs
View File

@@ -19,36 +19,36 @@
</p>
<p>
{{t 'Click on a conversation to view it. To return here, you can:'}}
<ul>
<li>
</p>
<ul>
<li>
{{#tr}}
Use the <z-highlight>back</z-highlight> button in your browser or desktop app.
{{#*inline "z-highlight"}}<b class="highlighted-element">{{> @partial-block}}</b>{{/inline}}
{{/tr}}
</li>
<li>
{{#if (eq zulip_view "inbox")}}
{{#tr}}
Use the <z-highlight>back</z-highlight> button in your browser or desktop app.
Click <z-icon-inbox></z-icon-inbox> <z-highlight>Inbox</z-highlight> in the left sidebar.
{{#*inline "z-icon-inbox"}}<i class="zulip-icon zulip-icon-inbox" aria-hidden="true"></i>{{/inline}}
{{#*inline "z-highlight"}}<b class="highlighted-element">{{> @partial-block}}</b>{{/inline}}
{{/tr}}
{{else if (eq zulip_view "recent_conversations")}}
{{#tr}}
Click <z-icon-recent></z-icon-recent> <z-highlight>Recent conversations</z-highlight> in the left sidebar.
{{#*inline "z-icon-recent"}}<i class="zulip-icon zulip-icon-recent" aria-hidden="true"></i>{{/inline}}
{{#*inline "z-highlight"}}<b class="highlighted-element">{{> @partial-block}}</b>{{/inline}}
{{/tr}}
</li>
<li>
{{#if (eq zulip_view "inbox")}}
{{#tr}}
Click <z-icon-inbox></z-icon-inbox> <z-highlight>Inbox</z-highlight> in the left sidebar.
{{#*inline "z-icon-inbox"}}<i class="zulip-icon zulip-icon-inbox" aria-hidden="true"></i>{{/inline}}
{{#*inline "z-highlight"}}<b class="highlighted-element">{{> @partial-block}}</b>{{/inline}}
{{/tr}}
{{else if (eq zulip_view "recent_conversations")}}
{{#tr}}
Click <z-icon-recent></z-icon-recent> <z-highlight>Recent conversations</z-highlight> in the left sidebar.
{{#*inline "z-icon-recent"}}<i class="zulip-icon zulip-icon-recent" aria-hidden="true"></i>{{/inline}}
{{#*inline "z-highlight"}}<b class="highlighted-element">{{> @partial-block}}</b>{{/inline}}
{{/tr}}
{{/if}}
</li>
{{#if current_home_view_and_escape_navigation_enabled}}
<li>
{{#tr}}
Use <z-button>Esc</z-button> to go to your home view.
{{#*inline "z-button"}}<span class="keyboard-button">{{> @partial-block}}</span>{{/inline}}
{{/tr}}
</li>
{{/if}}
</ul>
</p>
</li>
{{#if current_home_view_and_escape_navigation_enabled}}
<li>
{{#tr}}
Use <z-button>Esc</z-button> to go to your home view.
{{#*inline "z-button"}}<span class="keyboard-button">{{> @partial-block}}</span>{{/inline}}
{{/tr}}
</li>
{{/if}}
</ul>
</div>

40
web/templates/try_zulip_modal.hbs
View File

@@ -1,26 +1,28 @@
<p>
{{t "Explore how hundreds of community participants use Zulip to brainstorm ideas, discuss technical challenges, ask questions, and give feedback:" }}
</p>
<ul>
<li>
{{#tr}}
You'll see a list of <z-highlight>recent conversations</z-highlight>, where each conversation is
labeled with a topic by the person who started it. Click on a conversation to
view it. You can always get back to recent conversations from the left sidebar.
{{#*inline "z-highlight"}}<b class="highlighted-element">{{> @partial-block}}</b>{{/inline}}
{{/tr}}
</li>
<li>
{{#tr}}
Click the name of a channel in the left sidebar, and click on any topic underneath
to view one conversation at a time. You can explore discussions of changes to the
design of the Zulip app in <z-highlight>#design</z-highlight>, or see ongoing issue
investigations in <z-highlight>#issues</z-highlight>.
{{#*inline "z-highlight"}}<b class="highlighted-element">{{> @partial-block}}</b>{{/inline}}
{{/tr}}
</li>
</ul>
<ul>
<li>
{{#tr}}
You'll see a list of <z-highlight>recent conversations</z-highlight>, where each conversation is
labeled with a topic by the person who started it. Click on a conversation to
view it. You can always get back to recent conversations from the left sidebar.
{{#*inline "z-highlight"}}<b class="highlighted-element">{{> @partial-block}}</b>{{/inline}}
{{/tr}}
</li>
<li>
{{#tr}}
Click the name of a channel in the left sidebar, and click on any topic underneath
to view one conversation at a time. You can explore discussions of changes to the
design of the Zulip app in <z-highlight>#design</z-highlight>, or see ongoing issue
investigations in <z-highlight>#issues</z-highlight>.
{{#*inline "z-highlight"}}<b class="highlighted-element">{{> @partial-block}}</b>{{/inline}}
{{/tr}}
</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}}