Skip to content

Commit 4aae502

Browse files
committed
add layout element
1 parent b840fec commit 4aae502

File tree

9 files changed

+44
-52
lines changed

9 files changed

+44
-52
lines changed

src/Umbraco.Web.UI.Client/src/packages/documents/documents/audit-log/info-app/document-history-workspace-info-app.element.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,12 @@ export class UmbDocumentHistoryWorkspaceInfoAppElement extends UmbLitElement {
182182
gap: var(--uui-size-layout-1);
183183
}
184184
185+
.log-type uui-tag {
186+
height: fit-content;
187+
margin-top: auto;
188+
margin-bottom: auto;
189+
}
190+
185191
uui-pagination {
186192
flex: 1;
187193
display: flex;

src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/info-app/document-links-workspace-info-app.element.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@ export class UmbDocumentLinksWorkspaceInfoAppElement extends UmbLitElement {
257257
justify-content: space-between;
258258
align-items: center;
259259
gap: var(--uui-size-6);
260-
261-
padding: var(--uui-size-space-4) var(--uui-size-space-6);
260+
padding: var(--uui-size-space-4) var(--uui-size-space-5);
262261
263262
&:is(a) {
264263
cursor: pointer;

src/Umbraco.Web.UI.Client/src/packages/media/media/audit-log/info-app/manifests.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ export const manifests: Array<UmbExtensionManifest> = [
88
alias: 'Umb.WorkspaceInfoApp.Media.History',
99
element: () => import('./media-history-workspace-info-app.element.js'),
1010
weight: 80,
11-
meta: {
12-
label: '#general_history',
13-
},
1411
conditions: [
1512
{
1613
alias: UMB_WORKSPACE_CONDITION_ALIAS,

src/Umbraco.Web.UI.Client/src/packages/media/media/audit-log/info-app/media-history-workspace-info-app.element.ts

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { UMB_MEDIA_WORKSPACE_CONTEXT } from '../../workspace/constants.js';
22
import type { UmbMediaAuditLogModel } from '../types.js';
33
import { UmbMediaAuditLogRepository } from '../repository/index.js';
44
import { getMediaHistoryTagStyleAndText, TimeOptions } from './utils.js';
5-
import { css, html, customElement, state, nothing, repeat } from '@umbraco-cms/backoffice/external/lit';
5+
import { css, html, customElement, state, nothing, repeat, when } from '@umbraco-cms/backoffice/external/lit';
66
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
77
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
88
import { UmbPaginationManager } from '@umbraco-cms/backoffice/utils';
@@ -84,8 +84,16 @@ export class UmbMediaHistoryWorkspaceInfoAppElement extends UmbLitElement {
8484

8585
override render() {
8686
return html`
87-
${this._items ? this.#renderHistory() : html`<uui-loader-circle></uui-loader-circle> `}
88-
${this.#renderPagination()}
87+
<umb-workspace-info-app-layout headline="#general_history">
88+
<div id="content">
89+
${when(
90+
this._items,
91+
() => this.#renderHistory(),
92+
() => html`<div id="loader"><uui-loader></uui-loader></div>`,
93+
)}
94+
${this.#renderPagination()}
95+
</div>
96+
</umb-workspace-info-app-layout>
8997
`;
9098
}
9199

@@ -142,30 +150,30 @@ export class UmbMediaHistoryWorkspaceInfoAppElement extends UmbLitElement {
142150
static override styles = [
143151
UmbTextStyles,
144152
css`
145-
:host {
153+
#content {
146154
display: block;
147155
padding: var(--uui-size-space-4) var(--uui-size-space-5);
148156
}
149157
150-
uui-loader-circle {
151-
font-size: 2rem;
158+
#loader {
159+
display: flex;
160+
justify-content: center;
152161
}
153162
154-
uui-tag uui-icon {
155-
margin-right: var(--uui-size-space-1);
163+
.log-type {
164+
display: grid;
165+
grid-template-columns: var(--uui-size-40) auto;
166+
gap: var(--uui-size-layout-1);
156167
}
157168
158-
.log-type {
159-
flex-grow: 1;
160-
gap: var(--uui-size-space-2);
169+
.log-type uui-tag {
170+
height: fit-content;
171+
margin-top: auto;
172+
margin-bottom: auto;
161173
}
162174
163175
uui-pagination {
164176
flex: 1;
165-
display: inline-block;
166-
}
167-
168-
.pagination {
169177
display: flex;
170178
justify-content: center;
171179
margin-top: var(--uui-size-layout-1);

src/Umbraco.Web.UI.Client/src/packages/media/media/reference/info-app/manifests.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ export const manifests: Array<UmbExtensionManifest> = [
88
alias: 'Umb.WorkspaceInfoApp.Media.References',
99
element: () => import('./media-references-workspace-info-app.element.js'),
1010
weight: 90,
11-
meta: {
12-
label: '#references_labelUsedByItems',
13-
},
1411
conditions: [
1512
{
1613
alias: UMB_WORKSPACE_CONDITION_ALIAS,

src/Umbraco.Web.UI.Client/src/packages/media/media/reference/info-app/media-references-workspace-info-app.element.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,20 +155,20 @@ export class UmbMediaReferencesWorkspaceInfoAppElement extends UmbLitElement {
155155
}
156156

157157
override render() {
158+
if (!this._items?.length) return nothing;
158159
return html`
159-
${when(
160-
this._loading,
161-
() => html`<uui-loader></uui-loader>`,
162-
() => html`${this.#renderItems()} ${this.#renderPagination()}`,
163-
)}
160+
<umb-workspace-info-app-layout headline="#references_labelUsedByItems">
161+
${when(
162+
this._loading,
163+
() => html`<uui-loader></uui-loader>`,
164+
() => html`${this.#renderItems()} ${this.#renderPagination()}`,
165+
)}
166+
</umb-workspace-info-app-layout>
164167
`;
165168
}
166169

167170
#renderItems() {
168-
if (!this._items?.length)
169-
return html`<p>
170-
<umb-localize key="references_itemHasNoReferences">This item has no references.</umb-localize>
171-
</p>`;
171+
if (!this._items?.length) return nothing;
172172
return html`
173173
<uui-table>
174174
<uui-table-head>

src/Umbraco.Web.UI.Client/src/packages/media/media/url/info-app/manifests.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ export const manifests: Array<UmbExtensionManifest> = [
88
alias: 'Umb.WorkspaceInfoApp.Media.Links',
99
element: () => import('./media-links-workspace-info-app.element.js'),
1010
weight: 100,
11-
meta: {
12-
label: '#general_links',
13-
},
1411
conditions: [
1512
{
1613
alias: UMB_WORKSPACE_CONDITION_ALIAS,

src/Umbraco.Web.UI.Client/src/packages/media/media/url/info-app/media-links-workspace-info-app.element.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ export class UmbMediaLinksWorkspaceInfoAppElement extends UmbLitElement {
3232
}
3333

3434
protected override render() {
35-
return html` ${this.#renderLinksSection()} `;
35+
return html`<umb-workspace-info-app-layout headline="#general_links">
36+
${this.#renderLinksSection()}
37+
</umb-workspace-info-app-layout> `;
3638
}
3739

3840
#openSvg(imagePath: string) {
@@ -100,7 +102,7 @@ export class UmbMediaLinksWorkspaceInfoAppElement extends UmbLitElement {
100102
}
101103
102104
.link-item {
103-
padding: var(--uui-size-space-4) var(--uui-size-space-6);
105+
padding: var(--uui-size-space-4) var(--uui-size-space-5);
104106
display: grid;
105107
grid-template-columns: 1fr auto;
106108
gap: var(--uui-size-6);

src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info.element.ts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,7 @@ export class UmbMediaWorkspaceViewInfoElement extends UmbLitElement {
102102
override render() {
103103
return html`
104104
<div class="container">
105-
<umb-extension-slot
106-
id="workspace-info-apps"
107-
type="workspaceInfoApp"
108-
.renderMethod=${this.#renderInfoApp}></umb-extension-slot>
105+
<umb-extension-slot id="workspace-info-apps" type="workspaceInfoApp"></umb-extension-slot>
109106
</div>
110107
<div class="container">
111108
<uui-box headline=${this.localize.term('general_general')} id="general-section"
@@ -115,17 +112,6 @@ export class UmbMediaWorkspaceViewInfoElement extends UmbLitElement {
115112
`;
116113
}
117114

118-
#renderInfoApp(initializer: UmbExtensionElementInitializer<ManifestWorkspaceInfoApp>) {
119-
const headline = initializer.manifest?.meta.label;
120-
return html`
121-
<uui-box
122-
headline=${ifDefined(headline ? this.localize.string(headline) : undefined)}
123-
style="--uui-box-default-padding:0">
124-
${initializer.component}</uui-box
125-
>
126-
`;
127-
}
128-
129115
#renderGeneralSection() {
130116
return html`
131117
${this.#renderCreateDate()} ${this.#renderUpdateDate()}

0 commit comments

Comments
 (0)