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

templates: Use upstream Handlebars partials syntax. 

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2019-07-10 19:05:28 -07:00 committed by Tim Abbott
parent 0bd5c46e40
commit 0c565f50be
33 changed files with 189 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/templates/admin_profile_field_list.hbs
View File

@ -42,7 +42,7 @@
<hr /> <hr />
<div class="edit_profile_field_choices_container"> <div class="edit_profile_field_choices_container">
{{#each choices}} {{#each choices}}
{{partial "settings/profile_field_choice" }} {{> settings/profile_field_choice }}
{{/each}} {{/each}}
</div> </div>
</div> </div>

8
static/templates/admin_settings_modals.hbs
View File

@ -1,9 +1,9 @@
{{ partial "settings/deactivation_user_modal" }} {{> settings/deactivation_user_modal }}
{{ partial "settings/realm_domains_modal" }} {{> settings/realm_domains_modal }}
{{ partial "settings/revoke_invite_modal" }} {{> settings/revoke_invite_modal }}
{{ partial "settings/resend_invite_modal" }} {{> settings/resend_invite_modal }}
<div id="user-info-form-modal-container"></div> <div id="user-info-form-modal-container"></div>

28
static/templates/admin_tab.hbs
View File

@ -1,30 +1,30 @@
<div class="alert" id="organization-status"></div> <div class="alert" id="organization-status"></div>
<div id="revoke_invite_modal_holder"></div> <div id="revoke_invite_modal_holder"></div>
{{ partial "admin_settings_modals"}} {{> admin_settings_modals}}
{{ partial "settings/organization_profile_admin" }} {{> settings/organization_profile_admin }}
{{ partial "settings/organization_settings_admin" }} {{> settings/organization_settings_admin }}
{{ partial "settings/organization_permissions_admin" }} {{> settings/organization_permissions_admin }}
{{ partial "settings/emoji_settings_admin" }} {{> settings/emoji_settings_admin }}
{{ partial "settings/user_list_admin" }} {{> settings/user_list_admin }}
{{ partial "settings/deactivated_users_admin" }} {{> settings/deactivated_users_admin }}
{{ partial "settings/bot_list_admin" }} {{> settings/bot_list_admin }}
{{ partial "settings/default_streams_list_admin" }} {{> settings/default_streams_list_admin }}
{{ partial "settings/auth_methods_settings_admin" }} {{> settings/auth_methods_settings_admin }}
{{ partial "settings/linkifier_settings_admin" }} {{> settings/linkifier_settings_admin }}
{{ partial "settings/invites_list_admin" }} {{> settings/invites_list_admin }}
{{ partial "user_groups_admin" }} {{> user_groups_admin }}
{{ partial "settings/profile_field_settings_admin" }} {{> settings/profile_field_settings_admin }}

2
static/templates/archive_message_group.hbs
View File

@ -6,7 +6,7 @@
{{/if}} {{/if}}
<div class="recipient_row"> <div class="recipient_row">
{{partial "archive_recipient_row" }} {{> archive_recipient_row }}
{{#each message_containers}} {{#each message_containers}}
{{{ this }}} {{{ this }}}
{{/each}} {{/each}}

2
static/templates/draft_table_body.hbs
View File

@ -19,7 +19,7 @@
</div> </div>
{{#each drafts}} {{#each drafts}}
{{partial "draft"}} {{> draft}}
{{/each}} {{/each}}
</div> </div>
</div> </div>

2
static/templates/edit_bot.hbs
View File

@ -14,7 +14,7 @@
<div class="edit-bot-owner"> <div class="edit-bot-owner">
<label for="bot_owner_select">{{t "Owner" }}</label> <label for="bot_owner_select">{{t "Owner" }}</label>
<div class="select-form"> <div class="select-form">
{{partial "bot_owner_select" }} {{> bot_owner_select }}
</div> </div>
</div> </div>
<div id="service_data"> <div id="service_data">

2
static/templates/emoji_popover_content.hbs
View File

@ -13,7 +13,7 @@
<div class="emoji-popover-subheading" data-section="{{name}}">{{name}}</div> <div class="emoji-popover-subheading" data-section="{{name}}">{{name}}</div>
<div class="emoji-collection" data-section="{{name}}"> <div class="emoji-collection" data-section="{{name}}">
{{#each this.emojis }} {{#each this.emojis }}
{{ partial "emoji_popover_emoji" "type" "emoji_picker_emoji" "section" @../index "index" @index "message_id" ../../message_id "emoji_dict" this}} {{> emoji_popover_emoji type="emoji_picker_emoji" section=@../index index=@index message_id=../../message_id emoji_dict=this}}
{{/each}} {{/each}}
</div> </div>
{{/each}} {{/each}}

2
static/templates/emoji_popover_search_results.hbs
View File

@ -1,3 +1,3 @@
{{#each search_results}} {{#each search_results}}
{{ partial "emoji_popover_emoji" "type" "emoji_search_result" "section" "0" "index" @index "message_id" ../message_id "emoji_dict" this }} {{> emoji_popover_emoji type="emoji_search_result" section="0" index=@index message_id=../message_id emoji_dict=this }}
{{/each}} {{/each}}

4
static/templates/me_message.hbs
View File

@ -1,6 +1,6 @@
<span class="message_sender no-select"> <span class="message_sender no-select">
<span class="sender_info_hover"> <span class="sender_info_hover">
{{partial "message_avatar"}} {{> message_avatar}}
</span> </span>
<span class="sender-status"> <span class="sender-status">
@ -14,7 +14,7 @@
</span> </span>
{{#if edited_status_msg}} {{#if edited_status_msg}}
{{partial "edited_notice"}} {{> edited_notice}}
{{/if}} {{/if}}
</span> </span>
</span> </span>

12
static/templates/message_body.hbs
View File

@ -3,7 +3,7 @@
<span class="message_sender sender_info_hover no-select"> <span class="message_sender sender_info_hover no-select">
{{#if include_sender}} {{#if include_sender}}
{{partial "message_avatar"}} {{> message_avatar}}
<span class="sender_name auto-select" role="button" tabindex="0">{{msg/sender_full_name}}</span> <span class="sender_name auto-select" role="button" tabindex="0">{{msg/sender_full_name}}</span>
{{#if sender_is_bot}} {{#if sender_is_bot}}
@ -15,7 +15,7 @@
{{/unless}} {{/unless}}
{{#if status_message}} {{#if status_message}}
{{partial "me_message"}} {{> me_message}}
{{/if}} {{/if}}
<span class="alert-msg pull-right"></span> <span class="alert-msg pull-right"></span>
@ -28,10 +28,10 @@
</span> </span>
{{#if edited_alongside_sender}} {{#if edited_alongside_sender}}
{{partial "edited_notice"}} {{> edited_notice}}
{{/if}} {{/if}}
{{partial "message_controls"}} {{> message_controls}}
</div> </div>
@ -40,7 +40,7 @@
{{/unless}} {{/unless}}
{{#if edited_in_left_col}} {{#if edited_in_left_col}}
{{partial "edited_notice"}} {{> edited_notice}}
{{/if}} {{/if}}
<div class="message_edit"> <div class="message_edit">
@ -48,4 +48,4 @@
</div> </div>
<div class="message_expander message_length_controller" title="{{t 'See the rest of this message' }}">{{t "[More...]" }}</div> <div class="message_expander message_length_controller" title="{{t 'See the rest of this message' }}">{{t "[More...]" }}</div>
<div class="message_condenser message_length_controller" title="{{t 'Make this message take up less space on the screen' }}">{{t "[Condense this message]" }}</div> <div class="message_condenser message_length_controller" title="{{t 'Make this message take up less space on the screen' }}">{{t "[Condense this message]" }}</div>
<div class="message_reactions">{{ partial "message_reactions" }}</div> <div class="message_reactions">{{> message_reactions }}</div>

8
static/templates/message_group.hbs
View File

@ -8,20 +8,20 @@
{{/if}} {{/if}}
{{#if bookend_top}} {{#if bookend_top}}
{{partial "bookend"}} {{> bookend}}
{{/if}} {{/if}}
<div class="recipient_row" id="{{message_group_id}}"> <div class="recipient_row" id="{{message_group_id}}">
{{partial "recipient_row" "use_match_properties" ../use_match_properties}} {{> recipient_row use_match_properties=../use_match_properties}}
{{#each message_containers}} {{#each message_containers}}
{{#with this}} {{#with this}}
{{partial "single_message" "use_match_properties" ../../use_match_properties "table_name" ../../table_name}} {{> single_message use_match_properties=../../use_match_properties table_name=../../table_name}}
{{/with}} {{/with}}
{{/each}} {{/each}}
</div> </div>
{{#if bookend_bottom}} {{#if bookend_bottom}}
{{partial "bookend"}} {{> bookend}}
{{/if}} {{/if}}
{{/with}} {{/with}}

2
static/templates/message_reactions.hbs
View File

@ -1,5 +1,5 @@
{{#each this/msg/message_reactions}} {{#each this/msg/message_reactions}}
{{partial "message_reaction"}} {{> message_reaction}}
{{/each}} {{/each}}
<div class="reaction_button" title="{{t 'Add emoji reaction' }} (:)"> <div class="reaction_button" title="{{t 'Add emoji reaction' }} (:)">
<i class="fa fa-smile-o" role="button" aria-haspopup="true" tabindex="0" aria-label="{{t 'Add emoji reaction' }} (:)"></i> <i class="fa fa-smile-o" role="button" aria-haspopup="true" tabindex="0" aria-label="{{t 'Add emoji reaction' }} (:)"></i>

2
static/templates/settings/auth_methods_settings_admin.hbs
View File

@ -3,7 +3,7 @@
<div id="org-auth_settings" class="admin-table-wrapper org-subsection-parent"> <div id="org-auth_settings" class="admin-table-wrapper org-subsection-parent">
<div class ="subsection-header"> <div class ="subsection-header">
<h3>{{t "Authentication methods" }}</h3> <h3>{{t "Authentication methods" }}</h3>
{{ partial "settings/settings_save_discard_widget" "section_name" "auth_settings" }} {{> settings_save_discard_widget section_name="auth_settings" }}
</div> </div>
<div> <div>

2
static/templates/settings/bot_settings.hbs
View File

@ -88,7 +88,7 @@
<div id="config_inputbox"> <div id="config_inputbox">
{{#each page_params.realm_embedded_bots as |bot index|}} {{#each page_params.realm_embedded_bots as |bot index|}}
{{#each bot.config as |config_value config_key|}} {{#each bot.config as |config_value config_key|}}
{{partial "embedded_bot_config_item" "botname" bot.name "key" config_key "value" config_value}} {{> ../embedded_bot_config_item botname=bot.name key=config_key value=config_value}}
{{/each}} {{/each}}
{{/each}} {{/each}}
</div> </div>

28
static/templates/settings/display_settings.hbs
View File

@ -16,7 +16,7 @@
</a> </a>
</div> </div>
{{ partial "default_language_modal"}} {{> ../default_language_modal}}
</div> </div>
<div id="user-display-settings"> <div id="user-display-settings">
@ -24,11 +24,11 @@
<div class="alert-notification" id="display-settings-status"></div> <div class="alert-notification" id="display-settings-status"></div>
{{#each display_settings.settings.user_display_settings}} {{#each display_settings.settings.user_display_settings}}
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" this setting_name=this
"is_checked" (lookup ../page_params this) is_checked=(lookup ../page_params this)
"label" (lookup ../settings_label this) label=(lookup ../settings_label this)
"render_only" (lookup ../display_settings.render_only this)}} render_only=(lookup ../display_settings.render_only this)}}
{{/each}} {{/each}}
<div class="input-group"> <div class="input-group">
@ -49,10 +49,10 @@
<h3 class="inline-block">{{t "Time settings" }}</h3> <h3 class="inline-block">{{t "Time settings" }}</h3>
<div class="alert-notification" id="time-settings-status"></div> <div class="alert-notification" id="time-settings-status"></div>
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "twenty_four_hour_time" setting_name="twenty_four_hour_time"
"is_checked" page_params.twenty_four_hour_time is_checked=page_params.twenty_four_hour_time
"label" settings_label.twenty_four_hour_time}} label=settings_label.twenty_four_hour_time}}
<div class="input-group"> <div class="input-group">
<label for="timezone" class="dropdown-title">{{t "Time zone" }}</label> <label for="timezone" class="dropdown-title">{{t "Time zone" }}</label>
@ -93,10 +93,10 @@
</div> </div>
</div> </div>
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "translate_emoticons" setting_name="translate_emoticons"
"is_checked" page_params.translate_emoticons is_checked=page_params.translate_emoticons
"label" settings_label.translate_emoticons}} label=settings_label.translate_emoticons}}
</div> </div>
</form> </form>
</div> </div>

2
static/templates/settings/emoji_settings_admin.hbs
View File

@ -1,6 +1,6 @@
<div id="emoji-settings" data-name="emoji-settings" class="settings-section {{#if can_add_emojis}}can-edit{{/if}}"> <div id="emoji-settings" data-name="emoji-settings" class="settings-section {{#if can_add_emojis}}can-edit{{/if}}">
<div class="emoji-settings-tip-container"> <div class="emoji-settings-tip-container">
{{partial "settings/emoji_settings_tip"}} {{> emoji_settings_tip}}
</div> </div>
<form class="form-horizontal admin-emoji-form {{#unless can_add_emojis}}hide{{/unless}}"> <form class="form-horizontal admin-emoji-form {{#unless can_add_emojis}}hide{{/unless}}">
<div class="add-new-emoji-box grey-box"> <div class="add-new-emoji-box grey-box">

52
static/templates/settings/notification_settings.hbs
View File

@ -8,12 +8,12 @@
<p>{{t "Unless I say otherwise for a particular stream, I want:" }}</p> <p>{{t "Unless I say otherwise for a particular stream, I want:" }}</p>
{{#each notification_settings.stream_notification_settings}} {{#each notification_settings.stream_notification_settings}}
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" this setting_name=this
"is_checked" (lookup ../page_params this) is_checked=(lookup ../page_params this)
"label" (lookup ../settings_label this) label=(lookup ../settings_label this)
"realm_push_notifications_enabled" (lookup ../page_params.realm_push_notifications_enabled) realm_push_notifications_enabled=(lookup ../page_params.realm_push_notifications_enabled)
"push_notifications_tooltip" (lookup ../push_notification_tooltip this)}} push_notifications_tooltip=(lookup ../push_notification_tooltip this)}}
{{/each}} {{/each}}
<p class="notification-settings-note"> <p class="notification-settings-note">
@ -26,12 +26,12 @@
<div class="alert-notification" id="pm-mention-notify-settings-status"></div> <div class="alert-notification" id="pm-mention-notify-settings-status"></div>
{{#each notification_settings.pm_mention_notification_settings}} {{#each notification_settings.pm_mention_notification_settings}}
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" this setting_name=this
"is_checked" (lookup ../page_params this) is_checked=(lookup ../page_params this)
"label" (lookup ../settings_label this) label=(lookup ../settings_label this)
"realm_push_notifications_enabled" (lookup ../page_params.realm_push_notifications_enabled) realm_push_notifications_enabled=(lookup ../page_params.realm_push_notifications_enabled)
"push_notifications_tooltip" (lookup ../push_notification_tooltip this)}} push_notifications_tooltip=(lookup ../push_notification_tooltip this)}}
{{/each}} {{/each}}
</div> </div>
@ -43,10 +43,10 @@
<h5>{{t "Desktop" }}</h5> <h5>{{t "Desktop" }}</h5>
{{#each notification_settings.desktop_notification_settings}} {{#each notification_settings.desktop_notification_settings}}
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" this setting_name=this
"is_checked" (lookup ../page_params this) is_checked=(lookup ../page_params this)
"label" (lookup ../settings_label this)}} label=(lookup ../settings_label this)}}
{{/each}} {{/each}}
<label for="notification_sound"> <label for="notification_sound">
@ -70,21 +70,21 @@
<h5>{{t "Mobile" }}</h5> <h5>{{t "Mobile" }}</h5>
{{#each notification_settings.mobile_notification_settings}} {{#each notification_settings.mobile_notification_settings}}
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" this setting_name=this
"is_checked" (lookup ../page_params this) is_checked=(lookup ../page_params this)
"label" (lookup ../settings_label this) label=(lookup ../settings_label this)
"realm_push_notifications_enabled" (lookup ../page_params.realm_push_notifications_enabled) realm_push_notifications_enabled=(lookup ../page_params.realm_push_notifications_enabled)
"push_notifications_tooltip" (lookup ../push_notification_tooltip this)}} push_notifications_tooltip=(lookup ../push_notification_tooltip this)}}
{{/each}} {{/each}}
<h5>{{t "Email" }}</h5> <h5>{{t "Email" }}</h5>
{{#each notification_settings.email_notification_settings}} {{#each notification_settings.email_notification_settings}}
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" this setting_name=this
"is_checked" (lookup ../page_params this) is_checked=(lookup ../page_params this)
"label" (lookup ../settings_label this)}} label=(lookup ../settings_label this)}}
{{/each}} {{/each}}
</div> </div>

36
static/templates/settings/organization_permissions_admin.hbs
View File

@ -4,7 +4,7 @@
<div id="org-org-join" class="org-subsection-parent"> <div id="org-org-join" class="org-subsection-parent">
<div class="subsection-header"> <div class="subsection-header">
<h3>{{t "Joining the organization" }}</h3> <h3>{{t "Joining the organization" }}</h3>
{{ partial "settings/settings_save_discard_widget" "section_name" "org-join" }} {{> settings_save_discard_widget section_name="org-join" }}
</div> </div>
<div class="m-10 inline-block organization-permissions-parent"> <div class="m-10 inline-block organization-permissions-parent">
<div class="input-group"> <div class="input-group">
@ -36,33 +36,33 @@
<div id="org-user-identity" class="org-subsection-parent"> <div id="org-user-identity" class="org-subsection-parent">
<div class="subsection-header"> <div class="subsection-header">
<h3>{{t "User identity" }}</h3> <h3>{{t "User identity" }}</h3>
{{ partial "settings/settings_save_discard_widget" "section_name" "user-identity" }} {{> settings_save_discard_widget section_name="user-identity" }}
</div> </div>
<div class="inline-block organization-permissions-parent"> <div class="inline-block organization-permissions-parent">
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "realm_name_changes_disabled" setting_name="realm_name_changes_disabled"
"prefix" "id_" prefix="id_"
"is_checked" realm_name_changes_disabled is_checked=realm_name_changes_disabled
"label" admin_settings_label.realm_name_changes_disabled}} label=admin_settings_label.realm_name_changes_disabled}}
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "realm_email_changes_disabled" setting_name="realm_email_changes_disabled"
"prefix" "id_" prefix="id_"
"is_checked" realm_email_changes_disabled is_checked=realm_email_changes_disabled
"label" admin_settings_label.realm_email_changes_disabled}} label=admin_settings_label.realm_email_changes_disabled}}
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "realm_avatar_changes_disabled" setting_name="realm_avatar_changes_disabled"
"prefix" "id_" prefix="id_"
"is_checked" realm_avatar_changes_disabled is_checked=realm_avatar_changes_disabled
"label" admin_settings_label.realm_avatar_changes_disabled}} label=admin_settings_label.realm_avatar_changes_disabled}}
</div> </div>
</div> </div>
<div id="org-other-permissions" class="org-subsection-parent"> <div id="org-other-permissions" class="org-subsection-parent">
<div class="subsection-header"> <div class="subsection-header">
<h3>{{t "Other permissions" }}</h3> <h3>{{t "Other permissions" }}</h3>
{{ partial "settings/settings_save_discard_widget" "section_name" "other-permissions" }} {{> settings_save_discard_widget section_name="other-permissions" }}
</div> </div>
<div class="m-10 inline-block organization-permissions-parent"> <div class="m-10 inline-block organization-permissions-parent">
<div class="input-group"> <div class="input-group">

4
static/templates/settings/organization_profile_admin.hbs
View File

@ -9,7 +9,7 @@
<i class="fa fa-question-circle-o" aria-hidden="true"></i> <i class="fa fa-question-circle-o" aria-hidden="true"></i>
</a> </a>
</h3> </h3>
{{ partial "settings/settings_save_discard_widget" "section_name" "org-profile" }} {{> settings_save_discard_widget section_name="org-profile" }}
</div> </div>
<div class="organization-settings-parent"> <div class="organization-settings-parent">
@ -116,7 +116,7 @@
{{t 'Deactivate organization' }} {{t 'Deactivate organization' }}
</button> </button>
</div> </div>
{{ partial "settings/deactivate_realm_modal"}} {{> deactivate_realm_modal}}
</div> </div>
</form> </form>
</div> </div>

98
static/templates/settings/organization_settings_admin.hbs
View File

@ -10,7 +10,7 @@
<i class="fa fa-question-circle-o" aria-hidden="true"></i> <i class="fa fa-question-circle-o" aria-hidden="true"></i>
</a> </a>
</h3> </h3>
{{ partial "settings/settings_save_discard_widget" "section_name" "msg-editing" }} {{> settings_save_discard_widget section_name="msg-editing" }}
</div> </div>
<div class="inline-block organization-settings-parent"> <div class="inline-block organization-settings-parent">
<div class="input-group"> <div class="input-group">
@ -32,17 +32,17 @@
</div> </div>
</div> </div>
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "realm_allow_community_topic_editing" setting_name="realm_allow_community_topic_editing"
"prefix" "id_" prefix="id_"
"is_checked" realm_allow_community_topic_editing is_checked=realm_allow_community_topic_editing
"label" admin_settings_label.realm_allow_community_topic_editing}} label=admin_settings_label.realm_allow_community_topic_editing}}
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "realm_allow_edit_history" setting_name="realm_allow_edit_history"
"prefix" "id_" prefix="id_"
"is_checked" realm_allow_edit_history is_checked=realm_allow_edit_history
"label" admin_settings_label.realm_allow_edit_history}} label=admin_settings_label.realm_allow_edit_history}}
<div class="input-group"> <div class="input-group">
<label for="realm_msg_delete_limit_setting" class="dropdown-title"> <label for="realm_msg_delete_limit_setting" class="dropdown-title">
@ -72,20 +72,20 @@
<div id="org-notifications" class="org-subsection-parent"> <div id="org-notifications" class="org-subsection-parent">
<div class="subsection-header"> <div class="subsection-header">
<h3>{{t "Notifications" }}</h3> <h3>{{t "Notifications" }}</h3>
{{ partial "settings/settings_save_discard_widget" "section_name" "notifications" }} {{> settings_save_discard_widget section_name="notifications" }}
</div> </div>
<div class="inline-block organization-settings-parent"> <div class="inline-block organization-settings-parent">
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "realm_send_welcome_emails" setting_name="realm_send_welcome_emails"
"prefix" "id_" prefix="id_"
"is_checked" realm_send_welcome_emails is_checked=realm_send_welcome_emails
"label" admin_settings_label.realm_send_welcome_emails}} label=admin_settings_label.realm_send_welcome_emails}}
{{#if settings_send_digest_emails }} {{#if settings_send_digest_emails }}
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "realm_digest_emails_enabled" setting_name="realm_digest_emails_enabled"
"prefix" "id_" prefix="id_"
"is_checked" realm_digest_emails_enabled is_checked=realm_digest_emails_enabled
"label" admin_settings_label.realm_digest_emails_enabled}} label=admin_settings_label.realm_digest_emails_enabled}}
{{/if}} {{/if}}
<div class="input-group"> <div class="input-group">
<label for="realm_digest_weekday" class="dropdown-title">{{t "Day of the week to send digests" }}</label> <label for="realm_digest_weekday" class="dropdown-title">{{t "Day of the week to send digests" }}</label>
@ -152,7 +152,7 @@
<div id="org-user-defaults" class="org-subsection-parent"> <div id="org-user-defaults" class="org-subsection-parent">
<div class="subsection-header"> <div class="subsection-header">
<h3>{{t "Default user settings" }}</h3> <h3>{{t "Default user settings" }}</h3>
{{ partial "settings/settings_save_discard_widget" "section_name" "user-defaults" }} {{> settings_save_discard_widget section_name="user-defaults" }}
</div> </div>
<p>{{t "Default settings for new users joining this organization." }}</p> <p>{{t "Default settings for new users joining this organization." }}</p>
<div class="inline-block organization-settings-parent"> <div class="inline-block organization-settings-parent">
@ -164,18 +164,18 @@
{{/each}} {{/each}}
</select> </select>
</div> </div>
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "realm_default_twenty_four_hour_time" setting_name="realm_default_twenty_four_hour_time"
"prefix" "id_" prefix="id_"
"is_checked" realm_default_twenty_four_hour_time is_checked=realm_default_twenty_four_hour_time
"label" admin_settings_label.realm_default_twenty_four_hour_time}} label=admin_settings_label.realm_default_twenty_four_hour_time}}
</div> </div>
</div> </div>
<div id="org-other-settings" class="org-subsection-parent"> <div id="org-other-settings" class="org-subsection-parent">
<div class="subsection-header"> <div class="subsection-header">
<h3>{{t "Other settings" }}</h3> <h3>{{t "Other settings" }}</h3>
{{ partial "settings/settings_save_discard_widget" "section_name" "other-settings" }} {{> settings_save_discard_widget section_name="other-settings" }}
</div> </div>
<div class="inline-block organization-settings-parent"> <div class="inline-block organization-settings-parent">
<div class="input-group"> <div class="input-group">
@ -227,11 +227,11 @@
</div> </div>
</div> </div>
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "realm_message_content_allowed_in_email_notifications" setting_name="realm_message_content_allowed_in_email_notifications"
"prefix" "id_" prefix="id_"
"is_checked" realm_message_content_allowed_in_email_notifications is_checked=realm_message_content_allowed_in_email_notifications
"label" admin_settings_label.realm_message_content_allowed_in_email_notifications}} label=admin_settings_label.realm_message_content_allowed_in_email_notifications}}
{{#if false}} {{#if false}}
<div class="input-group"> <div class="input-group">
@ -245,26 +245,26 @@
value="{{ realm_message_retention_days }}"/> value="{{ realm_message_retention_days }}"/>
</div> </div>
{{/if}} {{/if}}
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "realm_mandatory_topics" setting_name="realm_mandatory_topics"
"prefix" "id_" prefix="id_"
"is_checked" realm_mandatory_topics is_checked=realm_mandatory_topics
"label" admin_settings_label.realm_mandatory_topics}} label=admin_settings_label.realm_mandatory_topics}}
{{#if server_inline_image_preview}} {{#if server_inline_image_preview}}
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "realm_inline_image_preview" setting_name="realm_inline_image_preview"
"prefix" "id_" prefix="id_"
"is_checked" realm_inline_image_preview is_checked=realm_inline_image_preview
"label" admin_settings_label.realm_inline_image_preview}} label=admin_settings_label.realm_inline_image_preview}}
{{/if}} {{/if}}
{{#if server_inline_url_embed_preview}} {{#if server_inline_url_embed_preview}}
{{partial "settings/settings_checkbox" {{> settings_checkbox
"setting_name" "realm_inline_url_embed_preview" setting_name="realm_inline_url_embed_preview"
"prefix" "id_" prefix="id_"
"is_checked" realm_inline_url_embed_preview is_checked=realm_inline_url_embed_preview
"label" admin_settings_label.realm_inline_url_embed_preview}} label=admin_settings_label.realm_inline_url_embed_preview}}
{{/if}} {{/if}}
</div> </div>
</div> </div>

14
static/templates/settings_tab.hbs
View File

@ -1,15 +1,15 @@
<div id="settings-change-box" class="new-style"> <div id="settings-change-box" class="new-style">
{{ partial "settings/account_settings" }} {{> settings/account_settings }}
{{ partial "settings/display_settings" }} {{> settings/display_settings }}
{{ partial "settings/notification_settings" }} {{> settings/notification_settings }}
{{ partial "settings/bot_settings" }} {{> settings/bot_settings }}
{{ partial "settings/alert_word_settings" }} {{> settings/alert_word_settings }}
{{ partial "settings/attachments_settings" }} {{> settings/attachments_settings }}
{{ partial "settings/muted_topics_settings" }} {{> settings/muted_topics_settings }}
</div> </div>

2
static/templates/single_message.hbs
View File

@ -8,7 +8,7 @@
<div class="messagebox {{#if next_is_same_sender}}next_is_same_sender{{/if}}" <div class="messagebox {{#if next_is_same_sender}}next_is_same_sender{{/if}}"
{{#if msg/is_stream}}style="box-shadow: inset 2px 0px 0px 0px {{background_color}}, -1px 0px 0px 0px {{background_color}};"{{/if}}> {{#if msg/is_stream}}style="box-shadow: inset 2px 0px 0px 0px {{background_color}}, -1px 0px 0px 0px {{background_color}};"{{/if}}>
<div class="messagebox-content"> <div class="messagebox-content">
{{partial "message_body"}} {{> message_body}}
</div> </div>
</div> </div>
</div> </div>

2
static/templates/stream_creation_form.hbs
View File

@ -27,7 +27,7 @@
{{t 'These settings are explained in detail in the <a target="_blank" href="/help/stream-permissions">help center</a>.'}} {{t 'These settings are explained in detail in the <a target="_blank" href="/help/stream-permissions">help center</a>.'}}
</div> </div>
{{ partial "stream_types" "is_public" true }} {{> stream_types is_public=true }}
<div id="announce-new-stream"> <div id="announce-new-stream">
<label class="checkbox"> <label class="checkbox">

2
static/templates/stream_sidebar_row.hbs
View File

@ -7,7 +7,7 @@
<span id="stream_sidebar_privacy_swatch_{{id}}" class="stream-privacy filter-icon" style="color: {{color}}"> <span id="stream_sidebar_privacy_swatch_{{id}}" class="stream-privacy filter-icon" style="color: {{color}}">
{{! This controls whether the swatchnext to streams in the left sidebar has a lock icon. }} {{! This controls whether the swatchnext to streams in the left sidebar has a lock icon. }}
{{ partial "stream_privacy" }} {{> stream_privacy }}
</span> </span>
<a href="{{uri}}" class="stream-name">{{name}}</a> <a href="{{uri}}" class="stream-name">{{name}}</a>

4
static/templates/subscription.hbs
View File

@ -7,12 +7,12 @@
<path d="M448,71.9c-17.3-13.4-41.5-9.3-54.1,9.1L214,344.2l-99.1-107.3c-14.6-16.6-39.1-17.4-54.7-1.8 c-15.6,15.5-16.4,41.6-1.7,58.1c0,0,120.4,133.6,137.7,147c17.3,13.4,41.5,9.3,54.1-9.1l206.3-301.7 C469.2,110.9,465.3,85.2,448,71.9z"/> <path d="M448,71.9c-17.3-13.4-41.5-9.3-54.1,9.1L214,344.2l-99.1-107.3c-14.6-16.6-39.1-17.4-54.7-1.8 c-15.6,15.5-16.4,41.6-1.7,58.1c0,0,120.4,133.6,137.7,147c17.3,13.4,41.5,9.3,54.1-9.1l206.3-301.7 C469.2,110.9,465.3,85.2,448,71.9z"/>
</svg> </svg>
</div> </div>
{{ partial "subscription_setting_icon" }} {{> subscription_setting_icon }}
<div class="sub-info-box"> <div class="sub-info-box">
<div class="top-bar"> <div class="top-bar">
<div class="stream-name">{{name}}</div> <div class="stream-name">{{name}}</div>
<div class="subscriber-count" data-toggle="tooltip" title="{{t 'Subscriber count' }}"> <div class="subscriber-count" data-toggle="tooltip" title="{{t 'Subscriber count' }}">
{{partial "subscription_count"}} {{> subscription_count}}
</div> </div>
</div> </div>
<div class="bottom-bar"> <div class="bottom-bar">

24
static/templates/subscription_settings.hbs
View File

@ -41,7 +41,7 @@
</div> </div>
<div class="subscription-type"> <div class="subscription-type">
<div class="subscription-type-text"> <div class="subscription-type-text">
{{partial "subscription_type"}} {{> subscription_type}}
</div> </div>
<a class="change-stream-privacy" {{#unless can_change_stream_permissions}}style="display: none;"{{/unless}}>[{{t "Change" }}]</a> <a class="change-stream-privacy" {{#unless can_change_stream_permissions}}style="display: none;"{{/unless}}>[{{t "Change" }}]</a>
</div> </div>
@ -51,16 +51,16 @@
<ul class="grey-box"> <ul class="grey-box">
{{#each settings}} {{#each settings}}
<li> <li>
{{partial "stream_settings_checkbox" {{> stream_settings_checkbox
"setting_name" name setting_name=name
"prefix" "sub_" prefix="sub_"
"suffix" "_setting" suffix="_setting"
"is_checked" value is_checked=value
"is_muted" (lookup ../sub "is_muted") is_muted=(lookup ../sub "is_muted")
"stream_id" (lookup ../sub "stream_id") stream_id=(lookup ../sub "stream_id")
"notification_setting" is_notification_setting notification_setting=is_notification_setting
"realm_setting_disabled" (lookup ../realm_settings name) realm_setting_disabled=(lookup ../realm_settings name)
"label" label}} label=label}}
</li> </li>
{{/each}} {{/each}}
<li> <li>
@ -80,7 +80,7 @@
</div> </div>
{{#with sub}} {{#with sub}}
<div class="subscription-members-setting"> <div class="subscription-members-setting">
{{partial "subscription_members"}} {{> subscription_members}}
</div> </div>
{{/with}} {{/with}}
</div> </div>

2
static/templates/subscription_stream_privacy_modal.hbs
View File

@ -3,7 +3,7 @@
<button type="button" class="close close-privacy-modal" data-dismiss="modal" aria-label="{{t 'Close' }}"><span aria-hidden="true">&times;</span></button> <button type="button" class="close close-privacy-modal" data-dismiss="modal" aria-label="{{t 'Close' }}"><span aria-hidden="true">&times;</span></button>
<h3 id="stream_privacy_modal_label">{{t "Change stream permissions for #" }}{{ stream_name }}<span class="email"></span></h3> <h3 id="stream_privacy_modal_label">{{t "Change stream permissions for #" }}{{ stream_name }}<span class="email"></span></h3>
</div> </div>
{{ partial "stream_types" }} {{> stream_types }}
<div class="modal-footer"> <div class="modal-footer">
<button class="button rounded close-privacy-modal" data-dismiss="modal">{{t "Cancel" }}</button> <button class="button rounded close-privacy-modal" data-dismiss="modal">{{t "Cancel" }}</button>
<button class="button rounded btn-danger" id="change-stream-privacy-button" <button class="button rounded btn-danger" id="change-stream-privacy-button"

2
static/templates/subscription_table_body.hbs
View File

@ -37,7 +37,7 @@
<div class="settings" data-simplebar data-simplebar-auto-hide="false"> <div class="settings" data-simplebar data-simplebar-auto-hide="false">
{{!-- edit stream here --}} {{!-- edit stream here --}}
</div> </div>
{{ partial "stream_creation_form" }} {{> stream_creation_form }}
</div> </div>
</div> </div>
</div> </div>

2
static/templates/subscriptions.hbs
View File

@ -1,3 +1,3 @@
{{#each subscriptions}} {{#each subscriptions}}
{{partial "subscription"}} {{> subscription}}
{{/each}} {{/each}}

2
static/templates/typing_notifications.hbs
View File

@ -1,6 +1,6 @@
{{! Typing Notifications }} {{! Typing Notifications }}
<ul id="typing_notification_list"> <ul id="typing_notification_list">
{{#each users}} {{#each users}}
{{partial "typing_notification"}} {{> typing_notification}}
{{/each}} {{/each}}
</ul> </ul>

2
static/templates/user_presence_rows.hbs
View File

@ -1,4 +1,4 @@
{{! User Presence rows }} {{! User Presence rows }}
{{#each users}} {{#each users}}
{{partial "user_presence_row"}} {{> user_presence_row}}
{{/each}} {{/each}}

2
tools/lib/template_parser.py
View File

@ -61,7 +61,7 @@ def tokenize(text):
return looking_at("{#") return looking_at("{#")
def looking_at_handlebarpartial() -> bool: def looking_at_handlebarpartial() -> bool:
return looking_at("{{partial") return looking_at("{{>")
def looking_at_html_start(): def looking_at_html_start():
# type: () -> bool # type: () -> bool

20
tools/tests/test_pretty_print.py
View File

@ -209,7 +209,7 @@ BAD_HTML8 = """
<div class="anything">{{{test}}}</div> <div class="anything">{{{test}}}</div>
{{/if}} {{/if}}
{{#if foobar2}} {{#if foobar2}}
{{partial "teststuff"}} {{> teststuff}}
{{/if}} {{/if}}
{{/with}} {{/with}}
{{/each}} {{/each}}
@ -222,7 +222,7 @@ GOOD_HTML8 = """
<div class="anything">{{{test}}}</div> <div class="anything">{{{test}}}</div>
{{/if}} {{/if}}
{{#if foobar2}} {{#if foobar2}}
{{partial "teststuff"}} {{> teststuff}}
{{/if}} {{/if}}
{{/with}} {{/with}}
{{/each}} {{/each}}
@ -422,19 +422,19 @@ GOOD_HTML15 = """
BAD_HTML16 = """ BAD_HTML16 = """
<div> <div>
{{partial "settings_checkbox" {{> settings_checkbox
"setting_name" "realm_name_in_notifications" setting_name="realm_name_in_notifications"
"is_checked" page_params.realm_name_in_notifications is_checked=page_params.realm_name_in_notifications
"label" settings_label.realm_name_in_notifications}} label=settings_label.realm_name_in_notifications}}
</div> </div>
""" """
GOOD_HTML16 = """ GOOD_HTML16 = """
<div> <div>
{{partial "settings_checkbox" {{> settings_checkbox
"setting_name" "realm_name_in_notifications" setting_name="realm_name_in_notifications"
"is_checked" page_params.realm_name_in_notifications is_checked=page_params.realm_name_in_notifications
"label" settings_label.realm_name_in_notifications}} label=settings_label.realm_name_in_notifications}}
</div> </div>
""" """