mirror of
https://github.com/discourse/discourse.git
synced 2024-11-25 09:42:07 +08:00
UX: Add description config area card (#29418)
Some checks are pending
Licenses / run (push) Waiting to run
Linting / run (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (backend, core) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (backend, plugins) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (frontend, plugins) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (frontend, themes) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (system, chat) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (system, core) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (system, plugins) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (system, themes) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (annotations, core) (push) Waiting to run
Tests / core frontend (${{ matrix.browser }}) (Chrome) (push) Waiting to run
Tests / core frontend (${{ matrix.browser }}) (Firefox ESR) (push) Waiting to run
Tests / core frontend (${{ matrix.browser }}) (Firefox Evergreen) (push) Waiting to run
Some checks are pending
Licenses / run (push) Waiting to run
Linting / run (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (backend, core) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (backend, plugins) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (frontend, plugins) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (frontend, themes) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (system, chat) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (system, core) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (system, plugins) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (system, themes) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (annotations, core) (push) Waiting to run
Tests / core frontend (${{ matrix.browser }}) (Chrome) (push) Waiting to run
Tests / core frontend (${{ matrix.browser }}) (Firefox ESR) (push) Waiting to run
Tests / core frontend (${{ matrix.browser }}) (Firefox Evergreen) (push) Waiting to run
* DEV: add a description to the config area card component * UX: update strings and placeholders for your org config area card
This commit is contained in:
parent
de16947b9b
commit
311c042700
|
@ -16,6 +16,17 @@ export default class AdminConfigAreaCard extends Component {
|
||||||
return this.args.heading || this.args.translatedHeading;
|
return this.args.heading || this.args.translatedHeading;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get computedDescription() {
|
||||||
|
if (this.args.description) {
|
||||||
|
return I18n.t(this.args.description);
|
||||||
|
}
|
||||||
|
return this.args.translatedDescription;
|
||||||
|
}
|
||||||
|
|
||||||
|
get hasDescription() {
|
||||||
|
return this.args.description || this.args.translatedDescription;
|
||||||
|
}
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<section class="admin-config-area-card" ...attributes>
|
<section class="admin-config-area-card" ...attributes>
|
||||||
<div class="admin-config-area-card__header-wrapper">
|
<div class="admin-config-area-card__header-wrapper">
|
||||||
|
@ -35,6 +46,11 @@ export default class AdminConfigAreaCard extends Component {
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
<div class="admin-config-area-card__content">
|
<div class="admin-config-area-card__content">
|
||||||
|
{{#if this.hasDescription}}
|
||||||
|
<p class="admin-config-area-card__description">
|
||||||
|
{{this.computedDescription}}
|
||||||
|
</p>
|
||||||
|
{{/if}}
|
||||||
{{yield to="content"}}
|
{{yield to="content"}}
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
|
@ -76,6 +76,7 @@ export default class AdminConfigAreasAbout extends Component {
|
||||||
</AdminConfigAreaCard>
|
</AdminConfigAreaCard>
|
||||||
<AdminConfigAreaCard
|
<AdminConfigAreaCard
|
||||||
@heading="admin.config_areas.about.your_organization"
|
@heading="admin.config_areas.about.your_organization"
|
||||||
|
@description="admin.config_areas.about.your_organization_description"
|
||||||
class="admin-config-area-about__your-organization-section"
|
class="admin-config-area-about__your-organization-section"
|
||||||
>
|
>
|
||||||
<:content>
|
<:content>
|
||||||
|
|
|
@ -5635,19 +5635,20 @@ en:
|
||||||
site_contact_group: "Site contact group"
|
site_contact_group: "Site contact group"
|
||||||
site_contact_group_help: |
|
site_contact_group_help: |
|
||||||
The group that gets invited to all automatically sent private messages.
|
The group that gets invited to all automatically sent private messages.
|
||||||
your_organization: "Organization name"
|
your_organization: "Your organization"
|
||||||
company_name: "Company name"
|
your_organization_description: "We'll use this information in the Terms of Service and Privacy Notice to show who operates the site and under which jurisdiction."
|
||||||
company_name_placeholder: "Sample Company Inc."
|
company_name: "Name"
|
||||||
|
company_name_placeholder: "Acme Organization"
|
||||||
company_name_warning: |
|
company_name_warning: |
|
||||||
If left blank, no boilerplate Terms of Service or Privacy Notice will be provided.
|
If left blank, no boilerplate Terms of Service or Privacy Notice will be provided.
|
||||||
governing_law: "Governing law"
|
governing_law: "Governing law"
|
||||||
governing_law_placeholder: "State of New York"
|
governing_law_placeholder: "Province, State, or Country"
|
||||||
governing_law_help: |
|
governing_law_help: |
|
||||||
Specify the jurisdiction that governs the legal aspects of the site, including Terms of Service and Privacy Notice. This is typically the country or state where the company operating the site is registered or conducts business.
|
Specify the jurisdiction for the site's legal terms, typically where the company is registered or operates.
|
||||||
city_for_disputes: "City for disputes"
|
city_for_disputes: "City for disputes"
|
||||||
city_for_disputes_placeholder: "New York City"
|
city_for_disputes_placeholder: "City"
|
||||||
city_for_disputes_help: |
|
city_for_disputes_help: |
|
||||||
Specify the city that will be used as the jurisdiction for resolving any disputes related to the use of this forum. This information is typically included in legal documents such as the forum's Terms of Service.
|
Specify the city for resolving legal disputes related to this forum.
|
||||||
optional: "(optional)"
|
optional: "(optional)"
|
||||||
update: "Update"
|
update: "Update"
|
||||||
toasts:
|
toasts:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user