Skip to content

Commit e8d87d5

Browse files
committed
Merge branch 'main' into v15/dev
2 parents 4e05db1 + 15302db commit e8d87d5

35 files changed

+224
-59
lines changed

src/assets/lang/bs.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,12 +1532,12 @@ export default {
15321532
andAllMediaItems: 'i sve medijske stavke koje koriste ovu vrstu',
15331533
andAllMembers: 'i svi članovi koji koriste ovaj tip',
15341534
memberCanEdit: 'Član može uređivati',
1535-
memberCanEditDescription: 'Dozvolite da ovu vrijednost svojstva uređuje član na svojoj stranici profila\n ',
1535+
memberCanEditDescription: 'Dozvolite da ovu vrijednost svojstva uređuje član na svojoj stranici profila',
15361536
isSensitiveData: 'Osjetljivi podaci',
15371537
isSensitiveDataDescription:
1538-
'Sakrij ovu vrijednost svojstva od uređivača sadržaja koji nemaju pristup pregledu\n osjetljive informacije\n ',
1538+
'Sakrij ovu vrijednost svojstva od uređivača sadržaja koji nemaju pristup pregledu osjetljive informacije',
15391539
showOnMemberProfile: 'Prikaži na profilu člana',
1540-
showOnMemberProfileDescription: 'Dozvolite da se ova vrijednost svojstva prikaže na stranici profila člana\n ',
1540+
showOnMemberProfileDescription: 'Dozvolite da se ova vrijednost svojstva prikaže na stranici profila člana',
15411541
tabHasNoSortOrder: 'kartica nema redoslijed sortiranja',
15421542
compositionUsageHeading: 'Gdje se koristi ovaj sastav?',
15431543
compositionUsageSpecification: 'Ovaj sastav se trenutno koristi u sastavu sljedećih\n tipa sadržaja:\n ',

src/assets/lang/da-dk.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1636,7 +1636,7 @@ export default {
16361636
memberCanEditDescription: 'Tillad at denne egenskab kan redigeres af medlemmet på dets profil.',
16371637
isSensitiveData: 'Er følsom data',
16381638
isSensitiveDataDescription:
1639-
'Skjul værdien af denne egenskab for indholdsredaktører der ikke har adgang\n til at se følsomme data\n ',
1639+
'Skjul værdien af denne egenskab for indholdsredaktører der ikke har adgang til at se følsomme data',
16401640
showOnMemberProfile: 'Vis på medlemsprofil',
16411641
showOnMemberProfileDescription: 'Tillad at denne egenskab kan vises på medlemmets profil.',
16421642
tabHasNoSortOrder: 'fane har ingen sorteringsrækkefølge',

src/assets/lang/de-de.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,11 +1552,10 @@ export default {
15521552
andAllMediaItems: 'und alle Medienelemente, die auf diesem Typ basieren',
15531553
andAllMembers: 'und alle Mitglieder, die auf diesem Typ basieren',
15541554
memberCanEdit: 'Mitglied kann bearbeiten',
1555-
memberCanEditDescription:
1556-
'\n Diese Eigenschaft zur Bearbeitung des Mitglieds auf seiner Profileseite freigeben\n ',
1555+
memberCanEditDescription: 'Diese Eigenschaft zur Bearbeitung des Mitglieds auf seiner Profileseite freigeben',
15571556
isSensitiveData: 'sensibelle Daten',
15581557
isSensitiveDataDescription:
1559-
'\n Diese Eigenschaft für Editoren, die keine Berechtigung für sensibelle Daten haben, verbergen\n ',
1558+
'Diese Eigenschaft für Editoren, die keine Berechtigung für sensibelle Daten haben, verbergen',
15601559
showOnMemberProfile: 'Auf Mitgliedsprofil anzeigen',
15611560
showOnMemberProfileDescription:
15621561
'Diesen Eigenschaftswert für die Anzeige auf der Profilseite des Mitglieds zulassen',

src/assets/lang/en-us.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1646,12 +1646,12 @@ export default {
16461646
andAllMediaItems: 'and all media items using this type',
16471647
andAllMembers: 'and all members using this type',
16481648
memberCanEdit: 'Member can edit',
1649-
memberCanEditDescription: 'Allow this property value to be edited by the member on their profile page\n ',
1649+
memberCanEditDescription: 'Allow this property value to be edited by the member on their profile page',
16501650
isSensitiveData: 'Is sensitive data',
16511651
isSensitiveDataDescription:
1652-
"Hide this property value from content editors that don't have access to view\n sensitive information\n ",
1652+
"Hide this property value from content editors that don't have access to view sensitive information",
16531653
showOnMemberProfile: 'Show on member profile',
1654-
showOnMemberProfileDescription: 'Allow this property value to be displayed on the member profile page\n ',
1654+
showOnMemberProfileDescription: 'Allow this property value to be displayed on the member profile page',
16551655
tabHasNoSortOrder: 'tab has no sort order',
16561656
compositionUsageHeading: 'Where is this composition used?',
16571657
compositionUsageSpecification:

src/assets/lang/en.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1668,12 +1668,12 @@ export default {
16681668
andAllMediaItems: 'and all media items using this type',
16691669
andAllMembers: 'and all members using this type',
16701670
memberCanEdit: 'Member can edit',
1671-
memberCanEditDescription: 'Allow this property value to be edited by the member on their profile page\n ',
1671+
memberCanEditDescription: 'Allow this property value to be edited by the member on their profile page',
16721672
isSensitiveData: 'Is sensitive data',
16731673
isSensitiveDataDescription:
1674-
"Hide this property value from content editors that don't have access to view\n sensitive information\n ",
1674+
"Hide this property value from content editors that don't have access to view sensitive information",
16751675
showOnMemberProfile: 'Show on member profile',
1676-
showOnMemberProfileDescription: 'Allow this property value to be displayed on the member profile page\n ',
1676+
showOnMemberProfileDescription: 'Allow this property value to be displayed on the member profile page',
16771677
tabHasNoSortOrder: 'tab has no sort order',
16781678
compositionUsageHeading: 'Where is this composition used?',
16791679
compositionUsageSpecification:

src/assets/lang/hr-hr.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,12 +1575,12 @@ export default {
15751575
andAllMediaItems: 'i sve medijske stavke koje koriste ovu vrstu',
15761576
andAllMembers: 'i svi članovi koji koriste ovu vrstu',
15771577
memberCanEdit: 'Član može uređivati',
1578-
memberCanEditDescription: 'Dozvolite da ovu vrijednost svojstva da uređuje član na svojoj stranici profila\n ',
1578+
memberCanEditDescription: 'Dozvolite da ovu vrijednost svojstva da uređuje član na svojoj stranici profila',
15791579
isSensitiveData: 'Osjetljivi podaci',
15801580
isSensitiveDataDescription:
1581-
'Sakrij ovu vrijednost svojstva od urednika sadržaja koji nemaju pristup pregledu\n osjetljive informacije\n ',
1581+
'Sakrij ovu vrijednost svojstva od urednika sadržaja koji nemaju pristup pregledu osjetljive informacije',
15821582
showOnMemberProfile: 'Prikaži na profilu člana',
1583-
showOnMemberProfileDescription: 'Dozvolite da se ova vrijednost svojstva prikaže na stranici profila člana\n ',
1583+
showOnMemberProfileDescription: 'Dozvolite da se ova vrijednost svojstva prikaže na stranici profila člana',
15841584
tabHasNoSortOrder: 'kartica nema redoslijed sortiranja',
15851585
compositionUsageHeading: 'Gdje se koristi ovaj sastav?',
15861586
compositionUsageSpecification: 'Ovaj sastav se trenutno koristi u sastavu sljedećih\n vrsta sadržaja:\n ',

src/assets/lang/it-it.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,14 +1555,13 @@ export default {
15551555
andAllMediaItems: 'e tutti i media che usano questo tipo',
15561556
andAllMembers: 'e tutti i membri che usano questo tipo',
15571557
memberCanEdit: 'Il membro può modificare',
1558-
memberCanEditDescription:
1559-
'Abilita il membro alla modifica di questo valore dalla pagina del suo\n profilo.\n ',
1558+
memberCanEditDescription: 'Abilita il membro alla modifica di questo valore dalla pagina del suo profilo.',
15601559
isSensitiveData: 'Dati sensibili',
15611560
isSensitiveDataDescription:
15621561
"Nascondi il valore di questa proprietà dagli editors che non hanno l'accesso per visualizzare i dati sensibili",
15631562
showOnMemberProfile: 'Visualizza sul profilo del membro',
15641563
showOnMemberProfileDescription:
1565-
'Permette a questo valore di essere visualizzato sulla pagina del profilo\n del membro\n ',
1564+
'Permette a questo valore di essere visualizzato sulla pagina del profilo del membro',
15661565
tabHasNoSortOrder: 'la scheda non ha un ordine',
15671566
compositionUsageHeading: 'Dove è usata questa composizione?',
15681567
compositionUsageSpecification: 'Questa composizione è usata nella composizione dei seguenti tipi di contenuto:',

src/assets/lang/nl-nl.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1492,14 +1492,12 @@ export default {
14921492
andAllMediaItems: 'en alle media items van dit type',
14931493
andAllMembers: 'en alle leden van dit type',
14941494
memberCanEdit: 'Lid kan bewerken',
1495-
memberCanEditDescription:
1496-
'Toestaan dat deze eigenschap kan worden gewijzigd door het lid op zijn profiel\n pagina.\n ',
1495+
memberCanEditDescription: 'Toestaan dat deze eigenschap kan worden gewijzigd door het lid op zijn profiel pagina.',
14971496
isSensitiveData: 'Omvat gevoelige gegevens',
14981497
isSensitiveDataDescription:
1499-
'Verberg deze eigenschap voor de content editor die geen toegang heeft tot\n het bekijken van gevoelige informatie.\n ',
1498+
'Verberg deze eigenschap voor de content editor die geen toegang heeft tot het bekijken van gevoelige informatie.',
15001499
showOnMemberProfile: 'Toon in het profiel van leden',
1501-
showOnMemberProfileDescription:
1502-
'Toelaten dat deze eigenschap wordt getoond op de profiel pagina van het\n lid.\n ',
1500+
showOnMemberProfileDescription: 'Toelaten dat deze eigenschap wordt getoond op de profiel pagina van het lid.',
15031501
tabHasNoSortOrder: 'tab heeft geen sorteervolgorde',
15041502
compositionUsageHeading: 'Waar wordt deze compositie gebruikt?',
15051503
compositionUsageSpecification:

src/packages/core/content-type/types.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ export interface UmbPropertyTypeModel {
4444
variesBySegment: boolean;
4545
validation: UmbPropertyTypeValidationModel;
4646
appearance: UmbPropertyTypeAppearanceModel;
47+
visibility?: UmbPropertyTypeVisibilityModel;
48+
isSensitive?: boolean;
49+
}
50+
51+
export interface UmbPropertyTypeVisibilityModel {
52+
memberCanEdit: boolean;
53+
memberCanView: boolean;
4754
}
4855

4956
export interface UmbPropertyTypeValidationModel {

src/packages/core/content-type/workspace/views/design/content-type-design-editor-property.element.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,21 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
312312
<span>* ${this.localize.term('general_mandatory')}</span>
313313
</uui-tag>`
314314
: nothing}
315+
${this.property.visibility?.memberCanView === true
316+
? html`<uui-tag look="default">
317+
<uui-icon name="icon-eye"></uui-icon> ${this.localize.term('contentTypeEditor_showOnMemberProfile')}
318+
</uui-tag>`
319+
: nothing}
320+
${this.property.visibility?.memberCanEdit === true
321+
? html`<uui-tag look="default">
322+
<uui-icon name="icon-edit"></uui-icon> ${this.localize.term('contentTypeEditor_memberCanEdit')}
323+
</uui-tag>`
324+
: nothing}
325+
${this.property.isSensitive === true
326+
? html`<uui-tag look="default">
327+
<uui-icon name="icon-lock"></uui-icon> ${this.localize.term('contentTypeEditor_isSensitiveData')}
328+
</uui-tag>`
329+
: nothing}
315330
</div>`
316331
: nothing;
317332
}
@@ -433,6 +448,7 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
433448
.types > div uui-icon,
434449
.inherited uui-icon {
435450
vertical-align: sub;
451+
margin-right: var(--uui-size-space-1);
436452
}
437453
438454
.inherited {
@@ -446,6 +462,7 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
446462
top: var(--uui-size-space-2);
447463
left: var(--uui-size-space-2);
448464
display: flex;
465+
flex-flow: wrap;
449466
gap: var(--uui-size-space-2);
450467
}
451468

0 commit comments

Comments
 (0)