Skip to content

Commit 2398842

Browse files
SebastianStehleSebastianStehle
authored
Menu (#1275)
* Menu * Move to components.
1 parent 2f87a50 commit 2398842

23 files changed

+486
-101
lines changed

‎backend/i18n/frontend_de.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270
"common.event": "Ereignis",
271271
"common.events": "Ereignisse",
272272
"common.executed": "Ausgeführt",
273+
"common.expand": "Expand",
273274
"common.expertMode": "Expertenmodus",
274275
"common.extension": "Erweiterung",
275276
"common.failed": "Fehlgeschlagen",
@@ -465,7 +466,9 @@
465466
"contents.draftNew": "Neuer Entwurf",
466467
"contents.draftStatus": "Neue Version",
467468
"contents.editPageTitle": "Inhalt bearbeiten",
469+
"contents.fieldAIMenu": "Generate with AI",
468470
"contents.fieldFullscreen": "Auf dieses Feld fokussieren und Vollbildmodus umschalten.",
471+
"contents.fieldFullscreenMenu": "Fullscreen mode",
469472
"contents.idPlaceholder": "Definieren Sie eine benutzerdefinierte ID oder lassen Sie das Feld leer, damit Squidex eine generiert.",
470473
"contents.inspectContent": "Inhalt",
471474
"contents.inspectData": "Daten",

‎backend/i18n/frontend_en.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270
"common.event": "Event",
271271
"common.events": "Events",
272272
"common.executed": "Executed",
273+
"common.expand": "Expand",
273274
"common.expertMode": "Expert Mode",
274275
"common.extension": "Extension",
275276
"common.failed": "Failed",
@@ -465,7 +466,9 @@
465466
"contents.draftNew": "New Draft",
466467
"contents.draftStatus": "New Version",
467468
"contents.editPageTitle": "Edit Content",
469+
"contents.fieldAIMenu": "Generate with AI",
468470
"contents.fieldFullscreen": "Focus on this field and toggle fullscreen mode.",
471+
"contents.fieldFullscreenMenu": "Fullscreen mode",
469472
"contents.idPlaceholder": "Define a custom ID or leave empty to let Squidex generate one.",
470473
"contents.inspectContent": "Content",
471474
"contents.inspectData": "Data",

‎backend/i18n/frontend_fr.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270
"common.event": "Événement",
271271
"common.events": "Événements",
272272
"common.executed": "Réalisé",
273+
"common.expand": "Expand",
273274
"common.expertMode": "Mode expert",
274275
"common.extension": "Extension",
275276
"common.failed": "Échoué",
@@ -465,7 +466,9 @@
465466
"contents.draftNew": "Nouveau brouillon",
466467
"contents.draftStatus": "Nouvelle version",
467468
"contents.editPageTitle": "Modifier le contenu",
469+
"contents.fieldAIMenu": "Generate with AI",
468470
"contents.fieldFullscreen": "Concentrez-vous sur ce champ et basculez en mode plein écran.",
471+
"contents.fieldFullscreenMenu": "Fullscreen mode",
469472
"contents.idPlaceholder": "Définissez un ID personnalisé ou laissez vide pour laisser Squidex en générer un.",
470473
"contents.inspectContent": "Contenu",
471474
"contents.inspectData": "Données",

‎backend/i18n/frontend_it.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270
"common.event": "Evento",
271271
"common.events": "Eventi",
272272
"common.executed": "Eseguito",
273+
"common.expand": "Expand",
273274
"common.expertMode": "Modalità esperto",
274275
"common.extension": "Extension",
275276
"common.failed": "Fallito",
@@ -465,7 +466,9 @@
465466
"contents.draftNew": "Nuova bozza",
466467
"contents.draftStatus": "Nuova versione",
467468
"contents.editPageTitle": "Modifica contenuto",
469+
"contents.fieldAIMenu": "Generate with AI",
468470
"contents.fieldFullscreen": "Focus on this field and toggle fullscreen mode.",
471+
"contents.fieldFullscreenMenu": "Fullscreen mode",
469472
"contents.idPlaceholder": "Define a custom ID or leave empty to let Squidex generate one.",
470473
"contents.inspectContent": "Content",
471474
"contents.inspectData": "Data",

‎backend/i18n/frontend_nl.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270
"common.event": "Evenement",
271271
"common.events": "Evenementen",
272272
"common.executed": "Uitgevoerd",
273+
"common.expand": "Expand",
273274
"common.expertMode": "Expert-modus",
274275
"common.extension": "Uitbreiding",
275276
"common.failed": "Mislukt",
@@ -465,7 +466,9 @@
465466
"contents.draftNew": "Nieuw concept",
466467
"contents.draftStatus": "Nieuwe versie",
467468
"contents.editPageTitle": "Inhoud bewerken",
469+
"contents.fieldAIMenu": "Generate with AI",
468470
"contents.fieldFullscreen": "Focus on this field and toggle fullscreen mode.",
471+
"contents.fieldFullscreenMenu": "Fullscreen mode",
469472
"contents.idPlaceholder": "Definieer een aangepaste ID of laat leeg om Squidex er een te laten genereren.",
470473
"contents.inspectContent": "Inhoud",
471474
"contents.inspectData": "Data",

‎backend/i18n/frontend_pt.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270
"common.event": "Evento",
271271
"common.events": "Eventos",
272272
"common.executed": "Executado",
273+
"common.expand": "Expand",
273274
"common.expertMode": "Modo Especialista",
274275
"common.extension": "Extensão",
275276
"common.failed": "Falhou",
@@ -465,7 +466,9 @@
465466
"contents.draftNew": "Novo Esboço",
466467
"contents.draftStatus": "Nova versão",
467468
"contents.editPageTitle": "Editar Conteúdo",
469+
"contents.fieldAIMenu": "Generate with AI",
468470
"contents.fieldFullscreen": "Concentre-se neste campo e altere o modo de ecrã completo.",
471+
"contents.fieldFullscreenMenu": "Fullscreen mode",
469472
"contents.idPlaceholder": "Defina um ID personalizado ou deixe vazio para permitir que o Squidex gere um.",
470473
"contents.inspectContent": "Conteúdo",
471474
"contents.inspectData": "Dados",

‎backend/i18n/frontend_zh.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270
"common.event": "事件",
271271
"common.events": "事件",
272272
"common.executed": "已执行",
273+
"common.expand": "Expand",
273274
"common.expertMode": "专家模式",
274275
"common.extension": "扩展名",
275276
"common.failed": "失败",
@@ -465,7 +466,9 @@
465466
"contents.draftNew": "新草稿",
466467
"contents.draftStatus": "新版本",
467468
"contents.editPageTitle": "编辑内容",
469+
"contents.fieldAIMenu": "Generate with AI",
468470
"contents.fieldFullscreen": "Focus on this field and toggle fullscreen mode.",
471+
"contents.fieldFullscreenMenu": "Fullscreen mode",
469472
"contents.idPlaceholder": "Define a custom ID or leave empty to let Squidex generate one.",
470473
"contents.inspectContent": "Content",
471474
"contents.inspectData": "Data",

‎backend/i18n/source/frontend_en.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270
"common.event": "Event",
271271
"common.events": "Events",
272272
"common.executed": "Executed",
273+
"common.expand": "Expand",
273274
"common.expertMode": "Expert Mode",
274275
"common.extension": "Extension",
275276
"common.failed": "Failed",
@@ -465,7 +466,9 @@
465466
"contents.draftNew": "New Draft",
466467
"contents.draftStatus": "New Version",
467468
"contents.editPageTitle": "Edit Content",
469+
"contents.fieldAIMenu": "Generate with AI",
468470
"contents.fieldFullscreen": "Focus on this field and toggle fullscreen mode.",
471+
"contents.fieldFullscreenMenu": "Fullscreen mode",
469472
"contents.idPlaceholder": "Define a custom ID or leave empty to let Squidex generate one.",
470473
"contents.inspectContent": "Content",
471474
"contents.inspectData": "Data",

‎frontend/.storybook/main.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class FilterSassWarningsPlugin {
2121
module.exports = {
2222
stories: ["../src/**/*.stories.@(js|jsx|ts|tsx)"],
2323
addons: [
24+
'@storybook/addon-actions',
2425
"@storybook/addon-links",
2526
"@storybook/addon-essentials",
2627
"@storybook/addon-interactions"

‎frontend/src/app/features/content/shared/forms/content-field.component.html‎

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,15 @@
1414
[formLevel]="formLevel"
1515
[formModel]="formModel.get(language)"
1616
[hasChatBot]="hasChatBot"
17-
[isComparing]="!!formModelCompare"
1817
[isCollapsed]="isCollapsed"
18+
[isComparing]="!!formModelCompare"
1919
[language]="language"
2020
[languages]="languages">
21-
<ng-container beforeButtons>
21+
<ng-container>
2222
@if (i === 0) {
2323
<ng-container *ngTemplateOutlet="sharedButtons" />
2424
}
2525
</ng-container>
26-
27-
<ng-container afterButtons>
28-
@if (i === 0) {
29-
<ng-container *ngTemplateOutlet="toggleButton" />
30-
}
31-
</ng-container>
3226
</sqx-field-editor>
3327
</div>
3428
}
@@ -40,16 +34,13 @@
4034
[formLevel]="formLevel"
4135
[formModel]="getControl()"
4236
[hasChatBot]="hasChatBot"
43-
[isComparing]="!!formModelCompare"
4437
[isCollapsed]="isCollapsed"
38+
[isComparing]="!!formModelCompare"
4539
[language]="language"
4640
[languages]="languages">
47-
<ng-container beforeButtons>
41+
<ng-container>
4842
<ng-container *ngTemplateOutlet="sharedButtons" />
4943
</ng-container>
50-
<ng-container afterButtons>
51-
<ng-container *ngTemplateOutlet="toggleButton" />
52-
</ng-container>
5344
</sqx-field-editor>
5445
}
5546
</div>
@@ -81,8 +72,8 @@
8172
[formLevel]="formLevel"
8273
[formModel]="formModelCompare.get(language)"
8374
[hasChatBot]="hasChatBot"
84-
[isComparing]="!!formModelCompare"
8575
[isCollapsed]="isCollapsed"
76+
[isComparing]="!!formModelCompare"
8677
[language]="language"
8778
[languages]="languages" />
8879
</div>
@@ -94,8 +85,8 @@
9485
[formLevel]="formLevel"
9586
[formModel]="getControlCompare()!"
9687
[hasChatBot]="hasChatBot"
97-
[isComparing]="!!formModelCompare"
9888
[isCollapsed]="isCollapsed"
89+
[isComparing]="!!formModelCompare"
9990
[language]="language"
10091
[languages]="languages" />
10192
}
@@ -113,23 +104,23 @@
113104
[languages]="languages"
114105
[showAllControls]="showAllControls"
115106
(showAllControlsChange)="changeShowAllControls($event)" />
107+
116108
<sqx-field-copy-button [formModel]="formModel" [languages]="languages" />
109+
117110
@if (isTranslatable) {
118-
<button
119-
class="btn btn-sm btn-outline-secondary force no-focus-shadow"
120-
(click)="translate()"
111+
<sqx-menu-item
112+
(action)="translate()"
121113
[disabled]="formModel.field.isDisabled"
122-
tabindex="-1"
123-
title="i18n:contents.autotranslate"
124-
type="button">
125-
<i class="icon-translate"></i>
126-
</button>
114+
icon="translate"
115+
menuLabel="i18n:contents.autotranslateMenu"
116+
small
117+
tabIndex="-1"
118+
tooltip="i18n:contents.autotranslate" />
127119
}
128-
</ng-template>
129120

130-
<ng-template #toggleButton>
131-
<button class="btn btn-sm btn-square btn-outline-secondary" (click)="toggle()" type="button"
132-
title="i18n:contents.arrayCollapseItem">
133-
<i [class.icon-minus2]="!isCollapsed" [class.icon-plus2]="isCollapsed"></i>
134-
</button>
135-
</ng-template>
121+
@if (isCollapsed) {
122+
<sqx-menu-item (action)="toggle()" icon="minus2" menuLabel="i18n:common.collapse" small tooltip="i18n:contents.arrayCollapseItem" />
123+
} @else {
124+
<sqx-menu-item (action)="toggle()" icon="plus2" menuLabel="i18n:common.expand" small tooltip="i18n:contents.arrayCollapseItem" />
125+
}
126+
</ng-template>

0 commit comments

Comments
 (0)