From 8c0052fd3501aaa951dd33cd68a0bdec96b85f4f Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 3 Jun 2019 17:28:48 +0200
Subject: [PATCH] =?UTF-8?q?Material=20design:=20alignement=20des=20boutons?=
=?UTF-8?q?=20de=20modales=20=C3=A0=20droite?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dialog-confirm-close-calc.component.html | 2 +-
.../dialog-confirm-empty-session.component.html | 2 +-
.../dialog-edit-param-computed.component.html | 2 +-
.../dialog-edit-param-values.component.html | 2 +-
.../dialog-generate-pab/dialog-generate-pab.component.html | 2 +-
.../dialog-load-session/dialog-load-session.component.html | 2 +-
.../dialog-log-entries-details.component.html | 2 +-
.../dialog-save-session/dialog-save-session.component.html | 2 +-
src/app/components/fixedvar-results/var-results.component.ts | 5 +++--
.../components/param-computed/param-computed.component.ts | 3 ++-
src/app/components/param-values/param-values.component.ts | 3 ++-
11 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.html b/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.html
index f1abc0500..71434bd13 100644
--- a/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.html
+++ b/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.html
@@ -13,7 +13,7 @@
<p [innerHTML]="uitextCloseCalcBody"></p>
-<div mat-dialog-actions>
+<div mat-dialog-actions [attr.align]="'end'">
<button mat-raised-button color="primary" [mat-dialog-close]="false" cdkFocusInitial>
{{ uitextNo }}
</button>
diff --git a/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.html b/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.html
index 699ae9786..7d7d6cdc8 100644
--- a/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.html
+++ b/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.html
@@ -2,7 +2,7 @@
<div mat-dialog-content>
<p [innerHTML]="uitextEmptySessionBody"></p>
</div>
-<div mat-dialog-actions>
+<div mat-dialog-actions [attr.align]="'end'">
<button mat-raised-button color="primary" [mat-dialog-close]="false" cdkFocusInitial>
{{ uitextNo }}
</button>
diff --git a/src/app/components/dialog-edit-param-computed/dialog-edit-param-computed.component.html b/src/app/components/dialog-edit-param-computed/dialog-edit-param-computed.component.html
index 517a0f0d1..8e56fa408 100644
--- a/src/app/components/dialog-edit-param-computed/dialog-edit-param-computed.component.html
+++ b/src/app/components/dialog-edit-param-computed/dialog-edit-param-computed.component.html
@@ -6,7 +6,7 @@
<ngparam-input [title]="param.title" ></ngparam-input>
</div>
- <div mat-dialog-actions>
+ <div mat-dialog-actions [attr.align]="'end'">
<button mat-raised-button [mat-dialog-close]="true" cdkFocusInitial>
{{ uitextClose }}
</button>
diff --git a/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.html b/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.html
index 43f8a3a0f..95d01272b 100644
--- a/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.html
+++ b/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.html
@@ -121,7 +121,7 @@
</chart>
</div>
- <div mat-dialog-actions>
+ <div mat-dialog-actions [attr.align]="'end'">
<div *ngIf="isMinMax || viewChart">
<button mat-raised-button [mat-dialog-close]="true" cdkFocusInitial>
{{ uitextClose }}
diff --git a/src/app/components/dialog-generate-pab/dialog-generate-pab.component.html b/src/app/components/dialog-generate-pab/dialog-generate-pab.component.html
index e94097590..14202deec 100644
--- a/src/app/components/dialog-generate-pab/dialog-generate-pab.component.html
+++ b/src/app/components/dialog-generate-pab/dialog-generate-pab.component.html
@@ -36,7 +36,7 @@
</div>
- <div mat-dialog-actions>
+ <div mat-dialog-actions [attr.align]="'end'">
<button mat-raised-button color="primary" [mat-dialog-close]="false" cdkFocusInitial>
{{ uitextCancel }}
</button>
diff --git a/src/app/components/dialog-load-session/dialog-load-session.component.html b/src/app/components/dialog-load-session/dialog-load-session.component.html
index 89554f085..84ea1c729 100644
--- a/src/app/components/dialog-load-session/dialog-load-session.component.html
+++ b/src/app/components/dialog-load-session/dialog-load-session.component.html
@@ -57,7 +57,7 @@
</mat-checkbox>
</div>
- <div mat-dialog-actions>
+ <div mat-dialog-actions [attr.align]="'end'">
<button mat-raised-button color="primary" [mat-dialog-close]="false" cdkFocusInitial>
{{ uitextCancel }}
</button>
diff --git a/src/app/components/dialog-log-entries-details/dialog-log-entries-details.component.html b/src/app/components/dialog-log-entries-details/dialog-log-entries-details.component.html
index ef999517c..a5dd7a17f 100644
--- a/src/app/components/dialog-log-entries-details/dialog-log-entries-details.component.html
+++ b/src/app/components/dialog-log-entries-details/dialog-log-entries-details.component.html
@@ -3,7 +3,7 @@
<!-- entrées du journal -->
<log-entry *ngFor="let m of data.messages" [_message]="m"></log-entry>
</div>
-<div mat-dialog-actions>
+<div mat-dialog-actions [attr.align]="'end'">
<button mat-raised-button [mat-dialog-close]="true">
{{ uitextClose }}
</button>
diff --git a/src/app/components/dialog-save-session/dialog-save-session.component.html b/src/app/components/dialog-save-session/dialog-save-session.component.html
index d4f2324cc..4e522ee37 100644
--- a/src/app/components/dialog-save-session/dialog-save-session.component.html
+++ b/src/app/components/dialog-save-session/dialog-save-session.component.html
@@ -35,7 +35,7 @@
</mat-form-field>
</div>
- <div mat-dialog-actions>
+ <div mat-dialog-actions [attr.align]="'end'">
<button mat-raised-button color="primary" [mat-dialog-close]="false" cdkFocusInitial>
{{ uitextCancel }}
</button>
diff --git a/src/app/components/fixedvar-results/var-results.component.ts b/src/app/components/fixedvar-results/var-results.component.ts
index a58eb8ea7..7a97e80c6 100644
--- a/src/app/components/fixedvar-results/var-results.component.ts
+++ b/src/app/components/fixedvar-results/var-results.component.ts
@@ -2,13 +2,14 @@ import { Component, ViewChild, ElementRef } from "@angular/core";
import { MatDialog } from "@angular/material";
+import * as XLSX from "xlsx";
+
import { VarResults } from "../../results/var-results";
import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
import { ResultElement, Message, MessageSeverity } from "jalhyd";
import { I18nService } from "../../services/internationalisation/internationalisation.service";
-import * as XLSX from "xlsx";
import { ResultsComponent } from "./results.component";
-import { DialogLogEntriesDetailsComponent } from '../dialog-log-entries-details/dialog-log-entries-details.component';
+import { DialogLogEntriesDetailsComponent } from "../dialog-log-entries-details/dialog-log-entries-details.component";
@Component({
selector: "var-results",
diff --git a/src/app/components/param-computed/param-computed.component.ts b/src/app/components/param-computed/param-computed.component.ts
index 2abb701eb..b95fe29ea 100644
--- a/src/app/components/param-computed/param-computed.component.ts
+++ b/src/app/components/param-computed/param-computed.component.ts
@@ -53,7 +53,8 @@ export class ParamComputedComponent {
{
data: {
param: this.param
- }
+ },
+ autoFocus: false
}
);
}
diff --git a/src/app/components/param-values/param-values.component.ts b/src/app/components/param-values/param-values.component.ts
index 27cc698b5..41cefb196 100644
--- a/src/app/components/param-values/param-values.component.ts
+++ b/src/app/components/param-values/param-values.component.ts
@@ -60,7 +60,8 @@ export class ParamValuesComponent implements AfterViewInit, Observer {
disableClose: true,
data: {
param: this.param
- }
+ },
+ autoFocus: false
}
);
}
--
GitLab