A platform for community discussion. Free, open, simple.
UX: Use AdminConfigAreaCard for consistency (#38605)
Jordan Vidrinec8af94c5165e
diff --git a/app/assets/stylesheets/admin/admin_config_area.scss b/app/assets/stylesheets/admin/admin_config_area.scssindex c7d9496574d..7f076b729f0 100644--- a/app/assets/stylesheets/admin/admin_config_area.scss+++ b/app/assets/stylesheets/admin/admin_config_area.scss@@ -125,7 +125,8 @@flex-direction: column;width: calc(100% - 1em);border: 1px solid var(--content-border-color);- padding: 0.5em;+ padding: var(--space-4);+ border-radius: var(--d-border-radius);@media (max-width: $mobile-breakpoint) {flex-direction: column;diff --git a/frontend/discourse/admin/components/admin-logo-form.gjs b/frontend/discourse/admin/components/admin-logo-form.gjsindex 5644ad310a8..8d5dd010c13 100644--- a/frontend/discourse/admin/components/admin-logo-form.gjs+++ b/frontend/discourse/admin/components/admin-logo-form.gjs@@ -234,6 +234,7 @@ export default class AdminLogoForm extends Component {@collapsable={{true}}@collapsed={{true}}>+<:content><form.Field@name="mobile_logo"diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/edit.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/edit.gjsindex a8545af91e2..8a46ac471cd 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/edit.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-ai-features/edit.gjs@@ -1,3 +1,5 @@+import { concat } from "@ember/helper";+import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";import BackButton from "discourse/components/back-button";import Form from "discourse/components/form";import { eq } from "discourse/truth-helpers";@@ -5,61 +7,74 @@ import { i18n } from "discourse-i18n";import AiFeatureSettingField from "discourse/plugins/discourse-ai/discourse/components/ai-feature-setting-field";export default <template>- <BackButton @route="adminPlugins.show.discourse-ai-features" />+ <BackButton+ @route="adminPlugins.show.discourse-ai-features"+ @label="discourse_ai.features.back"+ />+ <div class="admin-config-area">+ <div class="admin-config-area__primary-content admin-ai-features-edit">+ <h2 class="admin-config-area__title">+ {{i18n (concat "discourse_ai.features." @model.module_name ".name")}}+ </h2>+ {{#if @model.feature_settings.length}}+ <AdminConfigAreaCard>+ <:content>+ <Form+ @data={{@model.formData}}+ @onSubmit={{@controller.save}}+ @onRegisterApi={{@controller.onRegisterFormApi}}+ class="ai-feature-editor"+ as |form|+ >+ {{#each @model.settingGroups as |group|}}+ <form.Section @title={{i18n group.titleKey}}>+ {{#each group.settings as |settingName|}}+ {{#let (@controller.findSetting settingName) as |setting|}}+ {{#if setting}}+ <form.Field+ @name={{setting.setting}}+ @title={{setting.humanized_name}}+ @description={{if+ (eq setting.type "bool")+ null+ setting.description+ }}+ @format="large"+ @validation={{@controller.getValidationFor setting}}+ @type={{if+ (eq setting.type "bool")+ "checkbox"+ (if+ (eq setting.type "integer")+ "input-number"+ (if+ (eq setting.type "enum")+ "select"+ (if (eq setting.type "list") "custom" "input")+ )+ )+ }}+ as |field|+ >+ <AiFeatureSettingField+ @Control={{field.Control}}+ @setting={{setting}}+ @field={{field}}+ />+ </form.Field>+ {{/if}}+ {{/let}}+ {{/each}}+ </form.Section>+ {{/each}}+ <form.Actions>+ <form.Submit />+ </form.Actions>+ </Form>+ </:content>+ </AdminConfigAreaCard>- {{#if @model.feature_settings.length}}- <Form- @data={{@model.formData}}- @onSubmit={{@controller.save}}- @onRegisterApi={{@controller.onRegisterFormApi}}- class="ai-feature-editor"- as |form|- >- {{#each @model.settingGroups as |group|}}- <form.Section @title={{i18n group.titleKey}}>- {{#each group.settings as |settingName|}}- {{#let (@controller.findSetting settingName) as |setting|}}- {{#if setting}}- <form.Field- @name={{setting.setting}}- @title={{setting.humanized_name}}- @description={{if- (eq setting.type "bool")- null- setting.description- }}- @format="large"- @validation={{@controller.getValidationFor setting}}- @type={{if- (eq setting.type "bool")- "checkbox"- (if- (eq setting.type "integer")- "input-number"- (if- (eq setting.type "enum")- "select"- (if (eq setting.type "list") "custom" "input")- )- )- }}- as |field|- >- <AiFeatureSettingField- @Control={{field.Control}}- @setting={{setting}}- @field={{field}}- />- </form.Field>- {{/if}}- {{/let}}- {{/each}}- </form.Section>- {{/each}}-- <form.Actions>- <form.Submit />- </form.Actions>- </Form>- {{/if}}+ {{/if}}+ </div>+ </div></template>diff --git a/plugins/discourse-ai/config/locales/client.en.yml b/plugins/discourse-ai/config/locales/client.en.ymlindex 0d3a42e70c8..76fabd9ca00 100644--- a/plugins/discourse-ai/config/locales/client.en.yml+++ b/plugins/discourse-ai/config/locales/client.en.yml@@ -237,7 +237,7 @@ en:features:short_title: "Features"description: "These are the AI features available to visitors on your site. These can be configured to use specific agents and LLMs, and can be access controlled by groups."- back: "Back"+ back: "Back to AI features"settings_save_error: "Some settings could not be saved."disabled: "(disabled)"agent:@@ -318,7 +318,8 @@ en:agents: "Agents"ai_helper:- name: "Helper"+ edit: "Edit AI helper settings"+ name: "AI Helper"description: "Assists users in community interaction, such as creating topics, writing posts, and reading content"proofread: Proofread texttitle_suggestions: "Suggest titles"@@ -512,7 +513,7 @@ en:replies:one: "Apply to first reply only"other: "Apply to first %{count} replies"- back: "Back"+ back: "Back to agents"name: "Name"edit: "Edit"export: "Export"@@ -658,7 +659,7 @@ en:remove: "Remove upload"tools:- back: "Back"+ back: "Back to tools"short_title: "Tools"export: "Export"import: "Import"@@ -718,7 +719,7 @@ en:no_secrets: "No credentials yet"new_title: "New credential"edit_title: "Edit credential"- back: "Back"+ back: "Back to credentials"save: "Save"edit: "Edit"delete: "Delete"@@ -754,7 +755,7 @@ en:save: "Save"edit: "Edit"saved: "LLM model saved"- back: "Back"+ back: "Back to LLMs"confirm_delete: Are you sure you want to delete this model?delete: Deletequotas:@@ -963,7 +964,7 @@ en:short_title: "Embeddings"description: "Embeddings are numerical representations of data that capture meaning and relationships, enabling Discourse AI features like Related Topics and AI Search to understand and connect content."new: "New embedding"- back: "Back"+ back: "Back to embeddings"save: "Save"saved: "Embedding configuration saved"delete: "Delete"@@ -1031,6 +1032,7 @@ en:click_to_run_label: "Run Artifact"ai_bot:+ title: "AI bot"agent: "Agent"llm: "Model"pm_warning: "AI chatbot messages are monitored regularly by moderators."