From 74f3e4baf53c0e6459bd65ef5bc17f6a49ba2ac1 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Mon, 16 Sep 2019 18:02:06 +0200
Subject: [PATCH] FIX #11269 TIME 0:10 fix css + move actions button in
 indexing models

---
 .../indexingModel/indexing-model-administration.component.ts  | 1 +
 .../app/indexation/indexing-form/indexing-form.component.html | 3 ++-
 .../app/indexation/indexing-form/indexing-form.component.scss | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/frontend/app/administration/indexingModel/indexing-model-administration.component.ts b/src/frontend/app/administration/indexingModel/indexing-model-administration.component.ts
index 1a70cbac13c..408935517bb 100644
--- a/src/frontend/app/administration/indexingModel/indexing-model-administration.component.ts
+++ b/src/frontend/app/administration/indexingModel/indexing-model-administration.component.ts
@@ -153,6 +153,7 @@ export class IndexingModelAdministrationComponent implements OnInit {
                 tap((data: any) => {
                     this.indexingForm.setModification();
                     this.setModification();
+                    this.router.navigate(['/administration/indexingModels']);
                     this.notify.success(this.lang.indexingModelUpdated);
                 }),
                 finalize(() => this.loading = false),
diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.html b/src/frontend/app/indexation/indexing-form/indexing-form.component.html
index a0d3a2b3672..6cb03c23eb0 100644
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.html
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.html
@@ -17,6 +17,7 @@
                         [cdkDragData]="field">
                         <div class="fieldLabel">
                             <i class="fas fa-bars fa-2x" color="primary" style="cursor: move" cdkDragHandle></i>&nbsp;
+                            {{field.label}}
                             <button mat-icon-button [matMenuTriggerFor]="fieldActions" *ngIf="!field.system">
                                 <mat-icon class="fa fa-ellipsis-v" color="secondary"></mat-icon>
                             </button>
@@ -30,7 +31,7 @@
                                     <mat-icon class="fa fa-trash" color="warn"></mat-icon>
                                     <span>{{lang.delete}}</span>
                                 </button>
-                            </mat-menu>{{field.label}}
+                            </mat-menu>
                         </div>
                         <div class="fieldInput">
                             <ng-container *ngIf="field.type === 'string'">
diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.scss b/src/frontend/app/indexation/indexing-form/indexing-form.component.scss
index 4209883561f..b9370bb5526 100644
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.scss
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.scss
@@ -49,6 +49,10 @@
 
 .fieldLabel {
     color: #4A4A4A;
+
+    .cdk-drag-handle {
+        margin-right: 10px;
+    }
 }
 
 .fieldState {
-- 
GitLab