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

linter: Make html singleton tags use 2 space indentation.

This commit is contained in:
Aditya Bansal 2018-04-03 13:37:23 +05:30 committed by Tim Abbott
parent 7eacf2aa9a
commit 2fe012ffff
31 changed files with 154 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/templates/alert_word_settings_item.handlebars
View File

@ -9,7 +9,7 @@
<div class="input-group"> <div class="input-group">
<label for="create_alert_word_name">{{t "New alert word" }}</label> <label for="create_alert_word_name">{{t "New alert word" }}</label>
<input type="text" name="alert_word_name" id="create_alert_word_name" class="required" <input type="text" name="alert_word_name" id="create_alert_word_name" class="required"
maxlength=100 placeholder="{{t 'Alert word' }}" value="" /> maxlength=100 placeholder="{{t 'Alert word' }}" value="" />
</div> </div>
<button class="button rounded sea-green add-alert-word" id="create_alert_word_button" type="button"> <button class="button rounded sea-green add-alert-word" id="create_alert_word_button" type="button">
{{t 'Add alert word'}} {{t 'Add alert word'}}

2
static/templates/embedded_bot_config_item.handlebars
View File

@ -1,5 +1,5 @@
<div class="input-group" name="{{botname}}" id="{{botname}}_{{key}}"> <div class="input-group" name="{{botname}}" id="{{botname}}_{{key}}">
<label for="{{botname}}_{{key}}_input">{{key}}</label> <label for="{{botname}}_{{key}}_input">{{key}}</label>
<input type="text" name="{{key}}" id="{{botname}}_{{key}}_input" <input type="text" name="{{key}}" id="{{botname}}_{{key}}_input"
maxlength=1000 placeholder="{{value}}" value="" /> maxlength=1000 placeholder="{{value}}" value="" />
</div> </div>

2
static/templates/invite_subscription.handlebars
View File

