From 6e5bc0492f707e40ced4c99f4f46cb0605c3be56 Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Tue, 25 Feb 2025 16:26:53 +0100
Subject: [PATCH] OZG-7620-7788 ui/ux
---
.../user-delete-dialog.component.html | 6 +++---
.../cancel-dialog-button.component.ts | 14 +++++++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-dialog-container/user-delete-dialog/user-delete-dialog.component.html b/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-dialog-container/user-delete-dialog/user-delete-dialog.component.html
index 4f866f2631..85706d197f 100644
--- a/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-dialog-container/user-delete-dialog/user-delete-dialog.component.html
+++ b/alfa-client/libs/admin/user/src/lib/user-form/user-form-delete-dialog-container/user-delete-dialog/user-delete-dialog.component.html
@@ -1,13 +1,13 @@
<div class="block bg-background-100 flex flex-col gap-4 p-8">
- <p>Sind Sie sicher, dass sie {{ username }} löschen möchten?</p>
+ <p>Sind Sie sicher, dass sie <span class="font-bold">{{ username }}</span> löschen möchten?</p>
<p>Hinweis: Die zugewiesenen Vorgänge bleiben bestehen.</p>
<div class="flex justify-between">
- <ods-cancel-dialog-button data-test-id="dialog-cancel-button-host" />
+ <ods-cancel-dialog-button variant='outline' data-test-id="dialog-cancel-button-host" />
<ods-button-with-spinner
[stateResource]="deleteUserStateResource"
(clickEmitter)="delete.emit()"
- variant="outline"
+ variant="primary"
text="Löschen"
dataTestId="dialog-delete"
data-test-id="dialog-delete-button-host"
diff --git a/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.ts b/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.ts
index 6fd01cafbe..266832542f 100644
--- a/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.ts
+++ b/alfa-client/libs/design-component/src/lib/cancel-dialog-button/cancel-dialog-button.component.ts
@@ -1,16 +1,24 @@
import { OzgcloudDialogService } from '@alfa-client/ui';
-import { Component, inject } from '@angular/core';
-import { ButtonComponent } from '@ods/system';
+import { Component, inject, Input } from '@angular/core';
+import { ButtonComponent, ButtonVariants } from '@ods/system';
@Component({
selector: 'ods-cancel-dialog-button',
standalone: true,
imports: [ButtonComponent],
- template: `<ods-button (clickEmitter)="cancel()" text="Abbrechen" dataTestId="cancel-dialog" data-test-id="cancel-dialog" />`,
+ template: `<ods-button
+ (clickEmitter)="cancel()"
+ [variant]="variant"
+ text="Abbrechen"
+ dataTestId="cancel-dialog"
+ data-test-id="cancel-dialog"
+ />`,
})
export class CancelDialogButtonComponent {
public readonly dialogService = inject(OzgcloudDialogService);
+ @Input() variant: ButtonVariants['variant'] = 'outline';
+
public cancel(): void {
this.dialogService.closeAll();
}
--
GitLab