From a1d58a281242eefd9da91024573fa86cf87993a9 Mon Sep 17 00:00:00 2001
From: tykayn <15d65f2f-0b14-4f70-bf34-e130180ed62b@users.tedomum.net>
Date: Fri, 19 Nov 2021 15:47:20 +0100
Subject: [PATCH] place on steps, success button on creation button

Signed-off-by: tykayn <15d65f2f-0b14-4f70-bf34-e130180ed62b@users.tedomum.net>
---
 .../steps/step-five/step-five.component.html  | 83 +++++++++----------
 .../steps/step-five/step-five.component.scss  |  3 +
 .../step-seven/step-seven.component.html      | 30 ++++---
 .../steps/step-six/step-six.component.html    |  2 +-
 4 files changed, 64 insertions(+), 54 deletions(-)

diff --git a/src/app/features/administration/form/steps/step-five/step-five.component.html b/src/app/features/administration/form/steps/step-five/step-five.component.html
index 7ea94a48..88024734 100644
--- a/src/app/features/administration/form/steps/step-five/step-five.component.html
+++ b/src/app/features/administration/form/steps/step-five/step-five.component.html
@@ -1,44 +1,43 @@
-<app-stepper [step_current]="5" [step_max]="pollService.step_max"></app-stepper>
-<app-errors-list [form]="pollService.form"></app-errors-list>
-<!--<app-success [poll]="pollService.form.value"></app-success>-->
+<div class="step">
+	<div class="min-height">
+		<section class="supplement">
+			<app-stepper [step_current]="5" [step_max]="pollService.step_max"></app-stepper>
+			<app-errors-list [form]="pollService.form"></app-errors-list>
+			<fieldset class="advanced-config">
+				<div class="has-background-danger" *ngIf="!pollService.form.valid">
+					le formulaire est invalide
+					<pre>  {{ pollService.form.errors | json }}</pre>
+				</div>
 
-<section class="supplement container">
-	<fieldset class="advanced-config">
-		<button
-			class="button is-unchecked-info"
-			[ngClass]="{ 'is-info': !advancedDisplayEnabled, 'is-primary': advancedDisplayEnabled }"
-			(click)="advancedDisplayEnabled = !advancedDisplayEnabled"
-		>
-			<i class="fa fa-chevron-circle-down" *ngIf="!advancedDisplayEnabled"></i>
-			<i class="fa fa-chevron-circle-up" *ngIf="advancedDisplayEnabled"></i>
-			{{ 'creation.advanced' | translate }}
-		</button>
-		<fieldset class="complete well" *ngIf="advancedDisplayEnabled">
-			<app-advanced-config [form]="pollService.form"></app-advanced-config>
-		</fieldset>
-	</fieldset>
-	<div class="columns">
-		<div class="column">
-			<button class="button is-default is-fullwidth" [routerLink]="['/administration/step/4']">
-				Précédent
-			</button>
-		</div>
-		<div class="column">
-			<button class="button is-primary is-fullwidth" [routerLink]="['/administration/step/6']">
-				Suivant
-			</button>
-		</div>
+				<button
+					class="button is-unchecked-info"
+					[ngClass]="{ 'is-info': !advancedDisplayEnabled, 'is-primary': advancedDisplayEnabled }"
+					(click)="advancedDisplayEnabled = !advancedDisplayEnabled"
+				>
+					<i class="fa fa-chevron-circle-down" *ngIf="!advancedDisplayEnabled"></i>
+					<i class="fa fa-chevron-circle-up" *ngIf="advancedDisplayEnabled"></i>
+					{{ 'creation.advanced' | translate }}
+				</button>
+				<fieldset class="complete well" *ngIf="advancedDisplayEnabled">
+					<app-advanced-config [form]="pollService.form"></app-advanced-config>
+				</fieldset>
+			</fieldset>
+			<div class="columns">
+				<div class="column">
+					<button class="button is-default is-fullwidth" [routerLink]="['/administration/step/4']">
+						Précédent
+					</button>
+				</div>
+				<div class="column">
+					<button class="button is-primary is-fullwidth" [routerLink]="['/administration/step/6']">
+						Suivant
+					</button>
+				</div>
+			</div>
+			<!--	<button class="btn btn&#45;&#45;warning" (click)="askInitFormDefault()">-->
+			<!--		<i class="fa fa-refresh"></i>-->
+			<!--		Tout réinitialiser-->
+			<!--	</button>-->
+		</section>
 	</div>
