-
-
- {{#if this.composer.model.createdPost}}
- {{i18n "composer.saved"}}
- {{i18n "composer.view_new_post"}}
- {{else}}
- {{i18n "composer.saving"}}
- {{loading-spinner size="small"}}
- {{/if}}
-
+
+ {{#if this.composer.model.topic}}
+ {{icon "share"}}
+ {{htmlSafe this.composer.draftTitle}}
+ {{else}}
+ {{i18n "composer.saved_draft"}}
+ {{/if}}
+
-
- {{#if this.composer.model.topic}}
- {{d-icon "share"}}
- {{html-safe this.composer.draftTitle}}
- {{else}}
- {{i18n "composer.saved_draft"}}
+
-
-
-
- {{yield}}
-
-{{/if}}
+ {{else}}
+
+ {{yield}}
+
+ {{/if}}
-{{#if this.composer.allowUpload}}
-
-
-{{else}}
-
- {{yield}}
+
+ {{#if this.showFormTemplateForm}}
+
-
+
-
+
+ {{yield}}
- {{#if (gt this.composer.formTemplateIds.length 1)}}
-
+
-
- {{#if this.top}}
-
+ {{#if @model.sharedDrafts}}
+ {{#if this.site.useGlimmerTopicList}}
+
+ {{else}}
+
- {{#if this.category.is_special}}
- {{#if this.category.isUncategorizedCategory}}
-
+ {{#unless this.category.is_special}}
+
+
+ {{#if this.everyoneGrantedFull}}
+
+
+
+}
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-settings.gjs b/app/assets/javascripts/discourse/app/components/edit-category-settings.gjs
index 7405d8d44b7..d55ec7c553c 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-settings.gjs
+++ b/app/assets/javascripts/discourse/app/components/edit-category-settings.gjs
@@ -1,11 +1,23 @@
+import { Input } from "@ember/component";
+import { fn, hash } from "@ember/helper";
+import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { and, empty } from "@ember/object/computed";
import { buildCategoryPanel } from "discourse/components/edit-category-panel";
+import PluginOutlet from "discourse/components/plugin-outlet";
+import RelativeTimePicker from "discourse/components/relative-time-picker";
+import TextField from "discourse/components/text-field";
+import icon from "discourse/helpers/d-icon";
+import getUrl from "discourse/helpers/get-url";
+import htmlSafe from "discourse/helpers/html-safe";
+import withEventValue from "discourse/helpers/with-event-value";
import { setting } from "discourse/lib/computed";
import { SEARCH_PRIORITIES } from "discourse/lib/constants";
import discourseComputed from "discourse/lib/decorators";
import { applyMutableValueTransformer } from "discourse/lib/transformer";
import { i18n } from "discourse-i18n";
+import ComboBox from "select-kit/components/combo-box";
+import GroupChooser from "select-kit/components/group-chooser";
const categorySortCriteria = [];
export function addCategorySortCriteria(criteria) {
@@ -158,405 +170,412 @@ export default class EditCategorySettings extends buildCategoryPanel(
onCategoryModeratingGroupsChange(groupIds) {
this.set("category.moderating_group_ids", groupIds);
}
-}
-
- {{#if this.showPositionInput}}
-
-
-
-
- {{/if}}
-
- {{#unless this.showPositionInput}}
-
- {{html-safe
- (i18n
- "category.position_disabled"
- url=(get-url
- "/admin/site_settings/category/all_results?filter=fixed_category_positions"
- )
- )
- }}
-
- {{/unless}}
-
-
-
-
-
-
-
-
+ {{#unless this.showPositionInput}}
+
+ {{htmlSafe
+ (i18n
+ "category.position_disabled"
+ url=(getUrl
+ "/admin/site_settings/category/all_results?filter=fixed_category_positions"
+ )
+ )
+ }}
+
+ {{/unless}}
- {{#if this.siteSettings.enable_badges}}
-
-
-
- {{/if}}
+
+
+
+
- {{#if this.siteSettings.topic_featured_link_enabled}}
-
-
+
+
+
+
+
+
+
+
- {{/if}}
-
-
-
+
+
+
+
+ {{/if}}
-
-
-
+
+
+
-
-
-
-
+
-
-
-
-
- {{/if}}
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{#if this.isParentCategory}}
-
-
-
- {{/if}}
-
- {{#if this.showSubcategoryListStyle}}
-
-
-
- {{/if}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
- {{/if}}
-
- {{#unless this.emailInEnabled}}
-
- {{html-safe
- (i18n
- "category.email_in_disabled"
- setting_url=(get-url
- "/admin/site_settings/category/all_results?filter=email_in"
- )
- )
- }}
- {{/unless}}
-
-
-
-
\ No newline at end of file
+
+}
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-tags.gjs b/app/assets/javascripts/discourse/app/components/edit-category-tags.gjs
index 308ce016b4d..4064f1f5312 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-tags.gjs
+++ b/app/assets/javascripts/discourse/app/components/edit-category-tags.gjs
@@ -1,6 +1,14 @@
+import { Input } from "@ember/component";
+import { array, fn, hash } from "@ember/helper";
import { action, set } from "@ember/object";
import { and, empty } from "@ember/object/computed";
+import { LinkTo } from "@ember/routing";
+import DButton from "discourse/components/d-button";
import { buildCategoryPanel } from "discourse/components/edit-category-panel";
+import TextField from "discourse/components/text-field";
+import { i18n } from "discourse-i18n";
+import TagChooser from "select-kit/components/tag-chooser";
+import TagGroupChooser from "select-kit/components/tag-group-chooser";
export default class EditCategoryTags extends buildCategoryPanel("tags") {
@empty("category.allowed_tags") allowedTagsEmpty;
@@ -26,90 +34,92 @@ export default class EditCategoryTags extends buildCategoryPanel("tags") {
deleteRequiredTagGroup(rtg) {
this.category.required_tag_groups.removeObject(rtg);
}
-}
-
-
+
+
+
-
-
- {{i18n
- "category.manage_tag_groups_link"
- }}
-
+
+
+ {{i18n
+ "category.manage_tag_groups_link"
+ }}
+
-
-
-
-
-
- {{i18n "category.required_tag_group.description"}}
-
-
-
-
- {{#each this.category.required_tag_groups as |rtg|}}
-
-
\ No newline at end of file
+
+
+
+}
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-topic-template.gjs b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.gjs
index dc26c252534..0e9bb89bb43 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-topic-template.gjs
+++ b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.gjs
@@ -1,9 +1,16 @@
import { tracked } from "@glimmer/tracking";
+import { fn } from "@ember/helper";
+import { on } from "@ember/modifier";
import { action } from "@ember/object";
+import { LinkTo } from "@ember/routing";
import { schedule } from "@ember/runloop";
import { observes } from "@ember-decorators/object";
+import DEditor from "discourse/components/d-editor";
+import DToggleSwitch from "discourse/components/d-toggle-switch";
import { buildCategoryPanel } from "discourse/components/edit-category-panel";
import discourseComputed from "discourse/lib/decorators";
+import { i18n } from "discourse-i18n";
+import FormTemplateChooser from "select-kit/components/form-template-chooser";
export default class EditCategoryTopicTemplate extends buildCategoryPanel(
"topic-template"
@@ -48,43 +55,47 @@ export default class EditCategoryTopicTemplate extends buildCategoryPanel(
);
}
}
-}
-{{#if this.siteSettings.experimental_form_templates}}
-
- {{else}}
-
- {{yield}}
+
+
+
+}
diff --git a/app/assets/javascripts/discourse/app/components/discovery/topics.gjs b/app/assets/javascripts/discourse/app/components/discovery/topics.gjs
index 51ced9ab56b..da68ff16965 100644
--- a/app/assets/javascripts/discourse/app/components/discovery/topics.gjs
+++ b/app/assets/javascripts/discourse/app/components/discovery/topics.gjs
@@ -1,11 +1,30 @@
import Component from "@glimmer/component";
import { tracked } from "@glimmer/tracking";
+import { fn, hash } from "@ember/helper";
+import { on } from "@ember/modifier";
import { action } from "@ember/object";
import { service } from "@ember/service";
+import { or } from "truth-helpers";
+import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
+import CountI18n from "discourse/components/count-i18n";
+import DiscourseLinkedText from "discourse/components/discourse-linked-text";
+import DiscoveryTopicsList from "discourse/components/discovery-topics-list";
+import FooterMessage from "discourse/components/footer-message";
+import NewListHeaderControlsWrapper from "discourse/components/new-list-header-controls-wrapper";
+import PluginOutlet from "discourse/components/plugin-outlet";
+import TopPeriodButtons from "discourse/components/top-period-buttons";
+import TopicDismissButtons from "discourse/components/topic-dismiss-buttons";
+import TopicList from "discourse/components/topic-list";
+import List from "discourse/components/topic-list/list";
+import basePath from "discourse/helpers/base-path";
+import hideApplicationFooter from "discourse/helpers/hide-application-footer";
+import htmlSafe from "discourse/helpers/html-safe";
+import loadingSpinner from "discourse/helpers/loading-spinner";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { filterTypeForMode } from "discourse/lib/filter-mode";
import { userPath } from "discourse/lib/url";
import { i18n } from "discourse-i18n";
+import PeriodChooser from "select-kit/components/period-chooser";
export default class DiscoveryTopics extends Component {
@service router;
@@ -179,218 +198,221 @@ export default class DiscoveryTopics extends Component {
get expandAllPinned() {
return this.args.tag || this.args.category;
}
-}
-{{#if @model.canLoadMore}}
- {{hide-application-footer}}
-{{/if}}
-
-{{#if this.redirectedReason}}
-
+
\ No newline at end of file
+
+}
diff --git a/app/assets/javascripts/discourse/app/components/d-navigation.gjs b/app/assets/javascripts/discourse/app/components/d-navigation.gjs
index a02826ffaf5..f3250d4203c 100644
--- a/app/assets/javascripts/discourse/app/components/d-navigation.gjs
+++ b/app/assets/javascripts/discourse/app/components/d-navigation.gjs
@@ -1,16 +1,28 @@
import { tracked } from "@glimmer/tracking";
import Component from "@ember/component";
+import { hash } from "@ember/helper";
import { action } from "@ember/object";
import { dependentKeyCompat } from "@ember/object/compat";
import { service } from "@ember/service";
import { htmlSafe } from "@ember/template";
import { tagName } from "@ember-decorators/component";
+import { and, gt } from "truth-helpers";
+import BreadCrumbs from "discourse/components/bread-crumbs";
+import BulkSelectToggle from "discourse/components/bulk-select-toggle";
+import CategoryNotificationsTracking from "discourse/components/category-notifications-tracking";
+import CreateTopicButton from "discourse/components/create-topic-button";
+import DButton from "discourse/components/d-button";
+import NavigationBar from "discourse/components/navigation-bar";
+import PluginOutlet from "discourse/components/plugin-outlet";
+import TagNotificationsTracking from "discourse/components/tag-notifications-tracking";
+import TopicDismissButtons from "discourse/components/topic-dismiss-buttons";
import { setting } from "discourse/lib/computed";
import discourseComputed from "discourse/lib/decorators";
import { filterTypeForMode } from "discourse/lib/filter-mode";
import { NotificationLevels } from "discourse/lib/notification-levels";
import { applyValueTransformer } from "discourse/lib/transformer";
import NavItem from "discourse/models/nav-item";
+import CategoriesAdminDropdown from "select-kit/components/categories-admin-dropdown";
@tagName("")
export default class DNavigation extends Component {
@@ -212,151 +224,153 @@ export default class DNavigation extends Component {
this.createTopic();
}
}
-}
-
+ {{yield}}
-
-
- {{! template-lint-disable no-invalid-interactive }}
-
-
-
-
+
-
-{{this.redirectedReason}}
-{{/if}}
-
-{{#if @model.sharedDrafts}}
- {{#if this.site.useGlimmerTopicList}}
-
-
- {{else}}
- {{#if (or this.topicTrackingState.hasIncoming @model.loadingBefore)}}
-
+
+ {{#if @model.canLoadMore}}
+ {{hideApplicationFooter}}
{{/if}}
- {{/if}}
- {{#if this.renderNewListHeaderControls}}
- {{this.redirectedReason}}
{{/if}}
- {{/if}}
-
- {{i18n "category.uncategorized_security_warning"}}
- {{else}} -{{i18n "category.special_warning"}}
- {{/if}} - {{/if}} - - {{#unless this.category.is_special}} - - {{#if this.everyoneGrantedFull}} -{{i18n "category.permissions.everyone_has_access"}}
- {{/if}} - {{/unless}} -{{i18n + "category.permissions.everyone_has_access" + }}
+ {{/if}} + {{/unless}} + + +
-
-
+
+
+
+
+ {{#if this.siteSettings.enable_badges}}
+
+
+
+ {{/if}}
+
+ {{#if this.siteSettings.topic_featured_link_enabled}}
+
+
+ {{/if}}
+
+
-
+
+
+
+
+
+ {{i18n "category.settings_sections.moderation"}}
+ {{#if this.siteSettings.enable_category_group_moderation}} +{{i18n "category.settings_sections.moderation"}}
- {{#if this.siteSettings.enable_category_group_moderation}} -
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- {{i18n "category.settings_sections.appearance"}}
- -
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{#if this.isParentCategory}}
+
+
+
+ {{/if}}
+
+ {{#if this.showSubcategoryListStyle}}
+
+
+
+ {{/if}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{htmlSafe
+ (i18n
+ "category.email_in_disabled"
+ setting_url=(getUrl
+ "/admin/site_settings/category/all_results?filter=email_in"
+ )
+ )
+ }}
+
{{/unless}}
-
- {{i18n "category.settings_sections.appearance"}}
+ +
+
+
+
+
+
+
+
+ {{i18n "category.settings_sections.email"}}
+ + {{#if this.emailInEnabled}} +
-
- {{i18n "category.settings_sections.email"}}
- - {{#if this.emailInEnabled}} -
-
+
+
+
+
+
+
+ {{i18n "category.required_tag_group.description"}}
+
+
+
+
+ {{#each this.category.required_tag_groups as |rtg|}}
+
- {{/each}}
-
+
+ {{/each}}
-
+
+ {{#if this.siteSettings.experimental_form_templates}}
+
+
- {{#if this.showFormTemplate}}
-
-
+
+ {{else}}
+
+ {{#if this.currentUser.staff}}
+
- {{#if this.currentUser.staff}}
-
+ {{#unless this.noRelativeOptions}}
+
+
}
-
-
+
+
+ {{/unless}}
+
+ {{#if this.displayDateAndTimePicker}}
+
+ {{icon "calendar-days"}}
+
+
+
+ {{icon "far-clock"}}
+
+
+ {{/if}}
+
- {{#unless this.noRelativeOptions}}
-
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/group-flair-inputs.gjs b/app/assets/javascripts/discourse/app/components/group-flair-inputs.gjs
index d77353b96e7..86624be00c9 100644
--- a/app/assets/javascripts/discourse/app/components/group-flair-inputs.gjs
+++ b/app/assets/javascripts/discourse/app/components/group-flair-inputs.gjs
@@ -1,14 +1,21 @@
import Component from "@ember/component";
+import { fn, hash } from "@ember/helper";
import { action } from "@ember/object";
import { classNames } from "@ember-decorators/component";
import { observes, on } from "@ember-decorators/object";
import $ from "jquery";
+import { or } from "truth-helpers";
+import AvatarFlair from "discourse/components/avatar-flair";
+import RadioButton from "discourse/components/radio-button";
+import TextField from "discourse/components/text-field";
+import UppyImageUploader from "discourse/components/uppy-image-uploader";
import { ajax } from "discourse/lib/ajax";
import discourseDebounce from "discourse/lib/debounce";
import discourseComputed from "discourse/lib/decorators";
import getURL from "discourse/lib/get-url";
import { convertIconClass } from "discourse/lib/icon-library";
import { i18n } from "discourse-i18n";
+import IconPicker from "select-kit/components/icon-picker";
@classNames("group-flair-inputs")
export default class GroupFlairInputs extends Component {
@@ -93,116 +100,118 @@ export default class GroupFlairInputs extends Component {
flair_upload_id: null,
});
}
-}
-
-
-
- {{/unless}}
-
- {{#if this.displayDateAndTimePicker}}
-
- {{d-icon "calendar-days"}}
-
-
-
- {{d-icon "far-clock"}}
-
-
- {{/if}}
-
-
+
+
+
-
-
-
+
- {{#if this.flairPreviewIcon}}
-
+
-
-
+
+
- {{i18n "groups.flair_upload_description"}}
+ {{#if this.flairPreviewIcon}}
+
- {{/if}}
-
+ {{i18n "groups.flair_upload_description"}}
+
+ {{/if}}
-
+
+
-
-
-{{#if this.flairPreviewIcon}}
-
-
-
-
-{{/if}}
-
-
-
-
-
\ No newline at end of file
+
+
-
-
- 
- {{#if
- (or
- this.model.flair_icon
- this.flairImageUrl
- this.model.flairBackgroundHexColor
- )
- }}
-
+
+
+
{{/if}}
-
+
+
+
+
+}
diff --git a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.gjs b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.gjs
index 06b0ed92d61..0f1d7fd549d 100644
--- a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.gjs
+++ b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.gjs
@@ -1,12 +1,22 @@
-import Component from "@ember/component";
+import Component, { Input } from "@ember/component";
+import { fn, hash } from "@ember/helper";
+import { on } from "@ember/modifier";
import EmberObject, { action } from "@ember/object";
+import { LinkTo } from "@ember/routing";
import { isEmpty } from "@ember/utils";
import { tagName } from "@ember-decorators/component";
-import { on } from "@ember-decorators/object";
+import { on as onEvent } from "@ember-decorators/object";
+import { or } from "truth-helpers";
+import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
+import DButton from "discourse/components/d-button";
+import icon from "discourse/helpers/d-icon";
+import formatDate from "discourse/helpers/format-date";
import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
import discourseComputed from "discourse/lib/decorators";
import emailProviderDefaultSettings from "discourse/lib/email-provider-default-settings";
+import { i18n } from "discourse-i18n";
+import ComboBox from "select-kit/components/combo-box";
@tagName("")
export default class GroupImapEmailSettings extends Component {
@@ -42,7 +52,7 @@ export default class GroupImapEmailSettings extends Component {
this.set("imapSettingsValid", false);
}
- @on("init")
+ @onEvent("init")
_fillForm() {
this.set(
"form",
@@ -88,128 +98,130 @@ export default class GroupImapEmailSettings extends Component {
.catch(popupAjaxError)
.finally(() => this.set("testingSettings", false));
}
-}
-
+
+
+
+
+
+ {{#if
+ (or
+ this.model.flair_icon
+ this.flairImageUrl
+ this.model.flairBackgroundHexColor
+ )
+ }}
+
-