From a35e86ab8351339d2e1bac13d9a83b325acd76dd Mon Sep 17 00:00:00 2001
From: ewandor <ewandor@dorfsvald.net>
Date: Tue, 7 Feb 2023 17:31:04 +0100
Subject: [PATCH] Updating icons and grouping grouped inputs

---
 front/app/src/common/crud/types/array.type.ts      |  2 +-
 front/app/src/common/crud/types/foreignkey.type.ts | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/front/app/src/common/crud/types/array.type.ts b/front/app/src/common/crud/types/array.type.ts
index 1f3b0382..d428396d 100644
--- a/front/app/src/common/crud/types/array.type.ts
+++ b/front/app/src/common/crud/types/array.type.ts
@@ -17,7 +17,7 @@ import { FieldArrayType } from '@ngx-formly/core';
                         <div *ngIf="props['numbered']" class="float-start">
                             <strong>{{ i + 1 }}</strong>
                         </div>
-                        <div class="float-end">
+                        <div class="btn-group float-end">
                             <button class="btn btn-primary btn-sm" [attr.disabled]="i == 0 ? 'disabled' : null" type="button" (click)="move(i, i-1)"><i-bs name="caret-up-fill"></i-bs></button>
                             <button class="btn btn-primary btn-sm" [attr.disabled]="i == this.field.fieldGroup!.length-1 ? 'disabled' : null" type="button" (click)="move(i, i+1)"><i-bs name="caret-down-fill"></i-bs></button>
                             <button class="btn btn-danger btn-sm" [attr.disabled]="field.props!['removable'] === false ? 'disabled' : null" type="button" (click)="remove(i)"><i-bs name="x-octagon-fill"></i-bs></button>
diff --git a/front/app/src/common/crud/types/foreignkey.type.ts b/front/app/src/common/crud/types/foreignkey.type.ts
index 57df1b7f..1cafe5d7 100644
--- a/front/app/src/common/crud/types/foreignkey.type.ts
+++ b/front/app/src/common/crud/types/foreignkey.type.ts
@@ -31,9 +31,7 @@ import {DictionaryService} from "./dictionary.service";
                        [inputFormatter]="formatter"
                        [resultFormatter]="formatter"
                        [editable]="false" />
-                <div class="input-group-append">
-                    <button class="btn btn-success" type="button" (click)="add(foreignModal)"><span class="cil-plus btn-icon mr-2"></span>Create</button>
-                </div>
+                    <button class="btn btn-success" type="button" (click)="add(foreignModal)"><i-bs name="file-earmark-plus-fill"></i-bs></button>
             </div>
             <div class="input-group" *ngIf="this.hasValue()">
                 <input type="text" 
@@ -42,12 +40,8 @@ import {DictionaryService} from "./dictionary.service";
                        disabled=""
                        readonly="readonly"
                 />
-                <div class="input-group-append">
-                    <button class="btn btn-info" type="button" (click)="see(foreignModal)"><span class="cil-zoom btn-icon"></span><i-bs name="zoom-in"></i-bs></button>
-                </div>
-                <div class="input-group-append">
-                    <button class="btn btn-danger" type="button" (click)="remove()"><span class="cil-x btn-icon mr-2"></span><i-bs name="eraser-fill"></i-bs></button>
-                </div>
+                <button class="btn btn-primary" type="button" (click)="see(foreignModal)"><i-bs name="eye-fill"></i-bs></button>
+                <button class="btn btn-danger" type="button" (click)="remove()"><i-bs name="eraser-fill"></i-bs></button>
             </div>
             <formly-form *ngIf="this.hasValue() && this.displayedFields" [form]="this.foreignForm" [fields]="this.foreignFields" [model]="this.foreignModel"></formly-form>
         </div>