diff --git a/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component.html b/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component.html index a0d251c9e393b6755b2705705da3e049a2271e55..91f5982d6a2e93f317b7a301d4177ec9c59482df 100644 --- a/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component.html +++ b/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component.html @@ -1,4 +1,4 @@ -<form [formGroup]="formService.form"> +<form [formGroup]="formService.form" class="max-w-[960px]"> <h2 class="heading-2">Signatur</h2> <p id="signatur-desc"> Diese Signatur wird bei allen Nachrichten an den Antragsteller angezeigt. @@ -6,8 +6,9 @@ <ods-textarea-editor [formControlName]="formServiceClass.SIGNATUR_FIELD" [isResizable]="false" + [showLabel]="false" data-test-id="signatur-text" - label="" + label="signature" rows="6" class="w-full" aria-describedby="signatur-desc" diff --git a/alfa-client/libs/admin/settings/src/lib/postfach/postfach.service.spec.ts b/alfa-client/libs/admin/settings/src/lib/postfach/postfach.service.spec.ts index 0d8fd6b5eb2d724ff31293252d1b3d10a2c8937b..d787449be4be3621a443ff9cd4a9824613fbc167 100644 --- a/alfa-client/libs/admin/settings/src/lib/postfach/postfach.service.spec.ts +++ b/alfa-client/libs/admin/settings/src/lib/postfach/postfach.service.spec.ts @@ -91,7 +91,7 @@ describe('PostfachService', () => { tick(); expect(snackbarService.showInfo).toHaveBeenCalledWith( - 'Die Signatur wird erfolgreich gespeichert.', + 'Die Signatur wurde erfolgreich gespeichert.', ); })); }); diff --git a/alfa-client/libs/admin/settings/src/lib/postfach/postfach.service.ts b/alfa-client/libs/admin/settings/src/lib/postfach/postfach.service.ts index 2fc6ec706f41b554a0a9812034f45cb596edf9f8..1ff867073051235829114ca5cba89d9c227128ad 100644 --- a/alfa-client/libs/admin/settings/src/lib/postfach/postfach.service.ts +++ b/alfa-client/libs/admin/settings/src/lib/postfach/postfach.service.ts @@ -28,7 +28,7 @@ export class PostfachService { private showInfoAfterSave(stateResource: StateResource<PostfachResource>) { if (!stateResource.loading) { - this.snackbarService.showInfo('Die Signatur wird erfolgreich gespeichert.'); + this.snackbarService.showInfo('Die Signatur wurde erfolgreich gespeichert.'); } } diff --git a/alfa-client/libs/design-component/src/lib/form/text-editor/text-editor.component.html b/alfa-client/libs/design-component/src/lib/form/text-editor/text-editor.component.html index 9252326a5bdcc9d9c25ec164981bd0e24915bafa..f8858992626b2be8a4dc43e07f7947e3b0a84735 100644 --- a/alfa-client/libs/design-component/src/lib/form/text-editor/text-editor.component.html +++ b/alfa-client/libs/design-component/src/lib/form/text-editor/text-editor.component.html @@ -7,6 +7,7 @@ [attr.data-test-id]="(label | convertForDataTest) + '-text-editor'" [required]="isRequired" [focus]="focus" + [showLabel]="showLabel" > <ods-validation-error error diff --git a/alfa-client/libs/design-component/src/lib/form/text-editor/text-editor.component.ts b/alfa-client/libs/design-component/src/lib/form/text-editor/text-editor.component.ts index c40849cf31e2279a3727527898213567bab07c4c..d6a19c8b70cac1f11b73038b321b1fc79fa2af58 100644 --- a/alfa-client/libs/design-component/src/lib/form/text-editor/text-editor.component.ts +++ b/alfa-client/libs/design-component/src/lib/form/text-editor/text-editor.component.ts @@ -24,6 +24,7 @@ export class TextEditorComponent extends FormControlEditorAbstractComponent { @Input() placeholder: string = ''; @Input() isRequired: boolean = false; @Input() focus: boolean = false; + @Input() showLabel: boolean = true; get variant(): string { return this.invalidParams.length > 0 ? 'error' : 'default'; diff --git a/alfa-client/libs/design-component/src/lib/form/textarea-editor/textarea-editor.component.html b/alfa-client/libs/design-component/src/lib/form/textarea-editor/textarea-editor.component.html index baa159622243b8c03783314ee0f27e17cf6c78a4..22a5c192844d111ff69b4ed90f1be4b7108fcee8 100644 --- a/alfa-client/libs/design-component/src/lib/form/textarea-editor/textarea-editor.component.html +++ b/alfa-client/libs/design-component/src/lib/form/textarea-editor/textarea-editor.component.html @@ -8,6 +8,7 @@ [required]="isRequired" [focus]="focus" [isResizable]="isResizable" + [showLabel]="showLabel" > <ods-validation-error error diff --git a/alfa-client/libs/design-component/src/lib/form/textarea-editor/textarea-editor.component.ts b/alfa-client/libs/design-component/src/lib/form/textarea-editor/textarea-editor.component.ts index 5dea452149b2facd76f03b209835786e7af4b970..ef615ae42c6b31689a63ce85d22613537190588e 100644 --- a/alfa-client/libs/design-component/src/lib/form/textarea-editor/textarea-editor.component.ts +++ b/alfa-client/libs/design-component/src/lib/form/textarea-editor/textarea-editor.component.ts @@ -25,6 +25,7 @@ export class TextareaEditorComponent extends FormControlEditorAbstractComponent @Input() isRequired: boolean = false; @Input() focus: boolean = false; @Input() isResizable: boolean = true; + @Input() showLabel: boolean = true; get variant(): string { return this.invalidParams.length > 0 ? 'error' : 'default'; diff --git a/alfa-client/libs/design-system/src/lib/form/textarea/textarea.component.ts b/alfa-client/libs/design-system/src/lib/form/textarea/textarea.component.ts index 5c418556063b84c751fd274fbd901f18cd3eb4a3..cc91e16b2345a9f1a578001c60b7b20655ed5598 100644 --- a/alfa-client/libs/design-system/src/lib/form/textarea/textarea.component.ts +++ b/alfa-client/libs/design-system/src/lib/form/textarea/textarea.component.ts @@ -31,7 +31,7 @@ type TextareaVariants = VariantProps<typeof textareaVariants>; imports: [CommonModule, ReactiveFormsModule, TechSharedModule], template: ` <div class="mt-2"> - <label [for]="id" class="text-md mb-2 block font-medium text-text"> + <label *ngIf="showLabel" [for]="id" class="text-md mb-2 block font-medium text-text"> {{ inputLabel }}<ng-container *ngIf="required"><i aria-hidden="true">*</i></ng-container> </label> <textarea @@ -65,6 +65,7 @@ export class TextareaComponent { @Input() fieldControl: FormControl = new FormControl(EMPTY_STRING); @Input() required: boolean = false; @Input() isResizable: boolean = true; + @Input() showLabel: boolean = true; @Input() set focus(value: boolean) { if (value && this.textAreaElement) {