-	<button class="btn btn--warning" (click)="askInitFormDefault()">
-		<i class="fa fa-refresh"></i>
-		Tout réinitialiser
-	</button>
-
-	<div class="well">
-		{{ pollService.form.value.custom_url }}
-	</div>
-	<div class="has-background-danger" *ngIf="!pollService.form.valid">
-		le formulaire est invalide
-		<pre>  {{ pollService.form.errors | json }}</pre>
-	</div>
-</section>
+</div>
diff --git a/src/app/features/administration/form/steps/step-five/step-five.component.scss b/src/app/features/administration/form/steps/step-five/step-five.component.scss
index e69de29b..272562a4 100644
--- a/src/app/features/administration/form/steps/step-five/step-five.component.scss
+++ b/src/app/features/administration/form/steps/step-five/step-five.component.scss
@@ -0,0 +1,3 @@
+.advanced-config {
+	margin-bottom: 2em;
+}
diff --git a/src/app/features/administration/form/steps/step-seven/step-seven.component.html b/src/app/features/administration/form/steps/step-seven/step-seven.component.html
index 2d92a4e1..46fd851c 100644
--- a/src/app/features/administration/form/steps/step-seven/step-seven.component.html
+++ b/src/app/features/administration/form/steps/step-seven/step-seven.component.html
@@ -38,7 +38,9 @@
 					<div class="list-datechoices" *ngIf="pollService.form.value.isAboutDate">
 						<ul *ngFor="let choice of pollService.dateChoiceList">
 							<li>
-								{{ choice.date_object | date: 'E d M yyy':'Europe/Paris':'fr_FR' }}
+								<span class="date">
+									{{ choice.date_object | date: 'E d/M/yyy':'Europe/Paris':'fr_FR' }}
+								</span>
 							</li>
 						</ul>
 					</div>
@@ -78,16 +80,22 @@
 					</div>
 				</div>
 			</div>
-			<div class="column">
-				<button class="button is-secondary is-fullwidth" [routerLink]="['/administration/step/6']">
-					précédent
-				</button>
-			</div>
-			<div class="column">
-				<button class="btn is-primary is-fullwidth" (click)="createPoll()" [disabled]="!pollService.form.valid">
-					<i class="fa fa-save"></i>
-					Enregistrer le sondage
-				</button>
+			<div class="columns">
+				<div class="column">
+					<button class="button is-secondary is-fullwidth" [routerLink]="['/administration/step/6']">
+						précédent
+					</button>
+				</div>
+				<div class="column">
+					<button
+						class="button is-finish is-fullwidth"
+						(click)="createPoll()"
+						[disabled]="!pollService.form.valid"
+					>
+						<i class="fa fa-save"></i>
+						Enregistrer le sondage
+					</button>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/src/app/features/administration/form/steps/step-six/step-six.component.html b/src/app/features/administration/form/steps/step-six/step-six.component.html
index 5ad525f6..204fc56a 100644
--- a/src/app/features/administration/form/steps/step-six/step-six.component.html
+++ b/src/app/features/administration/form/steps/step-six/step-six.component.html
@@ -1,6 +1,6 @@
 <div class="step-container min-height">
 	<app-stepper [step_current]="6" [step_max]="pollService.step_max"></app-stepper>
-	<div class="">
+	<div class="min-height">
 		<form action="#" [formGroup]="pollService.form">
 			<h2 class="title is-2">
 				Dites à vos participants qui vous êtes !