Merge remote-tracking branch 'origin/master'

src/app/components/admin-data-page/admin-data-page.component.html

@@ -11,7 +11,7 @@
 <div class="container mat-elevation-z8">
 
   <div class="form">
-    <mat-form-field floatPlaceholder="never" color="accent">
+    <mat-form-field class="filterfield" floatPlaceholder="never" color="accent">
       <input matInput #filter placeholder="Nutzerfilter">
     </mat-form-field>
   </div>

src/app/components/admin-data-page/admin-data-page.component.scss

@@ -41,3 +41,7 @@
     margin-left: 8px;
   }
 }
+
+.filterfield {
+  margin-left: 1.5rem;
+}

src/app/components/dialogs/add/add.dialog.html

@@ -1,5 +1,5 @@
 <div class="container">
-  <h3 mat-dialog-title>Neuen Benutzer</h3>
+  <h3 mat-dialog-title>Neuer Nutzer</h3>
 
   <form class="mat-dialog-content" (ngSubmit)="submit" #formControl="ngForm">
 
@@ -63,8 +63,8 @@
     </div>
 
     <div mat-dialog-actions>
-      <button mat-button [type]="submit" [disabled]="!formControl.valid" [mat-dialog-close]="1" (click)="confirmAdd()">Save</button>
-      <button mat-button (click)="onNoClick()" tabindex="-1">Cancel</button>
+      <button mat-button [type]="submit" [disabled]="!formControl.valid" [mat-dialog-close]="1" (click)="confirmAdd()">Erstellen</button>
+      <button mat-button (click)="onNoClick()" tabindex="-1">Abbrechen</button>
     </div>
   </form>
 </div>

src/app/components/dialogs/delete/delete.dialog.html

@@ -31,7 +31,7 @@
   </div>
 
   <div mat-dialog-actions>
-    <button mat-button [mat-dialog-close]="1" (click)="confirmDelete()">Delete</button>
-    <button mat-button (click)="onNoClick()" tabindex="-1">Cancel</button>
+    <button mat-button [mat-dialog-close]="1" (click)="confirmDelete()">Löschen</button>
+    <button mat-button (click)="onNoClick()" tabindex="-1">Aktualisieren</button>
   </div>
 </div>

src/app/components/dialogs/edit/edit.dialog.html

@@ -64,8 +64,8 @@
     </div>
 
     <div mat-dialog-actions>
-      <button mat-button [type]="submit" [disabled]="!formControl.valid" [mat-dialog-close]="1" (click)="stopEdit()">Save</button>
-      <button mat-button (click)="onNoClick()" tabindex="-1">Cancel</button>
+      <button mat-button [type]="submit" [disabled]="!formControl.valid" [mat-dialog-close]="1" (click)="stopEdit()">Aktualisieren</button>
+      <button mat-button (click)="onNoClick()" tabindex="-1">Abbrechen</button>
     </div>
   </form>
 </div>