@ -8,7 +8,7 @@
<label class="checkbox display-block"> <label class="checkbox display-block">
<input type="checkbox" name="stream" value="{{name}}" <input type="checkbox" name="stream" value="{{name}}"
{{#if default_stream}}checked="checked"{{/if}} /> {{#if default_stream}}checked="checked"{{/if}} />
<span></span> <span></span>
{{#if invite_only}}<i class="fa fa-lock" aria-hidden="true"></i>{{/if}} {{#if invite_only}}<i class="fa fa-lock" aria-hidden="true"></i>{{/if}}
{{name}} {{name}}

2
static/templates/new_stream_users.handlebars
View File

@ -19,7 +19,7 @@
<br /> <br />
<input class="add-user-list-filter" name="user_list_filter" type="text" <input class="add-user-list-filter" name="user_list_filter" type="text"
autocomplete="off" placeholder="{{t "Filter" }}" /> autocomplete="off" placeholder="{{t "Filter" }}" />
<div> <div>

8
static/templates/settings/account-settings.handlebars
View File

@ -48,8 +48,8 @@
</button> </button>
</a> </a>
<i class="icon-vector-question-sign change_name_tooltip settings-info-icon" data-toggle="tooltip" <i class="icon-vector-question-sign change_name_tooltip settings-info-icon" data-toggle="tooltip"
{{#if page_params.is_admin}}style="display:none"{{else}}{{#unless page_params.realm_name_changes_disabled}}style="display:none"{{/unless}}{{/if}} {{#if page_params.is_admin}}style="display:none"{{else}}{{#unless page_params.realm_name_changes_disabled}}style="display:none"{{/unless}}{{/if}}
title="{{t 'Changing your name has been disabled by your Zulip organization administrators. Contact an administrator for help.' }}"/> title="{{t 'Changing your name has been disabled by your Zulip organization administrators. Contact an administrator for help.' }}"/>
</div> </div>
<div id="change_full_name_modal" class="modal modal-bg hide" tabindex="-1" role="dialog" <div id="change_full_name_modal" class="modal modal-bg hide" tabindex="-1" role="dialog"
aria-labelledby="change_full_name_modal_label" aria-hidden="true"> aria-labelledby="change_full_name_modal_label" aria-hidden="true">
@ -103,7 +103,7 @@
<div class="field"> <div class="field">
<label for="new_password" class="title">{{t "New password" }}</label> <label for="new_password" class="title">{{t "New password" }}</label>
<input type="password" autocomplete="off" name="new_password" id="new_password" class="w-200 inline-block" value="" <input type="password" autocomplete="off" name="new_password" id="new_password" class="w-200 inline-block" value=""
data-min-length="{{ page_params.password_min_length }}" data-min-guesses="{{ page_params.password_min_guesses }}" /> data-min-length="{{ page_params.password_min_length }}" data-min-guesses="{{ page_params.password_min_guesses }}" />
<div class="progress inline-block" id="pw_strength"> <div class="progress inline-block" id="pw_strength">
<div class="bar bar-danger fade" style="width: 10%;"></div> <div class="bar bar-danger fade" style="width: 10%;"></div>
</div> </div>
@ -192,7 +192,7 @@
<div class="control-group"> <div class="control-group">
<label for="password" class="control-label">{{t "Current password" }}</label> <label for="password" class="control-label">{{t "Current password" }}</label>
<input type="password" autocomplete="off" <input type="password" autocomplete="off"
name="password" id="get_api_key_password" value="" /> name="password" id="get_api_key_password" value="" />
</div> </div>
<div class="control-group"> <div class="control-group">
<button type="submit" name="view_api_key" <button type="submit" name="view_api_key"

2
static/templates/settings/admin-realm-domains-list.handlebars
View File

@ -4,7 +4,7 @@
<td> <td>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" class="allow-subdomains" <input type="checkbox" class="allow-subdomains"
{{#if allow_subdomains}} checked="checked" {{/if}} /> {{#if allow_subdomains}} checked="checked" {{/if}} />
<span></span> <span></span>
</label> </label>
</td> </td>

6
static/templates/settings/bot-settings.handlebars
View File

@ -55,13 +55,13 @@
<div class="input-group"> <div class="input-group">
<label for="create_bot_name">{{t "Full name" }}</label> <label for="create_bot_name">{{t "Full name" }}</label>
<input type="text" name="bot_name" id="create_bot_name" class="required" <input type="text" name="bot_name" id="create_bot_name" class="required"
maxlength=100 placeholder="{{t 'Cookie Bot' }}" value="" /> maxlength=100 placeholder="{{t 'Cookie Bot' }}" value="" />
<div><label for="create_bot_name" generated="true" class="text-error"></label></div> <div><label for="create_bot_name" generated="true" class="text-error"></label></div>
</div> </div>
<div class="input-group"> <div class="input-group">
<label for="bot_short_name">{{t "Username" }}</label> <label for="bot_short_name">{{t "Username" }}</label>
<input type="text" name="bot_short_name" id="create_bot_short_name" class="required bot_local_part" <input type="text" name="bot_short_name" id="create_bot_short_name" class="required bot_local_part"
placeholder="{{t 'cookie' }}" value="" /> placeholder="{{t 'cookie' }}" value="" />
-bot@{{ page_params.realm_bot_domain }} -bot@{{ page_params.realm_bot_domain }}
<div> <div>
<label for="create_bot_short_name" generated="true" class="text-error"></label> <label for="create_bot_short_name" generated="true" class="text-error"></label>
@ -71,7 +71,7 @@
<div class="input-group"> <div class="input-group">
<label for="create_payload_url">{{t "Endpoint URL" }}</label> <label for="create_payload_url">{{t "Endpoint URL" }}</label>
<input type="text" name="payload_url" id="create_payload_url" <input type="text" name="payload_url" id="create_payload_url"
maxlength=100 placeholder="https://hostname.example.com/bots/followup" value="" /> maxlength=100 placeholder="https://hostname.example.com/bots/followup" value="" />
<div><label for="create_payload_url" generated="true" class="text-error"></label></div> <div><label for="create_payload_url" generated="true" class="text-error"></label></div>
</div> </div>
<div class="input-group"> <div class="input-group">

22
static/templates/settings/display-settings.handlebars
View File

@ -23,9 +23,9 @@
<div class="input-group"> <div class="input-group">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="night_mode" id="night_mode" <input type="checkbox" name="night_mode" id="night_mode"
{{#if page_params.night_mode}} {{#if page_params.night_mode}}
checked="checked" checked="checked"
{{/if}} /> {{/if}} />
<span></span> <span></span>
</label> </label>
<label for="night_mode" class="inline-block">{{t "Night mode" }}</label> <label for="night_mode" class="inline-block">{{t "Night mode" }}</label>
@ -34,9 +34,9 @@
<div class="input-group"> <div class="input-group">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="high_contrast_mode" id="high_contrast_mode" <input type="checkbox" name="high_contrast_mode" id="high_contrast_mode"
{{#if page_params.high_contrast_mode}} {{#if page_params.high_contrast_mode}}
checked="checked" checked="checked"
{{/if}} /> {{/if}} />
<span></span> <span></span>
</label> </label>
<label for="high_contrast_mode" class="inline-block">{{t "High contrast mode" }}</label> <label for="high_contrast_mode" class="inline-block">{{t "High contrast mode" }}</label>
@ -45,9 +45,9 @@
<div class="input-group"> <div class="input-group">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="left_side_userlist" id="left_side_userlist" <input type="checkbox" name="left_side_userlist" id="left_side_userlist"
{{#if page_params.left_side_userlist}} {{#if page_params.left_side_userlist}}
checked="checked" checked="checked"
{{/if}} /> {{/if}} />
<span></span> <span></span>
</label> </label>
<label for="left_side_userlist" class="inline-block">{{t "User list on left sidebar in narrow windows" }}</label> <label for="left_side_userlist" class="inline-block">{{t "User list on left sidebar in narrow windows" }}</label>
@ -59,9 +59,9 @@
<div class="input-group"> <div class="input-group">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="twenty_four_hour_time" id="twenty_four_hour_time" <input type="checkbox" name="twenty_four_hour_time" id="twenty_four_hour_time"
{{#if page_params.twenty_four_hour_time}} {{#if page_params.twenty_four_hour_time}}
checked="checked" checked="checked"
{{/if}} /> {{/if}} />
<span></span> <span></span>
</label> </label>
<label for="twenty_four_hour_time" class="inline-block"> <label for="twenty_four_hour_time" class="inline-block">
@ -109,9 +109,9 @@
<div class="input-group"> <div class="input-group">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="translate_emoticons" id="translate_emoticons" <input type="checkbox" name="translate_emoticons" id="translate_emoticons"
{{#if page_params.translate_emoticons}} {{#if page_params.translate_emoticons}}
checked="checked" checked="checked"
{{/if}} /> {{/if}} />
<span></span> <span></span>
</label> </label>
<label for="translate_emoticons" class="inline-block"> <label for="translate_emoticons" class="inline-block">

2
static/templates/settings/edit-embedded-bot-service.handlebars
View File

@ -3,7 +3,7 @@
<div class="input-group"> <div class="input-group">
<label for="embedded_bot_{{@key}}_edit">{{@key}}</label> <label for="embedded_bot_{{@key}}_edit">{{@key}}</label>
<input type="text" name="{{@key}}" id="embedded_bot_{{@key}}_edit" <input type="text" name="{{@key}}" id="embedded_bot_{{@key}}_edit"
maxlength=1000 value="{{this}}" /> maxlength=1000 value="{{this}}" />
</div> </div>
{{/each}} {{/each}}
</div> </div>

2
static/templates/settings/emoji-settings-admin.handlebars
View File

@ -14,7 +14,7 @@
<div class="inline-block"> <div class="inline-block">
<span id="emoji-file-name"></span> <span id="emoji-file-name"></span>
<input type="file" name="emoji_file_input" class="notvisible" <input type="file" name="emoji_file_input" class="notvisible"
id="emoji_file_input" value="{{t 'Upload emoji' }}"/> id="emoji_file_input" value="{{t 'Upload emoji' }}"/>
<button class="button white rounded display-none" id="emoji_image_clear_button">{{t "Clear emoji image" }}</button> <button class="button white rounded display-none" id="emoji_image_clear_button">{{t "Clear emoji image" }}</button>
<button class="button rounded" id="emoji_upload_button">{{t "Upload emoji" }}</button> <button class="button rounded" id="emoji_upload_button">{{t "Upload emoji" }}</button>
</div> </div>

28
static/templates/settings/notification-settings.handlebars
View File

@ -44,11 +44,11 @@
<div class="input-group disableable {{#unless page_params.enable_desktop_notifications}}control-label-disabled{{/unless}}"> <div class="input-group disableable {{#unless page_params.enable_desktop_notifications}}control-label-disabled{{/unless}}">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="pm_content_in_desktop_notifications" <input type="checkbox" name="pm_content_in_desktop_notifications"
id="pm_content_in_desktop_notifications" id="pm_content_in_desktop_notifications"
{{#unless page_params.enable_desktop_notifications}}disabled="disabled"{{/unless}} {{#unless page_params.enable_desktop_notifications}}disabled="disabled"{{/unless}}
{{#if page_params.pm_content_in_desktop_notifications}} {{#if page_params.pm_content_in_desktop_notifications}}
checked="checked" checked="checked"
{{/if}} /> {{/if}} />
<span></span> <span></span>
</label> </label>
<label for="pm_content_in_desktop_notifications" id="pm_content_in_desktop_notifications_label" class="inline-block"> <label for="pm_content_in_desktop_notifications" id="pm_content_in_desktop_notifications_label" class="inline-block">
@ -74,10 +74,10 @@
<div class="input-group disableable {{#unless page_params.enable_offline_push_notifications}}control-label-disabled{{/unless}}"> <div class="input-group disableable {{#unless page_params.enable_offline_push_notifications}}control-label-disabled{{/unless}}">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enable_online_push_notifications" id="enable_online_push_notifications" <input type="checkbox" name="enable_online_push_notifications" id="enable_online_push_notifications"
{{#unless page_params.enable_offline_push_notifications}}disabled="disabled"{{/unless}} {{#unless page_params.enable_offline_push_notifications}}disabled="disabled"{{/unless}}
{{#if page_params.enable_online_push_notifications}} {{#if page_params.enable_online_push_notifications}}
checked="checked" checked="checked"
{{/if}} /> {{/if}} />
<span></span> <span></span>
</label> </label>
<label for="enable_online_push_notifications" id="enable_online_push_notifications_label" class="inline-block"> <label for="enable_online_push_notifications" id="enable_online_push_notifications_label" class="inline-block">
@ -99,11 +99,11 @@
<div class="input-group {{#unless page_params.enable_offline_email_notifications}}control-label-disabled{{/unless}}"> <div class="input-group {{#unless page_params.enable_offline_email_notifications}}control-label-disabled{{/unless}}">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="message_content_in_email_notifications" <input type="checkbox" name="message_content_in_email_notifications"
id="message_content_in_email_notifications" id="message_content_in_email_notifications"
{{#unless page_params.enable_offline_email_notifications}}disabled="disabled"{{/unless}} {{#unless page_params.enable_offline_email_notifications}}disabled="disabled"{{/unless}}
{{#if page_params.message_content_in_email_notifications}} {{#if page_params.message_content_in_email_notifications}}
checked="checked" checked="checked"
{{/if}} /> {{/if}} />
<span></span> <span></span>
</label> </label>
<label for="message_content_in_email_notifications" id="message_content_in_email_notifications_label" class="inline-block"> <label for="message_content_in_email_notifications" id="message_content_in_email_notifications_label" class="inline-block">

14
static/templates/settings/organization-permissions-admin.handlebars
View File

@ -12,7 +12,7 @@
<div class="input-group admin-restricted-to-domain"> <div class="input-group admin-restricted-to-domain">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="realm_restricted_to_domain" id="id_realm_restricted_to_domain" <input type="checkbox" name="realm_restricted_to_domain" id="id_realm_restricted_to_domain"
{{#if realm_restricted_to_domain}}checked="checked"{{/if}} /> {{#if realm_restricted_to_domain}}checked="checked"{{/if}} />
<span></span> <span></span>
</label> </label>
<label for="id_realm_restricted_to_domain" id="realm_restricted_to_domains_label" class="inline-block" /> <label for="id_realm_restricted_to_domain" id="realm_restricted_to_domains_label" class="inline-block" />
@ -24,7 +24,7 @@
<div class="input-group admin-disallow-disposable-email-addresses {{#if realm_restricted_to_domain}}control-label-disabled{{/if}}"> <div class="input-group admin-disallow-disposable-email-addresses {{#if realm_restricted_to_domain}}control-label-disabled{{/if}}">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="realm_disallow_disposable_email_addresses" id="id_realm_disallow_disposable_email_addresses" <input type="checkbox" name="realm_disallow_disposable_email_addresses" id="id_realm_disallow_disposable_email_addresses"
{{#if realm_disallow_disposable_email_addresses}}checked="checked"{{/if}} {{#if realm_restricted_to_domain}}disabled="disabled"{{/if}}/> {{#if realm_disallow_disposable_email_addresses}}checked="checked"{{/if}} {{#if realm_restricted_to_domain}}disabled="disabled"{{/if}}/>
<span></span> <span></span>
</label> </label>
<label for="id_realm_disallow_disposable_email_addresses" id="id_realm_disallow_disposable_email_addresses_label" class="inline-block"> <label for="id_realm_disallow_disposable_email_addresses" id="id_realm_disallow_disposable_email_addresses_label" class="inline-block">
@ -42,8 +42,8 @@
<div class="input-group disableable {{#unless realm_invite_required}}control-label-disabled{{/unless}}"> <div class="input-group disableable {{#unless realm_invite_required}}control-label-disabled{{/unless}}">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="realm_invite_by_admins_only" id="id_realm_invite_by_admins_only" <input type="checkbox" name="realm_invite_by_admins_only" id="id_realm_invite_by_admins_only"
{{#unless realm_invite_required}}disabled="disabled"{{/unless}} {{#unless realm_invite_required}}disabled="disabled"{{/unless}}
{{#if realm_invite_by_admins_only}}checked="checked"{{/if}} /> {{#if realm_invite_by_admins_only}}checked="checked"{{/if}} />
<span></span> <span></span>
</label> </label>
<label for="id_realm_invite_by_admins_only" id="id_realm_invite_by_admins_only_label" class="inline-block"> <label for="id_realm_invite_by_admins_only" id="id_realm_invite_by_admins_only_label" class="inline-block">
@ -91,9 +91,9 @@
<div class="inline-block"> <div class="inline-block">
<label for="aitin" class="inline-block">{{t "Minimum account age (N)" }}:</label> <label for="aitin" class="inline-block">{{t "Minimum account age (N)" }}:</label>
<input type="text" id="id_realm_waiting_period_threshold" <input type="text" id="id_realm_waiting_period_threshold"
name="realm_waiting_period_threshold" name="realm_waiting_period_threshold"
class="admin-realm-message-content-edit-limit-minutes" class="admin-realm-message-content-edit-limit-minutes"
value="{{ realm_waiting_period_threshold }}"/> value="{{ realm_waiting_period_threshold }}"/>
</div> </div>
<div class="input-group"> <div class="input-group">

4
static/templates/settings/organization-profile-admin.handlebars
View File

@ -13,7 +13,7 @@
<div class="input-group admin-realm"> <div class="input-group admin-realm">
<label for="id_realm_name">{{t "Your organization's name" }}</label> <label for="id_realm_name">{{t "Your organization's name" }}</label>
<input type="text" id="id_realm_name" name="realm_name" class="admin-realm-name" <input type="text" id="id_realm_name" name="realm_name" class="admin-realm-name"
value="{{ realm_name }}" maxlength="40" /> value="{{ realm_name }}" maxlength="40" />
</div> </div>
<div class="input-group admin-realm"> <div class="input-group admin-realm">
<label for="realm_description">{{t "Your organization's description" }}</label> <label for="realm_description">{{t "Your organization's description" }}</label>
@ -29,7 +29,7 @@
<div class="inline-block"> <div class="inline-block">
<img id="realm-settings-icon" src="{{ realm_icon_url }}"/> <img id="realm-settings-icon" src="{{ realm_icon_url }}"/>
<input type="file" name="realm_icon_file_input" class="notvisible" <input type="file" name="realm_icon_file_input" class="notvisible"
id="realm_icon_file_input" value="{{t 'Upload icon' }}"/> id="realm_icon_file_input" value="{{t 'Upload icon' }}"/>
<div id="upload_icon_spinner"></div> <div id="upload_icon_spinner"></div>
</div> </div>
<div class="inline-block avatar-controls"> <div class="inline-block avatar-controls">

18
static/templates/settings/organization-settings-admin.handlebars
View File

@ -22,23 +22,23 @@
{{t 'Message edit limit in minutes (0 for no limit)' }} {{t 'Message edit limit in minutes (0 for no limit)' }}
</label> </label>
<input type="text" id="id_realm_message_content_edit_limit_minutes" <input type="text" id="id_realm_message_content_edit_limit_minutes"
name="realm_message_content_edit_limit_minutes" name="realm_message_content_edit_limit_minutes"
class="admin-realm-message-content-edit-limit-minutes" class="admin-realm-message-content-edit-limit-minutes"
value="{{ realm_message_content_edit_limit_minutes }}" value="{{ realm_message_content_edit_limit_minutes }}"
{{#unless realm_allow_message_editing}}disabled="disabled"{{/unless}} /> {{#unless realm_allow_message_editing}}disabled="disabled"{{/unless}} />
</div> </div>
<div class="input-group"> <div class="input-group">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" id="id_realm_allow_message_deleting" name="realm_allow_message_deleting" <input type="checkbox" id="id_realm_allow_message_deleting" name="realm_allow_message_deleting"
{{#if realm_allow_message_deleting}}checked="checked"{{/if}} /> {{#if realm_allow_message_deleting}}checked="checked"{{/if}} />
<span></span> <span></span>
</label> </label>
<label for="id_realm_allow_message_deleting" id="id_realm_allow_message_deleting_label" class="inline-block"> <label for="id_realm_allow_message_deleting" id="id_realm_allow_message_deleting_label" class="inline-block">
{{t "Users can delete their messages" }} {{t "Users can delete their messages" }}
</label> </label>
<i class="icon-vector-info-sign settings-info-icon realm_allow_message_deleting_tooltip" data-toggle="tooltip" <i class="icon-vector-info-sign settings-info-icon realm_allow_message_deleting_tooltip" data-toggle="tooltip"
title="{{t 'Administrators can always delete any message.' }}"/> title="{{t 'Administrators can always delete any message.' }}"/>
</div> </div>
{{partial "settings_checkbox" {{partial "settings_checkbox"
@ -62,9 +62,9 @@
{{t 'Messages retention period in days (blank means messages are retained forever)' }} {{t 'Messages retention period in days (blank means messages are retained forever)' }}
</label> </label>
<input type="text" id="id_realm_message_retention_days" <input type="text" id="id_realm_message_retention_days"
name="realm_message_retention_days" name="realm_message_retention_days"
class="admin-realm-message-retention-days" class="admin-realm-message-retention-days"
value="{{ realm_message_retention_days }}"/> value="{{ realm_message_retention_days }}"/>
</div> </div>
{{/if}} {{/if}}
{{partial "settings_checkbox" {{partial "settings_checkbox"

8
static/templates/settings/settings_checkbox.handlebars
View File

@ -1,10 +1,10 @@
<div class="input-group"> <div class="input-group">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" class="inline-block" name="{{setting_name}}" <input type="checkbox" class="inline-block" name="{{setting_name}}"
id="{{prefix}}{{setting_name}}" id="{{prefix}}{{setting_name}}"
{{#if is_checked}} {{#if is_checked}}
checked="checked" checked="checked"
{{/if}} /> {{/if}} />
<span></span> <span></span>
</label> </label>
<label for="{{prefix}}{{setting_name}}" class="inline-block" id="{{prefix}}{{setting_name}}_label"> <label for="{{prefix}}{{setting_name}}" class="inline-block" id="{{prefix}}{{setting_name}}_label">

6
static/templates/settings/ui-settings.handlebars
View File

@ -8,9 +8,9 @@
<div class="input-group"> <div class="input-group">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" class="inline-block change-setting" name="default_desktop_notifications" id="default_desktop_notifications" <input type="checkbox" class="inline-block change-setting" name="default_desktop_notifications" id="default_desktop_notifications"
{{#if page_params.default_desktop_notifications}} {{#if page_params.default_desktop_notifications}}
checked="checked" checked="checked"
{{/if}} /> {{/if}} />
<span></span> <span></span>
</label> </label>
<label for="default_desktop_notifications" class="inline-block"> <label for="default_desktop_notifications" class="inline-block">

2
static/templates/subscription_creation_form.handlebars
View File

@ -9,7 +9,7 @@
{{t "Stream name" }} {{t "Stream name" }}
</div> </div>
<input type="text" name="stream_name" id="create_stream_name" <input type="text" name="stream_name" id="create_stream_name"
placeholder="{{t 'Stream name' }}" value="" autocomplete="off" /> placeholder="{{t 'Stream name' }}" value="" autocomplete="off" />
<div id="stream_name_error" class="stream_creation_error"></div> <div id="stream_name_error" class="stream_creation_error"></div>
</section> </section>
<section class="block"> <section class="block">

2
static/templates/subscription_table_body.handlebars
View File

@ -15,7 +15,7 @@
placeholder="{{t 'Filter streams' }}" value="" autocomplete="off" /> placeholder="{{t 'Filter streams' }}" value="" autocomplete="off" />
{{#if can_create_streams}} {{#if can_create_streams}}
<input type="submit" class="create_stream_button" <input type="submit" class="create_stream_button"
value="+" title="{{t 'Create new stream' }} (n)"/> value="+" title="{{t 'Create new stream' }} (n)"/>
{{/if}} {{/if}}
<div class="float-clear"></div> <div class="float-clear"></div>
</form> </form>

2
templates/zerver/accounts_accept_terms.html
View File

@ -37,7 +37,7 @@ the registration flow has its own (nearly identical) copy of the fields below in
at all. (So, it's not symmetric to the code above.) at all. (So, it's not symmetric to the code above.)
#} #}
<input id="id_terms" class="required" type="checkbox" name="terms" <input id="id_terms" class="required" type="checkbox" name="terms"
{% if form.terms.value() %}checked="checked"{% endif %} /> {% if form.terms.value() %}checked="checked"{% endif %} />
{% trans %}I agree to the <a href="{{ root_domain_uri }}/terms">Terms of Service</a>.{% endtrans %} {% trans %}I agree to the <a href="{{ root_domain_uri }}/terms">Terms of Service</a>.{% endtrans %}
</label> </label>
{% if form.terms.errors %} {% if form.terms.errors %}

8
templates/zerver/compose.html
View File

@ -70,12 +70,12 @@
<i class="icon-vector-lock" title="{{ _('This is an invite-only stream') }}"></i> <i class="icon-vector-lock" title="{{ _('This is an invite-only stream') }}"></i>
</span> </span>
<input type="text" class="recipient_box" name="stream" id="stream" <input type="text" class="recipient_box" name="stream" id="stream"
maxlength="30" maxlength="30"
value="" placeholder="{{ _('Stream') }}" autocomplete="off" tabindex="0" aria-label="{{ _('Stream') }}"/> value="" placeholder="{{ _('Stream') }}" autocomplete="off" tabindex="0" aria-label="{{ _('Stream') }}"/>
<i class="icon-vector-narrow icon-vector-small"></i> <i class="icon-vector-narrow icon-vector-small"></i>
<input type="text" class="recipient_box" name="subject" id="subject" <input type="text" class="recipient_box" name="subject" id="subject"
maxlength="60" maxlength="60"
value="" placeholder="{{ _('Topic') }}" autocomplete="off" tabindex="0" aria-label="{{ _('Topic') }}"/> value="" placeholder="{{ _('Topic') }}" autocomplete="off" tabindex="0" aria-label="{{ _('Topic') }}"/>
</td> </td>
</tr> </tr>
<tr id="private-message"> <tr id="private-message">

6
templates/zerver/confirm_continue_registration.html
View File

@ -31,9 +31,9 @@
<form class="form-inline" id="send_confirm" name="send_confirm" <form class="form-inline" id="send_confirm" name="send_confirm"
action="/login/" method="get"> action="/login/" method="get">
<input type="hidden" <input type="hidden"
id="email" id="email"
name="email" name="email"
value="{{ email }}" /> value="{{ email }}" />
<button> <button>
{{ _("Go back to login") }} {{ _("Go back to login") }}
</button> </button>

2
templates/zerver/create_realm.html
View File

@ -23,7 +23,7 @@ $(function () {
<div class="input-box horizontal"> <div class="input-box horizontal">
<div class="inline-block relative"> <div class="inline-block relative">
<input type="text" class="email required" placeholder="{{ _("Enter your email address") }}" <input type="text" class="email required" placeholder="{{ _("Enter your email address") }}"
id="email" name="email" required /> id="email" name="email" required />
<label for="id_username">{{ _('Email') }}</label> <label for="id_username">{{ _('Email') }}</label>
</div> </div>

2
templates/zerver/integrations/index.html
View File

@ -94,7 +94,7 @@
data-categories="{{ integration.categories }}" data-categories="{{ integration.categories }}"
data-name="{{ integration.name }}"> data-name="{{ integration.name }}">
<img class="integration-logo" src="/{{ integration.logo }}" <img class="integration-logo" src="/{{ integration.logo }}"
alt="{{ integration.display_name }} logo"/> alt="{{ integration.display_name }} logo"/>
{% if integration.secondary_line_text %} {% if integration.secondary_line_text %}
<h3 class="integration-name with-secondary">{{ integration.display_name }}</h3> <h3 class="integration-name with-secondary">{{ integration.display_name }}</h3>
<h4 class="integration-secondary-line-text"> <h4 class="integration-secondary-line-text">

6
templates/zerver/keyboard_shortcuts.html
View File

@ -218,9 +218,9 @@
<td class="definition"> <td class="definition">
{% trans %}React to selected message with{% endtrans %} {% trans %}React to selected message with{% endtrans %}
<img alt=":thumbs_up:" <img alt=":thumbs_up:"
class="emoji" class="emoji"
src="/static/generated/emoji/images/emoji/unicode/1f44d.png" src="/static/generated/emoji/images/emoji/unicode/1f44d.png"
title=":thumbs_up:"/> title=":thumbs_up:"/>
</td> </td>
</tr> </tr>
<tr> <tr>

6
templates/zerver/login.html
View File

@ -72,9 +72,9 @@
<!-- .no-validation is for removing the red star in CSS --> <!-- .no-validation is for removing the red star in CSS -->
<div class="input-box no-validation"> <div class="input-box no-validation">
<input id="id_username" type="{% if not require_email_format_usernames %}text{% else %}email{% endif %}" <input id="id_username" type="{% if not require_email_format_usernames %}text{% else %}email{% endif %}"
name="username" class="{% if require_email_format_usernames %}email {% endif %}required" name="username" class="{% if require_email_format_usernames %}email {% endif %}required"
{% if email %} value="{{ email }}" {% else %} value="" {% endif %} {% if email %} value="{{ email }}" {% else %} value="" {% endif %}
maxlength="72" required /> maxlength="72" required />
<label for="id_username"> <label for="id_username">
{% if not require_email_format_usernames and email_auth_enabled %} {% if not require_email_format_usernames and email_auth_enabled %}
{{ _('Email or username') }} {{ _('Email or username') }}

2
templates/zerver/navbar.html
View File

@ -50,7 +50,7 @@
<form id="searchbox_form" class="form-search navbar-search"> <form id="searchbox_form" class="form-search navbar-search">
<div id="search_arrows" class="input-append"> <div id="search_arrows" class="input-append">
<input class="search-query input-block-level" id="search_query" type="text" placeholder="{{ _('Search') }}" <input class="search-query input-block-level" id="search_query" type="text" placeholder="{{ _('Search') }}"
autocomplete="off" aria-label="{{ _('Search') }}" title="{{ _('Search') }} (/)"/> autocomplete="off" aria-label="{{ _('Search') }}" title="{{ _('Search') }} (/)"/>
{# Start the button off disabled since there is no active search #} {# Start the button off disabled since there is no active search #}
<button class="btn search_button" type="button" id="search_exit" disabled="disabled" aria-label="{{ _('Exit search') }}"><i class="icon-vector-remove"></i></button> <button class="btn search_button" type="button" id="search_exit" disabled="disabled" aria-label="{{ _('Exit search') }}"><i class="icon-vector-remove"></i></button>
<a class="search_icon" href="#search-operators" data-overlay-trigger="search-operators" title="{{ _('Search help') }}"><i class="icon-vector-search"></i></a> <a class="search_icon" href="#search-operators" data-overlay-trigger="search-operators" title="{{ _('Search help') }}"><i class="icon-vector-search"></i></a>

34
templates/zerver/register.html
View File

@ -47,8 +47,8 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
<p class="fakecontrol">{{ full_name }}</p> <p class="fakecontrol">{{ full_name }}</p>
{% else %} {% else %}
<input id="id_full_name" class="required" type="text" name="full_name" <input id="id_full_name" class="required" type="text" name="full_name"
value="{% if full_name %}{{ full_name }}{% elif form.full_name.value() %}{{ form.full_name.value() }}{% endif %}" value="{% if full_name %}{{ full_name }}{% elif form.full_name.value() %}{{ form.full_name.value() }}{% endif %}"
maxlength={{ MAX_NAME_LENGTH }} placeholder="{% trans %}Full name or 名前{% endtrans %}" required /> maxlength={{ MAX_NAME_LENGTH }} placeholder="{% trans %}Full name or 名前{% endtrans %}" required />
<label for="id_full_name" class="inline-block label-title">{{ _('Full name') }}</label> <label for="id_full_name" class="inline-block label-title">{{ _('Full name') }}</label>
{% if form.full_name.errors %} {% if form.full_name.errors %}
{% for error in form.full_name.errors %} {% for error in form.full_name.errors %}
@ -61,10 +61,10 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
{% if password_required %} {% if password_required %}
<div class="input-box"> <div class="input-box">
<input id="id_password" class="required" type="password" name="password" <input id="id_password" class="required" type="password" name="password"
value="{% if form.password.value() %}{{ form.password.value() }}{% endif %}" value="{% if form.password.value() %}{{ form.password.value() }}{% endif %}"
maxlength={{ MAX_PASSWORD_LENGTH }} maxlength={{ MAX_PASSWORD_LENGTH }}
data-min-length="{{password_min_length}}" data-min-length="{{password_min_length}}"
data-min-guesses="{{password_min_guesses}}" required /> data-min-guesses="{{password_min_guesses}}" required />
<label for="id_password" class="inline-block">{{ _('Password') }}</label> <label for="id_password" class="inline-block">{{ _('Password') }}</label>
{% if full_name %} {% if full_name %}
<span class="help-inline"> <span class="help-inline">
@ -89,7 +89,7 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
{% for default_stream_group in default_stream_groups %} {% for default_stream_group in default_stream_groups %}
<div class="input-group radio"> <div class="input-group radio">
<input class="inline-block" type="checkbox" name="default_stream_group" value="{{ default_stream_group.name }}" <input class="inline-block" type="checkbox" name="default_stream_group" value="{{ default_stream_group.name }}"
{% if "default_stream_group" in form.data and default_stream_group.name in form.data.getlist('default_stream_group') %} checked {% endif %} /> {% if "default_stream_group" in form.data and default_stream_group.name in form.data.getlist('default_stream_group') %} checked {% endif %} />
<label for="id_radio_{{ default_stream_group.name }}" class="inline-block">{{ default_stream_group.name }}</label> <label for="id_radio_{{ default_stream_group.name }}" class="inline-block">{{ default_stream_group.name }}</label>
</div> </div>
{% endfor %} {% endfor %}
@ -101,9 +101,9 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
<div class="input-box"> <div class="input-box">
<div class="inline-block relative"> <div class="inline-block relative">
<input id="id_team_name" class="required" type="text" <input id="id_team_name" class="required" type="text"
placeholder="Acme or Aκμή" placeholder="Acme or Aκμή"
value="{% if form.realm_name.value() %}{{ form.realm_name.value() }}{% endif %}" value="{% if form.realm_name.value() %}{{ form.realm_name.value() }}{% endif %}"
name="realm_name" maxlength={{ MAX_REALM_NAME_LENGTH }} required /> name="realm_name" maxlength={{ MAX_REALM_NAME_LENGTH }} required />
</div> </div>
<label for="id_team_name" class="inline-block label-title">{{ _('Organization name') }}</label> <label for="id_team_name" class="inline-block label-title">{{ _('Organization name') }}</label>
{% if form.realm_name.errors %} {% if form.realm_name.errors %}
@ -124,7 +124,7 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
{% if root_domain_available %} {% if root_domain_available %}
<label class="checkbox static" for="realm_in_root_domain"> <label class="checkbox static" for="realm_in_root_domain">
<input type="checkbox" name="realm_in_root_domain" id="realm_in_root_domain" <input type="checkbox" name="realm_in_root_domain" id="realm_in_root_domain"
{% if not form.realm_subdomain.value() and not form.realm_subdomain.errors %}checked="checked"{% endif %}/> {% if not form.realm_subdomain.value() and not form.realm_subdomain.errors %}checked="checked"{% endif %}/>
<span></span> <span></span>
{% trans %}Use {{ external_host }}{% endtrans %} {% trans %}Use {{ external_host }}{% endtrans %}
</label> </label>
@ -135,11 +135,11 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
<div class="or"><span>{{ _('OR') }}</span></div> <div class="or"><span>{{ _('OR') }}</span></div>
<div class="inline-block relative"> <div class="inline-block relative">
<input id="id_team_subdomain" <input id="id_team_subdomain"
class="{% if root_domain_landing_page %}required{% endif %} subdomain" type="text" class="{% if root_domain_landing_page %}required{% endif %} subdomain" type="text"
placeholder="acme" placeholder="acme"
value="{% if form.realm_subdomain.value() %}{{ form.realm_subdomain.value() }}{% endif %}" value="{% if form.realm_subdomain.value() %}{{ form.realm_subdomain.value() }}{% endif %}"
name="realm_subdomain" maxlength={{ MAX_REALM_SUBDOMAIN_LENGTH }} name="realm_subdomain" maxlength={{ MAX_REALM_SUBDOMAIN_LENGTH }}
{% if root_domain_landing_page %}required{% endif %} /> {% if root_domain_landing_page %}required{% endif %} />
<label for="id_team_subdomain" class="realm_subdomain_label">.{{ external_host }}</label> <label for="id_team_subdomain" class="realm_subdomain_label">.{{ external_host }}</label>
<p id="id_team_subdomain_error_client" class="error help-inline text-error"></p> <p id="id_team_subdomain_error_client" class="error help-inline text-error"></p>
</div> </div>
@ -169,7 +169,7 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
#} #}
<label for="id_terms" class="inline-block checkbox"> <label for="id_terms" class="inline-block checkbox">
<input id="id_terms" class="required" type="checkbox" name="terms" <input id="id_terms" class="required" type="checkbox" name="terms"
{% if form.terms.value() %}checked="checked"{% endif %} /> {% if form.terms.value() %}checked="checked"{% endif %} />
<span></span> <span></span>
{% trans %}I agree to the <a href="{{ root_domain_uri }}/terms" target="_blank">Terms of Service</a>.{% endtrans %} {% trans %}I agree to the <a href="{{ root_domain_uri }}/terms" target="_blank">Terms of Service</a>.{% endtrans %}
</label> </label>

4
templates/zerver/reset.html
View File

@ -18,8 +18,8 @@
<div class="input-box horizontal moving-label"> <div class="input-box horizontal moving-label">
<div class="inline-block relative"> <div class="inline-block relative">
<input id="id_email" class="required" type="text" name="email" <input id="id_email" class="required" type="text" name="email"
value="{% if form.email.value() %}{{ form.email.value() }}{% endif %}" value="{% if form.email.value() %}{{ form.email.value() }}{% endif %}"
maxlength="100" required /> maxlength="100" required />
<label for="id_email" class="">{{ _('Email') }}</label> <label for="id_email" class="">{{ _('Email') }}</label>
{% if form.email.errors %} {% if form.email.errors %}
{% for error in form.email.errors %} {% for error in form.email.errors %}

12
templates/zerver/reset_confirm.html
View File

@ -29,10 +29,10 @@
<div class="input-box"> <div class="input-box">
<label for="id_new_password1" class="">{{ _('Password') }}</label> <label for="id_new_password1" class="">{{ _('Password') }}</label>
<input id="id_new_password1" class="required" type="password" name="new_password1" <input id="id_new_password1" class="required" type="password" name="new_password1"
value="{% if form.new_password1.value() %}{{ form.new_password1.value() }}{% endif %}" value="{% if form.new_password1.value() %}{{ form.new_password1.value() }}{% endif %}"
maxlength="100" maxlength="100"
data-min-length="{{password_min_length}}" data-min-length="{{password_min_length}}"
data-min-guesses="{{password_min_guesses}}" required /> data-min-guesses="{{password_min_guesses}}" required />
{% if form.new_password1.errors %} {% if form.new_password1.errors %}
{% for error in form.new_password1.errors %} {% for error in form.new_password1.errors %}
<div class="alert alert-error">{{ error }}</div> <div class="alert alert-error">{{ error }}</div>
@ -49,8 +49,8 @@
<div class="input-box"> <div class="input-box">
<label for="id_new_password2" class="">{{ _('Confirm password') }}</label> <label for="id_new_password2" class="">{{ _('Confirm password') }}</label>
<input id="id_new_password2" class="required" type="password" name="new_password2" <input id="id_new_password2" class="required" type="password" name="new_password2"
value="{% if form.new_password2.value() %}{{ form.new_password2.value() }}{% endif %}" value="{% if form.new_password2.value() %}{{ form.new_password2.value() }}{% endif %}"
maxlength="100" required /> maxlength="100" required />
{% if form.new_password2.errors %} {% if form.new_password2.errors %}
{% for error in form.new_password2.errors %} {% for error in form.new_password2.errors %}
<div class="alert alert-error">{{ error }}</div> <div class="alert alert-error">{{ error }}</div>

16
tools/lib/pretty_print.py
View File

@ -114,19 +114,25 @@ def pretty_print_html(html, num_spaces=4):
offsets[start_line] = info['offset'] offsets[start_line] = info['offset']
line = lines[token.line - 1] line = lines[token.line - 1]
adjustment = len(line)-len(line.lstrip()) + 1 adjustment = len(line)-len(line.lstrip()) + 1
if adjustment == token.col: if adjustment == token.col and token.kind != 'html_singleton_end':
offsets[end_line] = (info['offset'] + offsets[end_line] = (info['offset'] +
info['adjustment'] - info['adjustment'] -
adjustment + adjustment +
info['extra_indent'] - info['extra_indent'] -
info['extra_indent_prev']) info['extra_indent_prev'])
elif (start_line + info['line_span'] - 1 == end_line and elif (start_line + info['line_span'] - 1 == end_line and
info['line_span'] > 2 and token.kind != 'html_singleton_end'): (info['line_span'] > 2 or
(info['line_span'] == 2 and
token.kind == 'html_singleton_end'))):
offsets[end_line] = (1 + info['extra_indent'] + offsets[end_line] = (1 + info['extra_indent'] +
(info['depth'] + 1) * num_spaces) - adjustment (info['depth'] + 1) * num_spaces) - adjustment
if token.kind == 'html_singleton_end':
# We would like singleton tags to have 2 space
# indentation in case they span over multiple lines.
offsets[end_line] -= 2
elif token.line != info['line']: elif token.line != info['line']:
offsets[end_line] = info['offset'] offsets[end_line] = info['offset']
if token.tag != 'pre' and token.kind != 'html_singleton_end' and token.tag != 'script': if token.tag != 'pre' and token.tag != 'script':
for line_num in range(start_line + 1, end_line): for line_num in range(start_line + 1, end_line):
# Be careful not to override offsets that happened # Be careful not to override offsets that happened
# deeper in the HTML within our block. # deeper in the HTML within our block.
@ -140,6 +146,10 @@ def pretty_print_html(html, num_spaces=4):
extra_indent = info['extra_indent'] extra_indent = info['extra_indent']
adjustment = len(line)-len(line.lstrip()) + 1 adjustment = len(line)-len(line.lstrip()) + 1
offset = (1 + extra_indent + new_depth * num_spaces) - adjustment offset = (1 + extra_indent + new_depth * num_spaces) - adjustment
if token.kind == 'html_singleton_end':
# We would like singleton tags to have 2 space
# indentation in case they span over multiple lines.
offset -= 2
offsets[line_num] = offset offsets[line_num] = offset
elif (token.kind in ('handlebars_end', 'django_end') and elif (token.kind in ('handlebars_end', 'django_end') and
info['indenting'] and info['indenting'] and

34
tools/tests/test_pretty_print.py
View File

@ -197,7 +197,7 @@ BAD_HTML7 = """
GOOD_HTML7 = """ GOOD_HTML7 = """
<div class="foobar"> <div class="foobar">
<input type="foobar" name="temp" value="{{dyn_name}}" <input type="foobar" name="temp" value="{{dyn_name}}"
{{#unless invite_only}}checked="checked"{{/unless}} /> {{dyn_name}} {{#unless invite_only}}checked="checked"{{/unless}} /> {{dyn_name}}
{{#if invite_only}}<i class="icon-vector-lock"></i>{{/if}} {{#if invite_only}}<i class="icon-vector-lock"></i>{{/if}}
</div> </div>
""" """
@ -389,6 +389,37 @@ GOOD_HTML14 = """
{{/if}} {{/if}}
</div> </div>
""" """
BAD_HTML15 = """
<div>
<img alt=":thumbs_up:"
class="emoji"
src="/path/to/png"
title=":thumbs_up:"/>
<img alt=":thumbs_up:"
class="emoji"
src="/path/to/png"
title=":thumbs_up:"/>
<img alt=":thumbs_up:"
title=":thumbs_up:"/>
</div>
"""
GOOD_HTML15 = """
<div>
<img alt=":thumbs_up:"
class="emoji"
src="/path/to/png"
title=":thumbs_up:"/>
<img alt=":thumbs_up:"
class="emoji"
src="/path/to/png"
title=":thumbs_up:"/>
<img alt=":thumbs_up:"
title=":thumbs_up:"/>
</div>
"""
class TestPrettyPrinter(unittest.TestCase): class TestPrettyPrinter(unittest.TestCase):
def compare(self, a: str, b: str) -> None: def compare(self, a: str, b: str) -> None:
self.assertEqual(a.split('\n'), b.split('\n')) self.assertEqual(a.split('\n'), b.split('\n'))
@ -410,3 +441,4 @@ class TestPrettyPrinter(unittest.TestCase):
self.compare(pretty_print_html(BAD_HTML12), GOOD_HTML12) self.compare(pretty_print_html(BAD_HTML12), GOOD_HTML12)
self.compare(pretty_print_html(BAD_HTML13), GOOD_HTML13) self.compare(pretty_print_html(BAD_HTML13), GOOD_HTML13)
self.compare(pretty_print_html(BAD_HTML14), GOOD_HTML14) self.compare(pretty_print_html(BAD_HTML14), GOOD_HTML14)
self.compare(pretty_print_html(BAD_HTML15), GOOD_HTML15)