diff --git a/src/assets/lang/en.ts b/src/assets/lang/en.ts index 7e0e77d5cd..f5419e0bea 100644 --- a/src/assets/lang/en.ts +++ b/src/assets/lang/en.ts @@ -1562,6 +1562,7 @@ export default { ascending: 'ascending', descending: 'descending', template: 'Template', + systemFields: 'System fields', }, grid: { media: 'Image', diff --git a/src/packages/core/components/input-entity/input-entity.element.ts b/src/packages/core/components/input-entity/input-entity.element.ts index a36c456d51..5946030eb4 100644 --- a/src/packages/core/components/input-entity/input-entity.element.ts +++ b/src/packages/core/components/input-entity/input-entity.element.ts @@ -148,7 +148,7 @@ export class UmbInputEntityElement extends UmbFormControlMixin + label=${this.localize.term('general_choose')}> `; } diff --git a/src/packages/core/content-type/modals/composition-picker/composition-picker-modal.element.ts b/src/packages/core/content-type/modals/composition-picker/composition-picker-modal.element.ts index eb9739e8c0..f45eea348d 100644 --- a/src/packages/core/content-type/modals/composition-picker/composition-picker-modal.element.ts +++ b/src/packages/core/content-type/modals/composition-picker/composition-picker-modal.element.ts @@ -129,11 +129,13 @@ export class UmbCompositionPickerModalElement extends UmbModalBaseElement<
${!this._references.length - ? html`` + ? html` + + ` : nothing}
@@ -141,7 +143,8 @@ export class UmbCompositionPickerModalElement extends UmbModalBaseElement< } #renderHasReference() { - return html` + return html` + This Content Type is used in a composition, and therefore cannot be composed itself.

@@ -154,19 +157,22 @@ export class UmbCompositionPickerModalElement extends UmbModalBaseElement< ${repeat( this._references, (item) => item.unique, - (item) => - html` html` + + name=${this.localize.string(item.name)}> - `, + + `, )} - `; + + `; } #renderAvailableCompositions() { if (this._compatibleCompositions) { - return html` + return html` + Inherit tabs and properties from an existing Document Type. New tabs will be
added to the current Document Type or merged if a tab with an identical name exists.
@@ -184,11 +190,14 @@ export class UmbCompositionPickerModalElement extends UmbModalBaseElement< : nothing} ${this.#renderCompositionsItems(folder.compositions)}`, )} - `; + + `; } else { - return html` - There are no Content Types available to use as a composition - `; + return html` + + There are no Content Types available to use as a composition + + `; } } @@ -196,15 +205,16 @@ export class UmbCompositionPickerModalElement extends UmbModalBaseElement< return repeat( compositionsList, (compositions) => compositions.unique, - (compositions) => - html` html` + this.#onSelectionAdd(compositions.unique)} @deselected=${() => this.#onSelectionRemove(compositions.unique)} ?selected=${this._selection.find((unique) => unique === compositions.unique)}> - `, + + `, ); } diff --git a/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts b/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts index 109077161d..34e5c02eeb 100644 --- a/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts +++ b/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts @@ -416,14 +416,16 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements return html`
${this._compositionRepositoryAlias - ? html` - - ${this.localize.term('contentTypeEditor_compositions')} - ` + ? html` + + + ${this.localize.term('contentTypeEditor_compositions')} + + ` : ''} diff --git a/src/packages/core/content/workspace/views/edit/content-editor-tab.element.ts b/src/packages/core/content/workspace/views/edit/content-editor-tab.element.ts index 1fb52834a2..bb8a5a451f 100644 --- a/src/packages/core/content/workspace/views/edit/content-editor-tab.element.ts +++ b/src/packages/core/content/workspace/views/edit/content-editor-tab.element.ts @@ -63,7 +63,7 @@ export class UmbContentWorkspaceViewEditTabElement extends UmbLitElement { this._groups, (group) => group.id, (group) => - html` + html` diff --git a/src/packages/core/content/workspace/views/edit/content-editor.element.ts b/src/packages/core/content/workspace/views/edit/content-editor.element.ts index f37657e16d..87db2c05b8 100644 --- a/src/packages/core/content/workspace/views/edit/content-editor.element.ts +++ b/src/packages/core/content/workspace/views/edit/content-editor.element.ts @@ -138,7 +138,7 @@ export class UmbContentWorkspaceViewEditElement extends UmbLitElement implements (tab) => { const path = this._routerPath + '/tab/' + encodeFolderName(tab.name || ''); return html`${tab.name}${this.localize.string(tab.name)}`; }, )} diff --git a/src/packages/core/modal/common/item-picker/item-picker-modal.element.ts b/src/packages/core/modal/common/item-picker/item-picker-modal.element.ts index 20f8747a4f..0f5fa9b803 100644 --- a/src/packages/core/modal/common/item-picker/item-picker-modal.element.ts +++ b/src/packages/core/modal/common/item-picker/item-picker-modal.element.ts @@ -51,7 +51,7 @@ export class UmbItemPickerModalElement extends UmbModalBaseElement +
item.value, (item) => html` this.#submit(item)}> diff --git a/src/packages/data-type/workspace/views/info/data-type-workspace-view-info-reference.element.ts b/src/packages/data-type/workspace/views/info/data-type-workspace-view-info-reference.element.ts index 310b633c3d..29f19e05fd 100644 --- a/src/packages/data-type/workspace/views/info/data-type-workspace-view-info-reference.element.ts +++ b/src/packages/data-type/workspace/views/info/data-type-workspace-view-info-reference.element.ts @@ -87,7 +87,9 @@ export class UmbDataTypeWorkspaceViewInfoReferenceElement extends UmbLitElement (item) => html` - + diff --git a/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts b/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts index ce3702cb23..a0a7d6a13c 100644 --- a/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts +++ b/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts @@ -204,7 +204,7 @@ export class UmbInputDocumentTypeElement extends UmbFormControlMixin + ${this.#renderIcon(item)} diff --git a/src/packages/documents/documents/entity-actions/create/document-create-options-modal.element.ts b/src/packages/documents/documents/entity-actions/create/document-create-options-modal.element.ts index c6e010236a..3f6751d76b 100644 --- a/src/packages/documents/documents/entity-actions/create/document-create-options-modal.element.ts +++ b/src/packages/documents/documents/entity-actions/create/document-create-options-modal.element.ts @@ -133,60 +133,65 @@ export class UmbDocumentCreateOptionsModalElement extends UmbModalBaseElement< } #renderDocumentTypes() { - return html` - ${when( - this._allowedDocumentTypes.length === 0, - () => html` - - There are no allowed Document Types available for creating content here. You must enable these in - Document Types within the Settings section, by editing the - Allowed child node types under Permissions.
-
- this._rejectModal()} - href=${`/section/settings/workspace/document-type/edit/${this.data?.documentType?.unique}/view/structure`} - label=${this.localize.term('create_noDocumentTypesEditPermissions')}> - `, - () => - repeat( - this._allowedDocumentTypes, - (documentType) => documentType.unique, - (documentType) => - html` this.#onSelectDocumentType(documentType.unique)}> - - `, - ), - )} -
`; + return html` + + ${when( + this._allowedDocumentTypes.length === 0, + () => html` + + There are no allowed Document Types available for creating content here. You must enable these in + Document Types within the Settings section, by editing the + Allowed child node types under Permissions.
+
+ this._rejectModal()}> + `, + () => + repeat( + this._allowedDocumentTypes, + (documentType) => documentType.unique, + (documentType) => html` + this.#onSelectDocumentType(documentType.unique)}> + + + `, + ), + )} +
+ `; } #renderBlueprints() { - return html` - this.#onNavigate(this.#documentTypeUnique)}> - - - ${repeat( - this._availableBlueprints, - (blueprint) => blueprint.unique, - (blueprint) => - html` this.#onNavigate(this.#documentTypeUnique, blueprint.unique)}> - - `, - )} `; + return html` + + this.#onNavigate(this.#documentTypeUnique)}> + + + ${repeat( + this._availableBlueprints, + (blueprint) => blueprint.unique, + (blueprint) => + html` this.#onNavigate(this.#documentTypeUnique, blueprint.unique)}> + + `, + )} + + `; } static override styles = [ diff --git a/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts b/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts index 0a650e22e4..13344c29a1 100644 --- a/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts +++ b/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts @@ -252,7 +252,7 @@ export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement { + name=${ifDefined(this.localize.string(this._documentTypeName ?? ''))}>
diff --git a/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts b/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts index 5c2173cdd9..9b7c64f927 100644 --- a/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts +++ b/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts @@ -174,7 +174,7 @@ export class UmbInputMediaTypeElement extends UmbFormControlMixin + ${this.#renderIcon(item)} diff --git a/src/packages/media/media/entity-actions/create/media-create-options-modal.element.ts b/src/packages/media/media/entity-actions/create/media-create-options-modal.element.ts index 2773d3c991..8de7a5fef3 100644 --- a/src/packages/media/media/entity-actions/create/media-create-options-modal.element.ts +++ b/src/packages/media/media/entity-actions/create/media-create-options-modal.element.ts @@ -89,7 +89,8 @@ export class UmbMediaCreateOptionsModalElement extends UmbModalBaseElement< } #renderNotAllowed() { - return html` + return html` + There are no allowed Media Types available for creating media here. You must enable these in Media Types within the Settings section, by editing the Allowed child node types under Permissions. this._rejectModal()} href=${`/section/settings/workspace/media-type/edit/${this.data?.mediaType?.unique}/view/structure`} - label=${this.localize.term('create_noMediaTypesEditPermissions')}>
`; + label=${this.localize.term('create_noMediaTypesEditPermissions')}> + `; } #renderAllowedMediaTypes() { return repeat( this._allowedMediaTypes, (mediaType) => mediaType.unique, - (mediaType) => - html` html` + this.#onNavigate(mediaType)}> ${mediaType.icon ? html`` : nothing} - `, + + `, ); } diff --git a/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts b/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts index 02d36f5921..d66e61df7e 100644 --- a/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts +++ b/src/packages/members/member-type/components/input-member-type/input-member-type.element.ts @@ -137,7 +137,7 @@ export class UmbInputMemberTypeElement extends UmbFormControlMixin + ${when(item.icon, () => html``)} - ${this.localize.term('formSettings_systemFields')} + ${this.localize.term('template_systemFields')} ${this.localize.term('content_documentType')} @@ -174,7 +174,8 @@ export class UmbTemplateFieldDropdownListElement extends UmbLitElement { #renderAliasDropdown() { if (this._type !== FieldType.SYSTEM && !this._unique) return; - return html`${this._uniqueName} + return html` + ${this.localize.string(this._uniqueName ?? '')} ${repeat( @@ -184,7 +185,8 @@ export class UmbTemplateFieldDropdownListElement extends UmbLitElement { html`${field.alias}`, )} - `; + + `; } static override styles = [