From 16ea7ab248f1bc1e2e0acfd6297ddf16a4a43ec1 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 30 Jun 2022 12:30:50 +0200 Subject: [PATCH] DEV: Run angle-brackets codemod (#17286) Co-authored-by: Peter Wagenet --- .../admin/addon/templates/admin.hbs | 28 +- .../admin/addon/templates/api-keys-index.hbs | 30 +- .../admin/addon/templates/api-keys-new.hbs | 56 ++-- .../admin/addon/templates/api-keys-show.hbs | 64 ++-- .../javascripts/admin/addon/templates/api.hbs | 8 +- .../admin/addon/templates/backups-index.hbs | 58 +--- .../admin/addon/templates/backups-logs.hbs | 2 +- .../admin/addon/templates/backups.hbs | 27 +- .../admin/addon/templates/badges-award.hbs | 20 +- .../admin/addon/templates/badges-index.hbs | 4 +- .../admin/addon/templates/badges-show.hbs | 126 ++------ .../admin/addon/templates/badges.hbs | 14 +- .../components/admin-editable-field.hbs | 6 +- .../components/admin-report-table-header.hbs | 2 +- .../components/admin-report-table-row.hbs | 2 +- .../components/admin-report-table.hbs | 15 +- .../admin-report-trust-level-counts.hbs | 10 +- .../templates/components/admin-report.hbs | 43 +-- .../components/admin-theme-editor.hbs | 41 +-- .../components/admin-user-field-item.hbs | 74 ++--- .../admin-web-hook-event-chooser.hbs | 2 +- .../components/admin-web-hook-event.hbs | 6 +- .../components/dashboard-new-features.hbs | 4 +- .../components/dashboard-problems.hbs | 6 +- .../components/email-styles-editor.hbs | 8 +- .../templates/components/embeddable-host.hbs | 20 +- .../components/embedding-setting.hbs | 4 +- .../templates/components/emoji-value-list.hbs | 37 +-- .../templates/components/flag-user-lists.hbs | 13 +- .../addon/templates/components/flag-user.hbs | 8 +- .../components/inline-edit-checkbox.hbs | 6 +- .../components/install-theme-item.hbs | 2 +- .../components/penalty-post-action.hbs | 10 +- .../templates/components/permalink-form.hbs | 31 +- .../components/report-filters/bool.hbs | 6 +- .../components/report-filters/category.hbs | 6 +- .../components/report-filters/group.hbs | 10 +- .../components/report-filters/list.hbs | 9 +- .../components/screened-ip-address-form.hbs | 10 +- .../components/secret-value-list.hbs | 19 +- .../templates/components/silence-details.hbs | 11 +- .../templates/components/simple-list.hbs | 44 +-- .../site-customization-change-details.hbs | 20 +- .../site-customization-change-field.hbs | 2 +- .../templates/components/site-setting.hbs | 12 +- .../components/site-settings/bool.hbs | 4 +- .../site-settings/category-list.hbs | 7 +- .../components/site-settings/category.hbs | 10 +- .../components/site-settings/color.hbs | 10 +- .../components/site-settings/compact-list.hbs | 13 +- .../components/site-settings/emoji-list.hbs | 4 +- .../components/site-settings/enum.hbs | 13 +- .../components/site-settings/group-list.hbs | 11 +- .../components/site-settings/host-list.hbs | 12 +- .../components/site-settings/list.hbs | 4 +- .../components/site-settings/named-list.hbs | 14 +- .../components/site-settings/secret-list.hbs | 4 +- .../components/site-settings/simple-list.hbs | 4 +- .../components/site-settings/string.hbs | 14 +- .../components/site-settings/tag-list.hbs | 11 +- .../components/site-settings/upload.hbs | 10 +- .../site-settings/uploaded-image-list.hbs | 4 +- .../components/site-settings/url-list.hbs | 4 +- .../components/site-settings/value-list.hbs | 4 +- .../components/site-text-summary.hbs | 2 +- .../components/suspension-details.hbs | 16 +- .../templates/components/themes-list-item.hbs | 2 +- .../templates/components/themes-list.hbs | 29 +- .../addon/templates/components/value-list.hbs | 37 +-- .../templates/components/version-checks.hbs | 7 +- .../components/watched-word-form.hbs | 19 +- .../addon/templates/customize-colors-show.hbs | 52 +-- .../addon/templates/customize-colors.hbs | 10 +- .../templates/customize-email-style-edit.hbs | 4 +- .../customize-email-templates-edit.hbs | 19 +- .../addon/templates/customize-robots-txt.hbs | 15 +- .../addon/templates/customize-themes-edit.hbs | 30 +- .../templates/customize-themes-index.hbs | 2 +- .../addon/templates/customize-themes-show.hbs | 106 +++--- .../addon/templates/customize-themes.hbs | 6 +- .../admin/addon/templates/customize.hbs | 24 +- .../admin/addon/templates/dashboard.hbs | 33 +- .../addon/templates/dashboard_general.hbs | 94 ++---- .../addon/templates/dashboard_moderation.hbs | 29 +- .../addon/templates/dashboard_reports.hbs | 15 +- .../addon/templates/dashboard_security.hbs | 12 +- .../addon/templates/email-advanced-test.hbs | 11 +- .../admin/addon/templates/email-bounced.hbs | 16 +- .../admin/addon/templates/email-index.hbs | 10 +- .../addon/templates/email-preview-digest.hbs | 28 +- .../admin/addon/templates/email-received.hbs | 16 +- .../admin/addon/templates/email-rejected.hbs | 18 +- .../admin/addon/templates/email-sent.hbs | 18 +- .../admin/addon/templates/email-skipped.hbs | 16 +- .../admin/addon/templates/email.hbs | 22 +- .../admin/addon/templates/embedding.hbs | 35 +- .../admin/addon/templates/emojis.hbs | 20 +- .../admin/addon/templates/logs.hbs | 16 +- .../addon/templates/logs/screened-emails.hbs | 13 +- .../templates/logs/screened-ip-addresses.hbs | 54 +--- .../addon/templates/logs/screened-urls.hbs | 11 +- .../templates/logs/staff-action-logs.hbs | 27 +- .../templates/modal/admin-add-upload.hbs | 10 +- .../templates/modal/admin-api-key-urls.hbs | 4 +- .../templates/modal/admin-badge-preview.hbs | 4 +- .../modal/admin-color-scheme-select-base.hbs | 18 +- .../modal/admin-delete-posts-confirmation.hbs | 19 +- .../admin-delete-user-posts-progress.hbs | 4 +- .../modal/admin-edit-badge-groupings.hbs | 26 +- .../templates/modal/admin-incoming-email.hbs | 10 +- .../templates/modal/admin-install-theme.hbs | 46 +-- .../modal/admin-merge-users-confirmation.hbs | 19 +- .../modal/admin-merge-users-progress.hbs | 4 +- .../modal/admin-merge-users-prompt.hbs | 25 +- .../addon/templates/modal/admin-reseed.hbs | 18 +- .../templates/modal/admin-silence-user.hbs | 36 +-- .../modal/admin-staff-action-log-details.hbs | 6 +- .../templates/modal/admin-start-backup.hbs | 19 +- .../templates/modal/admin-suspend-user.hbs | 36 +-- .../templates/modal/admin-theme-change.hbs | 9 +- .../templates/modal/admin-theme-item.hbs | 6 +- .../modal/admin-uploaded-image-list.hbs | 8 +- .../modal/admin-watched-word-test.hbs | 6 +- .../modal/site-setting-default-categories.hbs | 8 +- .../admin/addon/templates/permalinks.hbs | 22 +- .../admin/addon/templates/plugins-index.hbs | 4 +- .../admin/addon/templates/plugins.hbs | 13 +- .../admin/addon/templates/reports-show.hbs | 9 +- .../addon/templates/search-logs-index.hbs | 17 +- .../addon/templates/search-logs-term.hbs | 27 +- .../templates/site-settings-category.hbs | 6 +- .../admin/addon/templates/site-settings.hbs | 12 +- .../admin/addon/templates/site-text-edit.hbs | 12 +- .../admin/addon/templates/site-text-index.hbs | 29 +- .../admin/addon/templates/user-badges.hbs | 38 +-- .../admin/addon/templates/user-fields.hbs | 6 +- .../admin/addon/templates/user-index.hbs | 301 +++++------------- .../addon/templates/user-tl3-requirements.hbs | 4 +- .../admin/addon/templates/user.hbs | 4 +- .../admin/addon/templates/users-list-show.hbs | 38 +-- .../admin/addon/templates/users-list.hbs | 20 +- .../addon/templates/watched-words-action.hbs | 32 +- .../admin/addon/templates/watched-words.hbs | 10 +- .../addon/templates/web-hooks-show-events.hbs | 20 +- .../admin/addon/templates/web-hooks-show.hbs | 50 ++- .../admin/addon/templates/web-hooks.hbs | 18 +- .../discourse/app/templates/about.hbs | 36 +-- .../templates/account-created/edit-email.hbs | 9 +- .../app/templates/account-created/index.hbs | 3 +- .../discourse/app/templates/application.hbs | 49 ++- .../discourse/app/templates/badges/index.hbs | 8 +- .../discourse/app/templates/badges/show.hbs | 23 +- .../discourse/app/templates/bulk-tag.hbs | 4 +- .../components/activation-controls.hbs | 10 +- .../components/activation-email-form.hbs | 2 +- .../app/templates/components/backup-codes.hbs | 7 +- .../app/templates/components/badge-card.hbs | 14 +- .../app/templates/components/badge-title.hbs | 14 +- .../templates/components/basic-topic-list.hbs | 20 +- .../templates/components/bookmark-list.hbs | 20 +- .../app/templates/components/bookmark.hbs | 30 +- .../app/templates/components/bread-crumbs.hbs | 28 +- .../app/templates/components/cancel-link.hbs | 4 +- .../categories-and-latest-topics.hbs | 6 +- .../components/categories-and-top-topics.hbs | 6 +- .../categories-boxes-with-topics.hbs | 14 +- .../templates/components/categories-boxes.hbs | 29 +- .../templates/components/categories-only.hbs | 6 +- .../components/categories-topic-list.hbs | 4 +- .../categories-with-featured-topics.hbs | 3 +- .../components/category-name-fields.hbs | 4 +- .../components/category-permission-row.hbs | 22 +- .../components/category-title-before.hbs | 2 +- .../components/category-title-link.hbs | 9 +- .../templates/components/choose-message.hbs | 2 +- .../app/templates/components/choose-topic.hbs | 16 +- .../app/templates/components/color-input.hbs | 7 +- .../app/templates/components/color-picker.hbs | 4 +- .../components/composer-action-title.hbs | 17 +- .../templates/components/composer-editor.hbs | 26 +- .../components/composer-messages.hbs | 7 +- .../templates/components/composer-title.hbs | 12 +- .../templates/components/composer-toggles.hbs | 27 +- .../components/composer-user-selector.hbs | 9 +- .../app/templates/components/copy-button.hbs | 2 +- .../components/create-topic-button.hbs | 8 +- .../app/templates/components/d-editor.hbs | 54 +--- .../app/templates/components/d-modal.hbs | 14 +- .../components/d-navigation-item.hbs | 4 +- .../app/templates/components/d-navigation.hbs | 51 +-- .../app/templates/components/date-input.hbs | 9 +- .../app/templates/components/date-picker.hbs | 8 +- .../components/date-time-input-range.hbs | 19 +- .../templates/components/date-time-input.hbs | 28 +- .../desktop-notification-config.hbs | 8 +- .../templates/components/directory-item.hbs | 2 +- .../templates/components/directory-table.hbs | 14 +- .../templates/components/discourse-banner.hbs | 2 +- .../components/edit-category-general.hbs | 23 +- .../components/edit-category-images.hbs | 17 +- .../components/edit-category-security.hbs | 16 +- .../components/edit-category-settings.hbs | 132 +++----- .../components/edit-category-tags.hbs | 44 +-- .../edit-category-topic-template.hbs | 2 +- .../components/edit-topic-timer-form.hbs | 33 +- .../app/templates/components/emoji-picker.hbs | 25 +- .../templates/components/emoji-uploader.hbs | 23 +- .../templates/components/featured-topic.hbs | 2 +- .../templates/components/flag-action-type.hbs | 4 +- .../components/future-date-input.hbs | 26 +- .../templates/components/global-notice.hbs | 7 +- .../components/group-activity-filter.hbs | 4 +- .../components/group-card-contents.hbs | 19 +- .../components/group-flair-inputs.hbs | 36 +-- .../components/group-imap-email-settings.hbs | 32 +- .../group-manage-email-settings.hbs | 12 +- .../components/group-manage-logs-filter.hbs | 2 +- .../components/group-manage-logs-row.hbs | 13 +- .../components/group-manage-save-button.hbs | 6 +- .../components/group-membership-button.hbs | 18 +- .../templates/components/group-navigation.hbs | 19 +- .../app/templates/components/group-post.hbs | 4 +- .../components/group-smtp-email-settings.hbs | 26 +- .../groups-form-interaction-fields.hbs | 60 +--- .../groups-form-membership-fields.hbs | 61 +--- .../components/groups-form-profile-fields.hbs | 17 +- .../templates/components/hidden-details.hbs | 5 +- .../components/ignored-user-list-item.hbs | 2 +- .../components/ignored-user-list.hbs | 4 +- .../app/templates/components/invite-panel.hbs | 55 +--- .../app/templates/components/ip-lookup.hbs | 25 +- .../app/templates/components/json-editor.hbs | 10 +- .../components/latest-topic-list-item.hbs | 10 +- .../components/modal-footer-close.hbs | 5 +- .../app/templates/components/nav-item.hbs | 4 +- .../templates/components/navigation-bar.hbs | 6 +- .../notification-consent-banner.hbs | 12 +- .../components/parent-category-row.hbs | 14 +- .../components/pick-files-button.hbs | 2 +- .../templates/components/plugin-outlet.hbs | 2 +- .../components/preference-checkbox.hbs | 2 +- .../components/pwa-install-banner.hbs | 13 +- .../app/templates/components/quote-button.hbs | 46 +-- .../templates/components/related-messages.hbs | 6 +- .../components/relative-time-picker.hbs | 17 +- .../components/reviewable-bundled-action.hbs | 17 +- .../components/reviewable-claimed-topic.hbs | 9 +- .../reviewable-conversation-post.hbs | 2 +- .../components/reviewable-created-by-name.hbs | 5 +- .../components/reviewable-created-by.hbs | 2 +- .../components/reviewable-field-category.hbs | 5 +- .../components/reviewable-field-editor.hbs | 2 +- .../components/reviewable-field-tags.hbs | 8 +- .../components/reviewable-field-text.hbs | 2 +- .../components/reviewable-field-textarea.hbs | 2 +- .../components/reviewable-flagged-post.hbs | 10 +- .../components/reviewable-histories.hbs | 4 +- .../templates/components/reviewable-item.hbs | 34 +- .../components/reviewable-post-header.hbs | 2 +- .../templates/components/reviewable-post.hbs | 8 +- .../components/reviewable-queued-post.hbs | 10 +- .../templates/components/reviewable-score.hbs | 15 +- .../components/reviewable-scores.hbs | 2 +- .../components/reviewable-topic-link.hbs | 6 +- .../templates/components/reviewable-user.hbs | 21 +- .../templates/components/save-controls.hbs | 2 +- .../components/search-advanced-options.hbs | 157 ++------- .../components/search-result-entries.hbs | 8 +- .../components/search-result-entry.hbs | 12 +- .../components/second-factor-input.hbs | 15 +- .../components/security-key-form.hbs | 8 +- .../templates/components/selected-posts.hbs | 30 +- .../app/templates/components/share-panel.hbs | 4 +- .../app/templates/components/share-source.hbs | 7 +- .../components/shared-draft-controls.hbs | 11 +- .../app/templates/components/signup-cta.hbs | 4 +- .../templates/components/slow-mode-info.hbs | 4 +- .../components/sub-category-item.hbs | 4 +- .../templates/components/sub-category-row.hbs | 4 +- .../subcategories-with-featured-topics.hbs | 6 +- .../templates/components/suggested-topics.hbs | 10 +- .../templates/components/tag-groups-form.hbs | 80 +---- .../app/templates/components/tag-info.hbs | 29 +- .../app/templates/components/tag-list.hbs | 2 +- .../app/templates/components/time-input.hbs | 9 +- .../components/time-shortcut-picker.hbs | 18 +- .../components/top-period-buttons.hbs | 2 +- .../templates/components/topic-category.hbs | 2 +- .../components/topic-dismiss-buttons.hbs | 14 +- .../templates/components/topic-entrance.hbs | 8 +- .../components/topic-footer-buttons.hbs | 68 +--- .../app/templates/components/topic-list.hbs | 36 +-- .../components/topic-navigation-popup.hbs | 2 +- .../templates/components/topic-progress.hbs | 4 +- .../app/templates/components/topic-status.hbs | 2 +- .../templates/components/topic-timer-info.hbs | 14 +- .../app/templates/components/topic-title.hbs | 2 +- .../templates/components/track-selected.hbs | 2 +- .../components/uppy-image-uploader.hbs | 18 +- .../components/user-avatar-flair.hbs | 7 +- .../app/templates/components/user-badge.hbs | 4 +- .../components/user-card-contents.hbs | 76 ++--- .../components/user-fields/confirm.hbs | 2 +- .../components/user-fields/dropdown.hbs | 12 +- .../components/user-fields/multiselect.hbs | 12 +- .../templates/components/user-fields/text.hbs | 2 +- .../app/templates/components/user-info.hbs | 6 +- .../user-notification-schedule-day.hbs | 14 +- .../components/user-notification-schedule.hbs | 14 +- .../components/user-profile-avatar.hbs | 4 +- .../components/user-status-picker.hbs | 7 +- .../templates/components/user-stream-item.hbs | 17 +- .../app/templates/components/user-stream.hbs | 7 +- .../user-summary-category-search.hbs | 4 +- .../components/user-summary-topics-list.hbs | 4 +- .../components/user-summary-user.hbs | 4 +- .../discourse/app/templates/composer.hbs | 141 ++------ .../templates/composer/dominating-topic.hbs | 7 +- .../app/templates/composer/get-a-room.hbs | 7 +- .../app/templates/composer/similar-topics.hbs | 2 +- .../discourse/app/templates/discovery.hbs | 21 +- .../app/templates/discovery/categories.hbs | 10 +- .../app/templates/discovery/topics.hbs | 74 +---- .../app/templates/edit-category-tabs.hbs | 45 +-- .../discourse/app/templates/email-login.hbs | 27 +- .../discourse/app/templates/exception.hbs | 4 +- .../app/templates/full-page-search.hbs | 100 ++---- .../app/templates/group-activity-posts.hbs | 8 +- .../app/templates/group-activity-topics.hbs | 9 +- .../discourse/app/templates/group-index.hbs | 57 +--- .../app/templates/group-requests.hbs | 24 +- .../discourse/app/templates/group.hbs | 41 +-- .../app/templates/group/activity.hbs | 12 +- .../discourse/app/templates/group/manage.hbs | 8 +- .../app/templates/group/manage/categories.hbs | 32 +- .../app/templates/group/manage/email.hbs | 2 +- .../templates/group/manage/interaction.hbs | 4 +- .../app/templates/group/manage/logs.hbs | 20 +- .../app/templates/group/manage/membership.hbs | 4 +- .../app/templates/group/manage/profile.hbs | 4 +- .../app/templates/group/manage/tags.hbs | 54 +--- .../app/templates/group/messages.hbs | 12 +- .../discourse/app/templates/groups/index.hbs | 61 ++-- .../discourse/app/templates/groups/new.hbs | 43 +-- .../discourse/app/templates/hide-modal.hbs | 2 +- .../discourse/app/templates/invites/show.hbs | 34 +- .../app/templates/login-preferences.hbs | 2 +- .../mobile/components/categories-only.hbs | 4 +- .../categories-with-featured-topics.hbs | 3 +- .../mobile/components/directory-item.hbs | 4 +- .../mobile/components/navigation-bar.hbs | 4 +- .../mobile/components/parent-category-row.hbs | 10 +- .../mobile/components/sub-category-row.hbs | 4 +- .../subcategories-with-featured-topics.hbs | 6 +- .../app/templates/mobile/discovery/topics.hbs | 41 +-- .../app/templates/mobile/group-index.hbs | 30 +- .../app/templates/mobile/modal/login.hbs | 49 +-- .../discourse/app/templates/mobile/users.hbs | 39 +-- .../discourse/app/templates/modal.hbs | 14 +- .../app/templates/modal/activation-edit.hbs | 13 +- .../app/templates/modal/activation-resent.hbs | 6 +- .../modal/associate-account-confirm.hbs | 13 +- .../app/templates/modal/auth-token.hbs | 12 +- .../app/templates/modal/avatar-selector.hbs | 30 +- .../app/templates/modal/bookmark.hbs | 11 +- .../templates/modal/bulk-actions-buttons.hbs | 2 +- .../templates/modal/bulk-change-category.hbs | 11 +- .../modal/bulk-notification-level.hbs | 7 +- .../app/templates/modal/change-owner.hbs | 19 +- .../templates/modal/change-post-notice.hbs | 12 +- .../app/templates/modal/change-timestamp.hbs | 17 +- .../modal/convert-to-public-topic.hbs | 13 +- .../app/templates/modal/create-account.hbs | 100 ++---- .../templates/modal/create-invite-bulk.hbs | 21 +- .../app/templates/modal/create-invite.hbs | 92 +----- .../templates/modal/delete-topic-confirm.hbs | 13 +- .../modal/delete-topic-disallowed.hbs | 6 +- .../app/templates/modal/discard-draft.hbs | 10 +- .../dismiss-notification-confirmation.hbs | 15 +- .../app/templates/modal/dismiss-read.hbs | 13 +- .../app/templates/modal/do-not-disturb.hbs | 29 +- .../app/templates/modal/download-calendar.hbs | 30 +- .../app/templates/modal/edit-slow-mode.hbs | 40 +-- .../app/templates/modal/edit-topic-timer.hbs | 23 +- .../modal/edit-user-directory-columns.hbs | 30 +- .../templates/modal/explain-reviewable.hbs | 20 +- .../modal/feature-topic-on-profile.hbs | 17 +- .../app/templates/modal/feature-topic.hbs | 72 ++--- .../discourse/app/templates/modal/flag.hbs | 59 +--- .../app/templates/modal/forgot-password.hbs | 24 +- .../app/templates/modal/fullscreen-code.hbs | 4 +- .../app/templates/modal/fullscreen-table.hbs | 4 +- .../app/templates/modal/grant-badge.hbs | 23 +- .../app/templates/modal/group-add-members.hbs | 22 +- .../modal/group-default-notifications.hbs | 8 +- .../discourse/app/templates/modal/history.hbs | 47 ++- .../modal/ignore-duration-with-username.hbs | 27 +- .../app/templates/modal/ignore-duration.hbs | 19 +- .../app/templates/modal/insert-hyperlink.hbs | 30 +- .../templates/modal/json-schema-editor.hbs | 2 +- .../app/templates/modal/jump-to-post.hbs | 18 +- .../modal/keyboard-shortcuts-help.hbs | 4 +- .../discourse/app/templates/modal/login.hbs | 59 +--- .../app/templates/modal/move-to-topic.hbs | 44 ++- .../app/templates/modal/not-activated.hbs | 7 +- .../app/templates/modal/post-enqueued.hbs | 6 +- .../app/templates/modal/publish-page.hbs | 44 +-- .../app/templates/modal/raw-email.hbs | 28 +- .../modal/reject-reason-reviewable.hbs | 15 +- .../templates/modal/reorder-categories.hbs | 12 +- .../modal/request-group-membership-form.hbs | 15 +- .../modal/second-factor-add-security-key.hbs | 15 +- .../modal/second-factor-add-totp.hbs | 25 +- .../modal/second-factor-backup-edit.hbs | 34 +- .../modal/second-factor-edit-security-key.hbs | 20 +- .../templates/modal/second-factor-edit.hbs | 20 +- .../app/templates/modal/share-and-invite.hbs | 6 +- .../app/templates/modal/share-topic.hbs | 43 +-- .../app/templates/modal/tag-upload.hbs | 4 +- .../templates/modal/topic-bulk-actions.hbs | 4 +- .../app/templates/modal/user-status.hbs | 23 +- .../app/templates/navigation/categories.hbs | 13 +- .../app/templates/navigation/category.hbs | 32 +- .../app/templates/navigation/default.hbs | 11 +- .../app/templates/password-reset.hbs | 29 +- .../app/templates/preferences-email.hbs | 16 +- .../templates/preferences-second-factor.hbs | 66 +--- .../app/templates/preferences-username.hbs | 14 +- .../discourse/app/templates/preferences.hbs | 54 ++-- .../app/templates/preferences/account.hbs | 60 ++-- .../app/templates/preferences/apps.hbs | 6 +- .../app/templates/preferences/categories.hbs | 36 +-- .../app/templates/preferences/emails.hbs | 56 +--- .../app/templates/preferences/interface.hbs | 87 ++--- .../templates/preferences/notifications.hbs | 45 +-- .../app/templates/preferences/profile.hbs | 56 +--- .../app/templates/preferences/security.hbs | 12 +- .../app/templates/preferences/tags.hbs | 46 +-- .../app/templates/preferences/users.hbs | 27 +- .../discourse/app/templates/review-index.hbs | 84 ++--- .../app/templates/review-settings.hbs | 13 +- .../discourse/app/templates/review-show.hbs | 2 +- .../discourse/app/templates/review-topics.hbs | 8 +- .../discourse/app/templates/review.hbs | 6 +- .../app/templates/second-factor-auth.hbs | 22 +- .../app/templates/selected-posts.hbs | 15 +- .../discourse/app/templates/static.hbs | 16 +- .../app/templates/tag-groups-edit.hbs | 2 +- .../app/templates/tag-groups-index.hbs | 4 +- .../app/templates/tag-groups-new.hbs | 2 +- .../discourse/app/templates/tag-groups.hbs | 11 +- .../discourse/app/templates/tag/show.hbs | 89 ++---- .../discourse/app/templates/tags.hbs | 4 +- .../discourse/app/templates/tags/index.hbs | 12 +- .../discourse/app/templates/topic.hbs | 293 ++++------------- .../discourse/app/templates/user-card.hbs | 13 +- .../app/templates/user-invited-show.hbs | 38 +-- .../discourse/app/templates/user-invited.hbs | 14 +- .../templates/user-private-messages-tags.hbs | 2 +- .../app/templates/user-topics-list.hbs | 38 +-- .../discourse/app/templates/user.hbs | 106 +++--- .../discourse/app/templates/user/activity.hbs | 38 +-- .../discourse/app/templates/user/badges.hbs | 17 +- .../app/templates/user/bookmarks.hbs | 26 +- .../discourse/app/templates/user/messages.hbs | 67 ++-- .../templates/user/notifications-index.hbs | 6 +- .../app/templates/user/notifications.hbs | 48 ++- .../discourse/app/templates/user/posts.hbs | 2 +- .../discourse/app/templates/user/stream.hbs | 2 +- .../discourse/app/templates/user/summary.hbs | 122 ++++--- .../discourse/app/templates/users.hbs | 45 +-- .../components/combo-box/combo-box-header.hbs | 7 +- .../addon/templates/components/flair-row.hbs | 7 +- .../mini-tag-chooser/selected-collection.hbs | 11 +- .../templates/components/multi-select.hbs | 4 +- .../multi-select/multi-select-header.hbs | 2 +- .../templates/components/pinned-button.hbs | 2 +- .../select-kit/select-kit-filter.hbs | 17 +- .../components/selected-choice-category.hbs | 4 +- .../templates/components/selected-name.hbs | 8 +- .../templates/components/single-select.hbs | 4 +- .../components/topic-notifications-button.hbs | 18 +- .../addon/templates/components/topic-row.hbs | 2 +- .../templates/components/invite-list.hbs | 11 +- .../templates/components/styling-preview.hbs | 5 +- .../components/wizard-field-checkbox.hbs | 6 +- .../components/wizard-field-checkboxes.hbs | 5 +- .../components/wizard-field-radio.hbs | 7 +- .../components/wizard-field-text.hbs | 2 +- .../components/wizard-field-textarea.hbs | 2 +- .../templates/components/wizard-step.hbs | 16 +- .../wizard/addon/templates/step.hbs | 7 +- .../wizard/addon/templates/wizard.hbs | 2 +- 493 files changed, 2978 insertions(+), 7134 deletions(-) diff --git a/app/assets/javascripts/admin/addon/templates/admin.hbs b/app/assets/javascripts/admin/addon/templates/admin.hbs index 8a7c76a1065..cdfe1692918 100644 --- a/app/assets/javascripts/admin/addon/templates/admin.hbs +++ b/app/assets/javascripts/admin/addon/templates/admin.hbs @@ -1,32 +1,32 @@ -{{#admin-wrapper class="container"}} +
    - {{nav-item route="admin.dashboard" label="admin.dashboard.title"}} + {{#if currentUser.admin}} - {{nav-item route="adminSiteSettings" label="admin.site_settings.title"}} + {{/if}} - {{nav-item route="adminUsers" label="admin.users.title"}} + {{#if showGroups}} - {{nav-item route="groups" label="admin.groups.title"}} + {{/if}} {{#if showBadges}} - {{nav-item route="adminBadges" label="admin.badges.title"}} + {{/if}} {{#if currentUser.admin}} - {{nav-item route="adminEmail" label="admin.email.title"}} + {{/if}} - {{nav-item route="adminLogs" label="admin.logs.title"}} - {{nav-item route="adminCustomize" label="admin.customize.title"}} + + {{#if currentUser.admin}} - {{nav-item route="adminApi" label="admin.api.title"}} + {{#if siteSettings.enable_backups}} - {{nav-item route="admin.backups" label="admin.backups.title"}} + {{/if}} {{/if}} - {{nav-item route="adminPlugins" label="admin.plugins.title"}} - {{plugin-outlet name="admin-menu"}} + +
@@ -37,4 +37,4 @@
-{{/admin-wrapper}} + diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs index f5608434adb..24816b5d8da 100644 --- a/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs +++ b/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs @@ -1,11 +1,7 @@ -{{d-button - class="btn-primary" - action=(route-action "new") - icon="plus" - label="admin.api.new_key"}} + {{#if model}} - {{#load-more selector=".api-keys tr" action=(action "loadMore")}} + @@ -28,9 +24,9 @@ {{/each}}
{{i18n "admin.api.key"}}
{{i18n "admin.api.user"}}
{{#if k.user}} - {{#link-to "adminUser" k.user}} + {{avatar k.user imageSize="small"}} - {{/link-to}} + {{else}} {{i18n "admin.api.all_users"}} {{/if}} @@ -48,28 +44,20 @@ {{/if}} 		- {{d-button action=(route-action "show" k) icon="far-eye" title="admin.api.show_details"}} + {{#if k.revoked_at}} - {{d-button - action=(action "undoRevokeKey") - actionParam=k icon="undo" - title="admin.api.undo_revoke"}} + {{else}} - {{d-button - class="btn-danger" - action=(action "revokeKey") - actionParam=k - icon="times" - title="admin.api.revoke"}} + {{/if}}
- {{/load-more}} + - {{conditional-loading-spinner condition=loading}} + {{else}}

{{i18n "admin.api.none"}}

{{/if}} diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs index 7f703c3bc21..d8dc05558e1 100644 --- a/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs +++ b/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs @@ -1,50 +1,46 @@ -{{#link-to "adminApiKeys.index" class="go-back"}} + {{d-icon "arrow-left"}} {{i18n "admin.api.all_api_keys"}} -{{/link-to}} +
{{#if model.id}} - {{#admin-form-row label="admin.api.key"}} +
{{model.key}}
- {{/admin-form-row}} - {{#admin-form-row}} + + {{i18n "admin.api.not_shown_again"}} - {{/admin-form-row}} - {{#admin-form-row}} - {{d-button icon="angle-right" label="admin.api.continue" action=(action "continue") class="btn-primary"}} - {{/admin-form-row}} + + + + {{else}} - {{#admin-form-row label="admin.api.description"}} - {{input value=model.description maxlength="255" placeholder=(i18n "admin.api.description_placeholder")}} - {{/admin-form-row}} + + + - {{#admin-form-row label="admin.api.user_mode"}} - {{combo-box content=userModes value=userMode onChange=(action "changeUserMode")}} - {{/admin-form-row}} + + + {{#if showUserSelector}} - {{#admin-form-row label="admin.api.user"}} - {{email-group-user-chooser - value=model.username - onChange=(action "updateUsername") - options=(hash + + + {{/if}} - {{#admin-form-row label="admin.api.scope_mode"}} - {{combo-box content=scopeModes value=scopeMode onChange=(action "changeScopeMode")}} + + {{#if (eq scopeMode "read_only")}}

{{i18n "admin.api.scopes.descriptions.global.read"}}

{{else if (eq scopeMode "global")}}

{{i18n "admin.api.scopes.global_description"}}

{{/if}} - {{/admin-form-row}} + {{#if (eq scopeMode "granular")}}

{{i18n "admin.api.scopes.title"}}

@@ -68,7 +64,7 @@ {{#each actions as |act|}} - {{input type="checkbox" checked=act.selected}} +
{{act.name}}
@@ -76,11 +72,11 @@ - {{d-button icon="link" action=(action "showURLs" act.urls) class="btn-info"}} + {{#each act.params as |p|}} - {{input maxlength="255" value=(get act p) placeholder=p}} + {{/each}} @@ -90,6 +86,6 @@ {{/if}} - {{d-button icon="check" label="admin.api.save" action=(action "save") class="btn-primary" disabled=saveDisabled}} + {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs index 436e0cf0048..5707d4cf3e9 100644 --- a/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs +++ b/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs @@ -1,17 +1,17 @@ -{{#link-to "adminApiKeys.index" class="go-back"}} + {{d-icon "arrow-left"}} {{i18n "admin.api.all_api_keys"}} -{{/link-to}} +
- {{#admin-form-row label="admin.api.key"}} + {{#if model.revoked_at}}{{d-icon "times-circle"}}{{/if}} {{model.truncatedKey}} - {{/admin-form-row}} + - {{#admin-form-row label="admin.api.description"}} + {{#if editingDescription}} - {{input value=buffered.description maxlength="255" placeholder=(i18n "admin.api.description_placeholder")}} + {{else}} {{if model.description model.description (i18n "admin.api.no_description")}} @@ -20,41 +20,41 @@
{{#if editingDescription}} - {{d-button class="ok" action=(action "saveDescription") icon="check"}} - {{d-button class="cancel" action=(action "editDescription") icon="times"}} + + {{else}} - {{d-button class="btn-default" action=(action "editDescription") icon="pencil-alt"}} + {{/if}}
- {{/admin-form-row}} + - {{#admin-form-row label="admin.api.user"}} + {{#if model.user}} - {{#link-to "adminUser" model.user}} + {{avatar model.user imageSize="small"}} {{model.user.username}} - {{/link-to}} + {{else}} {{i18n "admin.api.all_users"}} {{/if}} - {{/admin-form-row}} + - {{#admin-form-row label="admin.api.created"}} + {{format-date model.created_at leaveAgo="true"}} - {{/admin-form-row}} + - {{#admin-form-row label="admin.api.updated"}} + {{format-date model.updated_at leaveAgo="true"}} - {{/admin-form-row}} + - {{#admin-form-row label="admin.api.last_used"}} + {{#if model.last_used_at}} {{format-date model.last_used_at leaveAgo="true"}} {{else}} {{i18n "admin.api.never_used"}} {{/if}} - {{/admin-form-row}} + - {{#admin-form-row label="admin.api.revoked"}} + {{#if model.revoked_at}} {{format-date model.revoked_at leaveAgo="true"}} {{else}} @@ -62,25 +62,13 @@ {{/if}}
{{#if model.revoked_at}} - {{d-button - action=(action "undoRevokeKey") - actionParam=model icon="undo" - label="admin.api.undo_revoke"}} - {{d-button - action=(action "deleteKey") - actionParam=model icon="trash-alt" - label="admin.api.delete" - class="btn-danger"}} + + {{else}} - {{d-button - class="btn-danger" - action=(action "revokeKey") - actionParam=model - icon="times" - label="admin.api.revoke"}} + {{/if}}
- {{/admin-form-row}} + {{#if model.api_key_scopes.length}}

{{i18n "admin.api.scopes.title"}}

@@ -107,7 +95,7 @@ - {{d-button icon="link" action=(action "showURLs" scope.urls) class="btn-info"}} + {{#each scope.parameters as |p|}} diff --git a/app/assets/javascripts/admin/addon/templates/api.hbs b/app/assets/javascripts/admin/addon/templates/api.hbs index 288bbc71fe8..fd55893fb90 100644 --- a/app/assets/javascripts/admin/addon/templates/api.hbs +++ b/app/assets/javascripts/admin/addon/templates/api.hbs @@ -1,7 +1,7 @@ -{{#admin-nav}} - {{nav-item route="adminApiKeys" label="admin.api.title"}} - {{nav-item route="adminWebHooks" label="admin.web_hooks.title"}} -{{/admin-nav}} + + + +
{{outlet}} diff --git a/app/assets/javascripts/admin/addon/templates/backups-index.hbs b/app/assets/javascripts/admin/addon/templates/backups-index.hbs index cf84d858f81..732b8f308b0 100644 --- a/app/assets/javascripts/admin/addon/templates/backups-index.hbs +++ b/app/assets/javascripts/admin/addon/templates/backups-index.hbs @@ -1,26 +1,14 @@
{{#if localBackupStorage}} - {{uppy-backup-uploader done=(route-action "uploadSuccess") localBackupStorage=localBackupStorage}} + {{else}} - {{uppy-backup-uploader done=(route-action "remoteUploadSuccess")}} + {{/if}} {{#if site.isReadOnly}} - {{d-button - class="btn-default" - icon="far-eye" - action=(action "toggleReadOnlyMode") - disabled=status.isOperationRunning - title="admin.backups.read_only.disable.title" - label="admin.backups.read_only.disable.label"}} + {{else}} - {{d-button - class="btn-default" - icon="far-eye" - action=(action "toggleReadOnlyMode") - disabled=status.isOperationRunning - title="admin.backups.read_only.enable.title" - label="admin.backups.read_only.enable.label"}} + {{/if}}
{{#if status.restoreDisabled}} @@ -41,41 +29,13 @@ {{human-size backup.size}}
- {{d-button class="btn-default download" - action=(action "download") - actionParam=backup - icon="download" - title="admin.backups.operations.download.title" - label="admin.backups.operations.download.label"}} + {{#if status.isOperationRunning}} - {{d-button - icon="far-trash-alt" - action=(route-action "destroyBackup") - actionParam=backup class="btn-danger" - disabled="true" - title="admin.backups.operations.is_running"}} - {{d-button - icon="play" - action=(route-action "startRestore") - actionParam=backup disabled=status.restoreDisabled - class="btn-default" - title=restoreTitle - label="admin.backups.operations.restore.label"}} + + {{else}} - {{d-button - icon="far-trash-alt" - action=(route-action "destroyBackup") - actionParam=backup - class="btn-danger" - title="admin.backups.operations.destroy.title"}} - {{d-button - icon="play" - action=(route-action "startRestore") - actionParam=backup - disabled=status.restoreDisabled - class="btn-default btn-restore" - title=restoreTitle - label="admin.backups.operations.restore.label"}} + + {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/backups-logs.hbs b/app/assets/javascripts/admin/addon/templates/backups-logs.hbs index 34ec15f84a7..1f4a77418d0 100644 --- a/app/assets/javascripts/admin/addon/templates/backups-logs.hbs +++ b/app/assets/javascripts/admin/addon/templates/backups-logs.hbs @@ -1 +1 @@ -{{admin-backups-logs logs=logs status=status}} + diff --git a/app/assets/javascripts/admin/addon/templates/backups.hbs b/app/assets/javascripts/admin/addon/templates/backups.hbs index 2a5e08ce255..ca33af1c50c 100644 --- a/app/assets/javascripts/admin/addon/templates/backups.hbs +++ b/app/assets/javascripts/admin/addon/templates/backups.hbs @@ -2,37 +2,24 @@
- {{plugin-outlet name="before-backup-list" connectorTagName="div"}} +
{{outlet}} diff --git a/app/assets/javascripts/admin/addon/templates/badges-award.hbs b/app/assets/javascripts/admin/addon/templates/badges-award.hbs index 1020f6369df..b91297be450 100644 --- a/app/assets/javascripts/admin/addon/templates/badges-award.hbs +++ b/app/assets/javascripts/admin/addon/templates/badges-award.hbs @@ -1,4 +1,4 @@ -{{#d-section class="award-badge"}} +

{{i18n "admin.badges.mass_award.title"}}

{{i18n "admin.badges.mass_award.description"}}

@@ -18,27 +18,21 @@
{{#if model.multiple_grant}} {{/if}}
- {{d-button - class="btn-primary" - action=(action "massAward") - type="submit" - disabled=massAwardButtonDisabled - icon="certificate" - label="admin.badges.mass_award.perform"}} - {{#link-to "adminBadges.index" class="btn btn-normal"}} + + {{d-icon "times"}} {{i18n "cancel"}} - {{/link-to}} + {{#if saving}} {{i18n "uploading"}} @@ -73,4 +67,4 @@ {{else}} {{i18n "admin.badges.mass_award.no_badge_selected"}} {{/if}} -{{/d-section}} + diff --git a/app/assets/javascripts/admin/addon/templates/badges-index.hbs b/app/assets/javascripts/admin/addon/templates/badges-index.hbs index 4f26fde7f30..240428ab45f 100644 --- a/app/assets/javascripts/admin/addon/templates/badges-index.hbs +++ b/app/assets/javascripts/admin/addon/templates/badges-index.hbs @@ -1,4 +1,4 @@ -{{#d-section class="current-badges"}} +
{{i18n
@@ -13,4 +13,4 @@
-{{/d-section}} + diff --git a/app/assets/javascripts/admin/addon/templates/badges-show.hbs b/app/assets/javascripts/admin/addon/templates/badges-show.hbs index 524a53c8121..75e1803afdd 100644 --- a/app/assets/javascripts/admin/addon/templates/badges-show.hbs +++ b/app/assets/javascripts/admin/addon/templates/badges-show.hbs @@ -1,16 +1,16 @@ -{{#d-section class="current-badge content-body"}} +
{{#if readOnly}} - {{input type="text" name="name" value=buffered.name disabled=true}} +

- {{#link-to "adminSiteText" (query-params q=(concat textCustomizationPrefix "name"))}} + {{i18n "admin.badges.read_only_setting_help"}} - {{/link-to}} +

{{else}} - {{input type="text" name="name" value=buffered.name}} + {{/if}}
@@ -18,114 +18,73 @@
{{#if imageUploaderSelected}} - {{uppy-image-uploader - id="badge-image-uploader" - imageUrl=buffered.image_url - type="badge_image" - onUploadDone=(action "setImage") - onUploadDeleted=(action "removeImage") - class="no-repeat contain-image" - }} +

{{i18n "admin.badges.image_help"}}

{{else if iconSelectorSelected}} - {{icon-picker - name="icon" - value=buffered.icon - options=(hash maximum=1) - onChange=(action (mut buffered.icon)) - }} + {{/if}}
- {{combo-box - name="badge_type_id" - value=buffered.badge_type_id - content=badgeTypes - onChange=(action (mut buffered.badge_type_id)) - options=(hash +
- {{combo-box - name="badge_grouping_id" - value=buffered.badge_grouping_id - content=badgeGroupings - class="badge-selector" - nameProperty="name" - onChange=(action (mut buffered.badge_grouping_id)) - }} - {{d-button - class="btn-default" - action=(route-action "editGroupings") - icon="pencil-alt" - }} + +
{{#if buffered.system}} - {{textarea name="description" value=buffered.description disabled=true}} + - {{d-button - action=(action "copyToClipboard") - class="backup-codes-copy-btn" - icon="copy" - aria-label="user.second_factor_backup.copy_to_clipboard" - title="user.second_factor_backup.copy_to_clipboard"}} + {{else}} - {{d-button - icon="far-star" - class="favorite-btn" - action=onFavoriteClick - title=(if canFavoriteMoreBadges "badges.favorite_max_not_reached" "badges.favorite_max_reached") - disabled=(not canFavoriteMoreBadges) - }} + {{/if}} {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/app/templates/components/badge-title.hbs index 6df7fc0a24b..d32973e1dd7 100644 --- a/app/assets/javascripts/discourse/app/templates/components/badge-title.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/badge-title.hbs @@ -9,23 +9,13 @@
- {{combo-box - value=_selectedUserBadgeId - nameProperty="badge.name" - content=selectableUserBadges - onChange=(action (mut _selectedUserBadgeId)) - }} +
- {{d-button - class="btn-primary" - action=(action "saveBadgeTitle") - disabled=_isSaving - label=(if _isSaving "saving" "save") - }} + {{#if _isSaved}} {{i18n "saved"}} {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs index db3c4d9fcd2..87f36da3851 100644 --- a/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs @@ -1,20 +1,6 @@ -{{#conditional-loading-spinner condition=loading}} + {{#if topics}} - {{topic-list - showPosters=showPosters - hideCategory=hideCategory - topics=topics - expandExcerpts=expandExcerpts - bulkSelectEnabled=bulkSelectEnabled - bulkSelectAction=bulkSelectAction - canBulkSelect=canBulkSelect - selected=selected - tagsForUser=tagsForUser - onScroll=onScroll - scrollOnLoad=scrollOnLoad - toggleBulkSelect=toggleBulkSelect - updateAutoAddTopicsToBulkSelect=updateAutoAddTopicsToBulkSelect - }} + {{else}} {{#unless loadingMore}}
@@ -22,4 +8,4 @@
{{/unless}} {{/if}} -{{/conditional-loading-spinner}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs b/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs index c7954015474..7f1daf30654 100644 --- a/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs @@ -1,5 +1,5 @@ -{{#conditional-loading-spinner condition=loading}} - {{#load-more selector=".bookmark-list .bookmark-list-item" action=loadMore}} + + {{#unless site.mobileView}} @@ -32,7 +32,7 @@ {{d-icon "thumbtack" class="bookmark-pinned"}} {{/if}} {{#if bookmark.bookmarkableTopicAlike}} - {{~topic-status topic=bookmark.topicStatus~}} + {{topic-link bookmark.topicForList}} {{else}} - {{bookmark-actions-dropdown - bookmark=bookmark - removeBookmark=(action "removeBookmark") - editBookmark=(action "editBookmark") - clearBookmarkReminder=(action "clearBookmarkReminder") - togglePinBookmark=(action "togglePinBookmark") - }} + {{/each}}
- {{conditional-loading-spinner condition=loadingMore}} - {{/load-more}} -{{/conditional-loading-spinner}} + + + diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs index 44d14a340a6..6e038c999a9 100644 --- a/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs @@ -1,4 +1,4 @@ -{{#conditional-loading-spinner condition=loading}} + {{#if errorMessage}}
@@ -8,19 +8,14 @@ {{/if}}
- {{input id="bookmark-name" value=model.name name="bookmark-name" class="bookmark-name" enter=(action "saveAndClose") placeholder=(i18n "post.bookmarks.name_placeholder") maxlength="100"}} - {{d-button icon="cog" action=(action "toggleShowOptions") class="bookmark-options-button" ariaLabel="post.bookmarks.options"}} + +
{{#if showOptions}}
- {{combo-box - content=autoDeletePreferences - value=autoDeletePreference - class="bookmark-option-selector" - onChange=(action (mut autoDeletePreference)) - }} +
{{/if}} @@ -37,24 +32,17 @@ {{#if userHasTimezoneSet}} - {{time-shortcut-picker - timeShortcuts=timeOptions - prefilledDatetime=prefilledDatetime - onTimeSelected=(action "onTimeSelected") - hiddenOptions=hiddenTimeShortcutOptions - customLabels=customTimeShortcutLabels - _itsatrap=_itsatrap - }} + {{else}}
{{html-safe (i18n "bookmarks.no_timezone" basePath=(base-path))}}
{{/if}}
- {{d-button id="save-bookmark" label="bookmarks.save" class="btn-primary" action=(action "saveAndClose")}} - {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}} + + {{#if showDelete}} - {{d-button id="delete-bookmark" icon="trash-alt" class="delete-bookmark btn-danger" action=(action "delete")}} + {{/if}}
-{{/conditional-loading-spinner}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs index f34b9e21f20..21fcaeb6987 100644 --- a/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs @@ -1,19 +1,12 @@ {{#each categoryBreadcrumbs as |breadcrumb|}} {{#if breadcrumb.hasOptions}}
  • - {{category-drop - category=breadcrumb.category - categories=breadcrumb.options - tagId=tag.id - editingCategory=editingCategory - editingCategoryTab=editingCategoryTab - options=(hash +
    • {{/if}} {{/each}} @@ -21,24 +14,15 @@ {{#if showTagsSection}} {{#if additionalTags}}
  • - {{tags-intersection-chooser - currentCategory=category - mainTag=tag.id - additionalTags=additionalTags - options=(hash +
    • {{else}}
  • - {{tag-drop - currentCategory=category - noSubcategories=noSubcategories - tagId=tag.id - }} +
    • {{/if}} {{/if}} -{{plugin-outlet name="bread-crumbs-right" connectorTagName="li"}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs b/app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs index 311aaceae07..cdef7f3c203 100644 --- a/app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs @@ -1,3 +1,3 @@ -{{#link-to route args class="cancel"}} + {{i18n "cancel"}} -{{/link-to}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs index 9bd1f392feb..73b51ca62b7 100644 --- a/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs @@ -1,9 +1,9 @@
    - {{categories-only categories=categories}} +
    - {{categories-topic-list topics=topics filter="latest" class="latest-topic-list"}} +
    -{{plugin-outlet name="extra-categories-column" connectorTagName="div"}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs index 803bd2dc8c0..2d33841cca0 100644 --- a/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs @@ -1,9 +1,9 @@
    - {{categories-only categories=categories}} +
    - {{categories-topic-list topics=topics filter="top" class="top-topic-list"}} +
    -{{plugin-outlet name="extra-categories-column" connectorTagName="div"}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs index e25f0d922c1..1a515034835 100644 --- a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs @@ -5,18 +5,12 @@     {{#unless c.isMuted}} {{#if c.uploaded_logo.url}} - {{cdn-img - src=c.uploaded_logo.url - class="logo" - width=c.uploaded_logo.width - height=c.uploaded_logo.height - alt="" - }} + {{/if}} {{/unless}}

    - {{category-title-before category=c}} + {{#if c.read_restricted}} {{d-icon lockIcon}} {{/if}} @@ -30,14 +24,14 @@ {{#if c.topics}}
      {{#each c.topics as |topic|}} - {{categories-boxes-topic topic=topic}} + {{/each}}
    {{/if}}

    {{/unless}} - {{plugin-outlet name="category-box-below-each-category" args=(hash category=c)}} +
    {{/each}} diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs index 95758c17e50..b1da9f26f32 100644 --- a/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs @@ -1,18 +1,12 @@ {{#each categories as |c|}} - {{plugin-outlet name="category-box-before-each-box" args=(hash category=c)}} +
    {{#unless c.isMuted}} {{/unless}} @@ -21,7 +15,7 @@

    - {{category-title-before category=c}} + {{#if c.read_restricted}} {{d-icon lockIcon}} {{/if}} @@ -39,13 +33,13 @@ {{#each c.subcategories as |subcategory|}}
    - {{category-title-link tagName="h4" category=subcategory}} + {{#if subcategory.subcategories}}
    {{#each subcategory.subcategories as |subsubcategory|}} {{#unless subsubcategory.isMuted}} - {{category-title-before category=subsubcategory}} + {{category-link subsubcategory hideParent="true"}} {{/unless}} @@ -60,12 +54,7 @@ {{#each c.subcategories as |sc|}} - {{cdn-img - src=sc.uploaded_logo.url - class="logo" - width=sc.uploaded_logo.width - height=sc.uploaded_logo.height - alt=""}} + {{category-link sc hideParent="true"}} @@ -76,11 +65,11 @@ {{/unless}}
    - {{plugin-outlet name="category-box-below-each-category" args=(hash category=c)}} +
    - {{plugin-outlet name="category-box-after-each-box" args=(hash category=c)}} + {{/each}} -{{plugin-outlet name="category-boxes-after-boxes" args=(hash category=c)}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs index b98eb836296..0a7c9889bb5 100644 --- a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs @@ -12,7 +12,7 @@ {{#each categories as |category|}} - {{parent-category-row category=category showTopics=showTopics}} + {{/each}} @@ -38,7 +38,7 @@ {{#each categories as |category|}} - {{parent-category-row category=category showTopics=showTopics listType="muted"}} + {{/each}} @@ -46,4 +46,4 @@ {{/if}} {{/if}} -{{plugin-outlet name="below-categories-only" connectorTagName="div" args=(hash categories=categories showTopics=showTopics)}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs index b5125ff0892..b25ccba1a07 100644 --- a/app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs @@ -1,11 +1,11 @@
    {{i18n (concat "filters." filter ".title")}} - {{plugin-outlet name="categories-topics-table-heading" connectorTagName="div"}} +
    {{#if topics}} {{#each topics as |t|}} - {{latest-topic-list-item topic=t}} + {{/each}}
    {{i18n "more"}} diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs index b62e4a8fb54..75eaa9bb810 100644 --- a/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs @@ -1,2 +1 @@ -{{categories-only categories=categories - showTopics="true"}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs index 7bcefbbe18b..c470ef1f2bf 100644 --- a/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs @@ -2,11 +2,11 @@ {{#unless category.isUncategorizedCategory}}
    - {{text-field value=category.name placeholderKey="category.name_placeholder" maxlength="50" class="category-name"}} +
    {{/unless}}
    - {{text-field value=category.slug placeholderKey="category.slug_placeholder" maxlength="255"}} +
    diff --git a/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs b/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs index b3ac950558c..975c455d177 100644 --- a/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs @@ -5,25 +5,9 @@ - {{d-button - icon="check-square" - class="btn btn-flat see" - disabled=true - }} + - {{d-button - icon=canReplyIcon - action=(action "setPermissionReply") - translatedTitle=replyTooltip - class=(concat "btn btn-flat reply-toggle " replyGranted) - disabled=replyDisabled - }} + - {{d-button - icon=canCreateIcon - action=(action "setPermissionFull") - translatedTitle=createTooltip - class=(concat "btn btn-flat create-toggle " createGranted) - disabled=createDisabled - }} + diff --git a/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs b/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs index 99761e59b2d..b4cc2ca52cf 100644 --- a/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs @@ -1 +1 @@ -{{plugin-outlet name="category-title-before" args=(hash category=category)}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs index 43cec199dc2..0ca2df142c1 100644 --- a/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs @@ -1,17 +1,12 @@
    - {{category-title-before category=category}} + {{#if category.read_restricted}} {{d-icon lockIcon}} {{/if}} {{dir-span category.name}}
    {{#if category.uploaded_logo.url}} - {{cdn-img - src=category.uploaded_logo.url - class="category-logo" - width=category.uploaded_logo.width - height=category.uploaded_logo.height - alt=""}} + {{/if}}     diff --git a/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs index f8005caa4ad..6561946c4e9 100644 --- a/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs @@ -1,6 +1,6 @@ -{{text-field value=messageTitle placeholderKey="choose_message.title.placeholder" id="choose-message-title"}} + {{#if loading}}

    {{i18n "loading"}}

    diff --git a/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs index 60c99d75417..fcd59e1ed26 100644 --- a/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs @@ -5,11 +5,7 @@ {{i18n labelText}} -{{text-field - value=topicTitle - placeholderKey="choose_topic.title.placeholder" - id="choose-topic-title" -}} + {{#if loading}}

    {{i18n "loading"}}

    @@ -21,14 +17,8 @@ {{#each topics as |t|}}
    - {{conditional-loading-spinner condition=loading}} - {{d-textarea - autocomplete="off" - tabindex=tabindex - value=value - class="d-editor-input" - placeholder=placeholderTranslated - aria-label=placeholderTranslated - disabled=disabled - input=change - focusIn=(action "focusIn") - focusOut=(action "focusOut") - }} - {{popup-input-tip validation=validation}} - {{plugin-outlet name="after-d-editor" connectorTagName="div" args=outletArgs}} + + + +

    @@ -65,14 +35,8 @@ {{html-safe preview}} {{/unless}}
    - {{plugin-outlet name="editor-preview" tagName="span" connectorTagName="div" classNames="d-editor-plugin" args=outletArgs}} +
    -{{emoji-picker - isActive=emojiPickerIsActive - isEditorFocused=isEditorFocused - initialFilter=this.emojiFilter - emojiSelected=(action "emojiSelected") - onEmojiPickerClose=onEmojiPickerClose -}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs index 961d37e8245..b0ce07b0c03 100644 --- a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs @@ -3,12 +3,7 @@
    {{#if dismissable}} - {{d-button - icon="times" - action=(route-action "closeModal" "initiatedByCloseButton") - class="btn-flat modal-close close" - title="modal.close" - }} + {{/if}} {{#if title}} @@ -24,12 +19,7 @@ {{#if panels}}
      {{#each panels as |panel|}} - {{modal-tab - panel=panel - panelsLength=panels.length - selectedPanel=selectedPanel - onSelectPanel=onSelectPanel - }} + {{/each}}
    {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs index b5b04eb673d..9ecb75f9d3f 100644 --- a/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs @@ -1,3 +1,3 @@ -{{#link-to route}} + {{yield}} -{{/link-to}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs index 7c6bcd38dd1..781cc61e275 100644 --- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs @@ -1,76 +1,54 @@ -{{bread-crumbs categories=categories category=category noSubcategories=noSubcategories tag=tag additionalTags=additionalTags}} + {{#unless additionalTags}} {{!-- nav bar doesn't work with tag intersections --}} - {{navigation-bar navItems=navItems filterMode=filterMode category=category}} + {{/unless}}
    {{#if showCategoryAdmin}} - {{categories-admin-dropdown - onChange=(action "selectCategoryAdminDropdownAction") - options=(hash + {{/if}} {{#if category}} {{#unless tag}} {{!-- don't show category edit button on tag pages --}} {{#if showCategoryEdit}} - {{d-button - class="btn-default edit-category" - action=editCategory - icon="wrench" - ariaLabel="category.edit"}} + {{/if}} {{/unless}} {{/if}} {{#if tag}} {{#if showToggleInfo}} - {{d-button icon=(if currentUser.staff "wrench" "info-circle") class="btn-default" ariaLabel="tagging.info" action=toggleInfo id="show-tag-info"}} + {{/if}} {{/if}} - {{plugin-outlet name="before-create-topic-button" connectorTagName="div" tagName="" - args=(hash + - {{create-topic-button - canCreateTopic=canCreateTopic - action=(action "clickCreateTopicButton") - disabled=createTopicButtonDisabled - label=createTopicLabel - btnClass=createTopicClass - canCreateTopicOnTag=canCreateTopicOnTag - }} + - {{plugin-outlet name="after-create-topic-button" connectorTagName="div" tagName="" - args=(hash + {{#if category}} {{#unless tag}} {{!-- don't show category notification menu on tag pages --}} {{#if showCategoryNotifications}} - {{category-notifications-button - value=categoryNotificationLevel - category=category - onChange=(action "changeCategoryNotificationLevel") - }} + {{/if}} {{/unless}} {{/if}} @@ -79,10 +57,7 @@ {{#unless category}} {{!-- don't show tag notification menu on category pages --}} {{#if showTagNotifications}} - {{tag-notifications-button - onChange=changeTagNotificationLevel - value=tagNotification.notification_level - }} + {{/if}} {{/unless}} {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/components/date-input.hbs b/app/assets/javascripts/discourse/app/templates/components/date-input.hbs index 995e421490f..2d13434224b 100644 --- a/app/assets/javascripts/discourse/app/templates/components/date-input.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/date-input.hbs @@ -1,11 +1,4 @@ -{{input - type=inputType - class="date-picker" - placeholder=placeholder - value=(readonly value) - input=(action "onChangeDate") - id=inputId -}} + {{#unless useGlobalPickerContainer}}
    diff --git a/app/assets/javascripts/discourse/app/templates/components/date-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/date-picker.hbs index 5b865fb7c12..0442534ffc6 100644 --- a/app/assets/javascripts/discourse/app/templates/components/date-picker.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/date-picker.hbs @@ -1,7 +1 @@ -{{input - type=inputType - class="date-picker" - placeholder=placeholder - value=value - autocomplete="off" -}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs b/app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs index 6953677d092..24900efae56 100644 --- a/app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs @@ -1,18 +1,3 @@ -{{date-time-input - date=from - onChange=(action "onChangeRanges" (hash prop="from")) - showTime=showFromTime - class="from" - placeholder=(i18n "dates.from_placeholder") -}} + -{{date-time-input - date=to - relativeDate=from - onChange=(action "onChangeRanges" (hash prop="to")) - timeFirst=toTimeFirst - showTime=showToTime - clearable=clearable - class="to" - placeholder=(i18n "dates.to_placeholder") -}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs b/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs index 3101e3b8f27..cf138cd99ad 100644 --- a/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs @@ -1,35 +1,15 @@ {{#unless timeFirst}} - {{date-input - date=date - placeholder=placeholder - relativeDate=relativeDate - onChange=(action "onChangeDate") - useGlobalPickerContainer=useGlobalPickerContainer - }} + {{/unless}} {{#if showTime}} - {{time-input - date=date - relativeDate=relativeDate - onChange=(action "onChangeTime") - }} + {{/if}} {{#if timeFirst}} - {{date-input - date=date - placeholder=placeholder - relativeDate=relativeDate - onChange=(action "onChangeDate") - useGlobalPickerContainer=useGlobalPickerContainer - }} + {{/if}} {{#if clearable}} - {{d-button - class="btn-default clear-date-time" - icon="times" - action=(action "onClear") - }} + {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs index 0d88488ae40..42add6bbec2 100644 --- a/app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs @@ -1,13 +1,13 @@ {{#if isNotSupported}} - {{d-button icon="bell-slash" class="btn-default" label="user.desktop_notifications.not_supported" disabled="true"}} + {{/if}} {{#if isDeniedPermission}} - {{d-button icon="bell-slash" class="btn-default" label="user.desktop_notifications.perm_denied_btn" action=(action "recheckPermission") disabled="true"}} + {{i18n "user.desktop_notifications.perm_denied_expl"}} {{else}} {{#if isEnabled}} - {{d-button icon="far-bell-slash" class="btn-default" label="user.desktop_notifications.disable" action=(action "turnoff")}} + {{else}} - {{d-button icon="far-bell" class="btn-default" label="user.desktop_notifications.enable" action=(action "turnon")}} + {{/if}} {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs b/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs index b1b083beda4..2e8fdb053d6 100644 --- a/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs @@ -1,4 +1,4 @@ -{{user-info user=item.user}} + {{#each columns as |column|}} {{#if (directory-column-is-user-field column=column)}} diff --git a/app/assets/javascripts/discourse/app/templates/components/directory-table.hbs b/app/assets/javascripts/discourse/app/templates/components/directory-table.hbs index 5864d038390..e3a56c286a3 100644 --- a/app/assets/javascripts/discourse/app/templates/components/directory-table.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/directory-table.hbs @@ -5,17 +5,9 @@
    - {{table-header-toggle field="username" order=order asc=asc}} + {{#each columns as |column|}} - {{table-header-toggle - field=column.name - icon=column.icon - order=order - asc=asc - automatic=(directory-column-is-automatic column=column) - translated=column.user_field_id - onActiveRender=setActiveHeader - }} + {{/each}} {{#if showTimeRead}} @@ -24,7 +16,7 @@ {{#each items as |item|}} - {{directory-item item=item columns=columns showTimeRead=showTimeRead}} + {{/each}}
    diff --git a/app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs index f9f2fb55c50..5280df6b30f 100644 --- a/app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs @@ -11,7 +11,7 @@ {{/if}} - {{d-button icon="times" action=(action "dismiss") class="btn btn-flat close" title="banner.close"}} +
    diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs index 4b44458c03a..3e16aaca0b9 100644 --- a/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs @@ -1,22 +1,9 @@
    - {{uppy-image-uploader - imageUrl=backgroundImageUrl - onUploadDone=(action "backgroundUploadDone") - onUploadDeleted=(action "backgroundUploadDeleted") - type="category_background" - id="category-background-uploader" - }} +
    diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs index b538f5acbfe..d0c761cda7e 100644 --- a/app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs @@ -18,7 +18,7 @@
    {{#each category.permissions as |p|}} - {{category-permission-row group_name=p.group_name type=p.permission_type category=category everyonePermission=everyonePermission}} + {{/each}} {{#unless category.permissions}} @@ -30,17 +30,9 @@ {{#if category.availableGroups}}
    - {{combo-box - class="available-groups" - content=category.availableGroups - onChange=(action "onSelectGroup") - value=null - valueProperty=null - nameProperty=null - options=(hash +
    {{/if}} @@ -52,4 +44,4 @@ {{/unless}} -{{plugin-outlet name="category-custom-security" args=(hash category=category) tagName="section"}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs index fb3a3ade063..914209b0608 100644 --- a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs @@ -4,7 +4,7 @@ - {{text-field value=category.position id="category-position" class="position-input" type="number"}} + {{/if}} @@ -23,7 +23,7 @@ {{i18n "category.num_featured_topics"}} {{/if}} - {{text-field value=category.num_featured_topics id="category-number-featured-topics" type="number"}} +
    @@ -31,23 +31,16 @@ {{i18n "category.search_priority.label"}}
    - {{combo-box - valueProperty="value" - id="category-search-priority" - content=searchPrioritiesOptions - value=category.search_priority - onChange=(action (mut category.search_priority)) - options=(hash +
    {{#if siteSettings.enable_badges}}
    @@ -57,7 +50,7 @@
    @@ -66,21 +59,21 @@
    @@ -91,25 +84,20 @@ {{#if siteSettings.enable_category_group_moderation}}
    - {{group-selector - groupFinder=groupFinder - single="true" - groupNames=category.reviewable_by_group_name - placeholderKey="category.review_group_name" - }} +
    {{/if}}
    @@ -120,11 +108,7 @@ {{i18n "category.default_slow_mode"}}
    - {{relative-time-picker - id="category-default-slow-mode" - durationMinutes=category.defaultSlowModeMinutes - hiddenIntervals=hiddenRelativeIntervals - onChange=(action "onDefaultSlowModeDurationChange")}} +
    @@ -135,14 +119,10 @@ {{i18n "topic.auto_close.label"}}
    - {{relative-time-picker - id="topic-auto-close" - durationHours=category.auto_close_hours - hiddenIntervals=hiddenRelativeIntervals - onChange=(action "onAutoCloseDurationChange")}} +
    @@ -153,7 +133,7 @@ - {{text-field value=category.minimum_required_tags id="category-minimum-tags" type="number" min="0"}} + {{/if}} @@ -161,7 +141,7 @@ - {{text-field value=category.custom_fields.num_auto_bump_daily id="category-number-daily-bump" type="number"}} + @@ -173,15 +153,9 @@ {{i18n "category.default_view"}}
    - {{combo-box - valueProperty="value" - id="category-default-view" - content=availableViews - value=category.default_view - options=(hash +
    @@ -190,15 +164,9 @@ {{i18n "category.default_top_period"}}
    - {{combo-box - valueProperty="value" - id="category-default-period" - content=availableTopPeriods - value=category.default_top_period - options=(hash +
    @@ -207,26 +175,14 @@ {{i18n "category.sort_order"}}
    - {{combo-box - valueProperty="value" - content=availableSorts - value=category.sort_order - options=(hash + {{#unless isDefaultSortOrder}} - {{combo-box - valueProperty="value" - content=sortAscendingOptions - value=sortAscendingOption - options=(hash + {{/unless}}
    @@ -236,19 +192,14 @@ {{i18n "category.default_list_filter"}}
    - {{combo-box - id="category-default-filter" - valueProperty="value" - content=availableListFilters - value=category.default_list_filter - }} +
    {{#if isParentCategory}}
    @@ -259,28 +210,17 @@ - {{combo-box - valueProperty="value" - id="subcategory-list-style" - content=availableSubcategoryListStyles - value=category.subcategory_list_style - options=(hash + {{/if}}
    - {{text-field - valueProperty="value" - id="read-only-message" - value=category.read_only_banner - options=(hash +
    @@ -293,24 +233,24 @@ {{d-icon "far-envelope"}} {{i18n "category.email_in"}} - {{text-field id="category-email-in" class="email-in" value=category.email_in}} +
    - {{plugin-outlet name="category-email-in" tagName="span" connectorTagName="div" args=(hash category=category)}} + {{/if}} {{#unless emailInEnabled}} @@ -321,4 +261,4 @@ {{/unless}} -{{plugin-outlet name="category-custom-settings" args=(hash category=category) tagName="section"}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs index b093ec89e67..53ff16c71a6 100644 --- a/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs @@ -1,31 +1,19 @@
    - {{tag-chooser - id="category-allowed-tags" - tags=category.allowed_tags - everyTag=true - excludeSynonyms=true - unlimitedTagCount=true - onChange=(action (mut category.allowed_tags)) - options=(hash +
    - {{tag-group-chooser - id="category-allowed-tag-groups" - tagGroups=category.allowed_tag_groups - onChange=(action (mut category.allowed_tag_groups)) - }} - {{#link-to "tagGroups" class="manage-tag-groups"}}{{i18n "category.manage_tag_groups_link"}}{{/link-to}} + + {{i18n "category.manage_tag_groups_link"}}
    @@ -42,26 +30,14 @@
    {{#each category.required_tag_groups as |rtg|}}
    - {{text-field value=rtg.min_count type="number" min="1"}} - {{tag-group-chooser - tagGroups=(if rtg.name (array rtg.name) (array)) - onChange=(action "onTagGroupChange" rtg) - options=(hash + + +
    {{/each}} - {{d-button - label="category.required_tag_group.add" - action=(action "addRequiredTagGroup") - icon="plus" - class="add-required-tag-group"}} +
    diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs index 955616399b4..f3b1e414ef6 100644 --- a/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs @@ -1 +1 @@ -{{d-editor value=category.topic_template showLink=showInsertLinkButton}} + diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs index c9d6d28ed77..48d1e020629 100644 --- a/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs @@ -1,38 +1,23 @@
    - {{combo-box - class="timer-type" - onChange=onChangeStatusType - content=timerTypes - value=statusType - }} +
    {{#if publishToCategory}}
    - {{category-chooser - value=topicTimer.category_id - onChange=(action (mut topicTimer.category_id)) - options=(hash +
    {{/if}} {{#if showFutureDateInput}} - {{time-shortcut-picker - timeShortcuts=timeOptions - prefilledDatetime=topicTimer.execute_at - onTimeSelected=onTimeSelected - hiddenOptions=hiddenTimeShortcutOptions - _itsatrap=_itsatrap - }} + {{/if}} {{#if useDuration}}
    - {{relative-time-picker onChange=(action "durationChanged") durationMinutes=(readonly topicTimer.duration_minutes)}} +
    {{/if}} {{#if willCloseImmediately}} @@ -43,13 +28,7 @@ {{/if}} {{#if showTopicTimerInfo}}
    - {{topic-timer-info - statusType=statusType - executeAt=executeAt - basedOnLastPost=topicTimer.based_on_last_post - durationMinutes=topicTimer.duration_minutes - categoryId=topicTimer.category_id - }} +
    {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs index fd2a31b4854..3611e0b1c37 100644 --- a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs @@ -9,7 +9,7 @@ {{/if}} - {{emoji-group-buttons onCategorySelection=(action "onCategorySelection") tagName=""}} + {{#each-in customEmojis as |group emojis|}}
    diff --git a/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs index 39b208a3058..c3aa110c1bf 100644 --- a/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs @@ -1,5 +1,5 @@ {{raw "topic-status" topic=topic}} {{html-safe topic.fancyTitle}} -{{topic-post-badges unreadPosts=topic.unread_posts unseen=topic.unseen url=topic.lastUnreadUrl}} + {{format-age topic.last_posted_at}} diff --git a/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs index 88166064c09..50299bac97b 100644 --- a/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs @@ -7,7 +7,7 @@
    {{html-safe flag.description}} {{#if showMessageInput}} - {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}} +