diff --git a/src/app/features/administration/administration.module.ts b/src/app/features/administration/administration.module.ts index dff20f0b..35affc5f 100644 --- a/src/app/features/administration/administration.module.ts +++ b/src/app/features/administration/administration.module.ts @@ -35,6 +35,7 @@ import { OptionLinkComponent } from './form/option-link/option-link.component'; import { TextListComponent } from './form/text-list/text-list.component'; import { HoursComponent } from './form/hours/hours.component'; import { ActionsMenuComponent } from './actions-menu/actions-menu.component'; +import { NavStepsComponent } from './nav-steps/nav-steps.component'; @NgModule({ declarations: [ @@ -65,6 +66,7 @@ import { ActionsMenuComponent } from './actions-menu/actions-menu.component'; TextListComponent, HoursComponent, ActionsMenuComponent, + NavStepsComponent, ], imports: [ AdministrationRoutingModule, 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 26ff7bde..d5e75426 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 @@ -3,23 +3,18 @@
-
-
+
+

+ Configuration avancée +

+
-
-
-
-
- -
-
-
+
diff --git a/src/app/features/administration/form/steps/step-four/step-four.component.html b/src/app/features/administration/form/steps/step-four/step-four.component.html index d7bdc4c0..b58cdcb0 100644 --- a/src/app/features/administration/form/steps/step-four/step-four.component.html +++ b/src/app/features/administration/form/steps/step-four/step-four.component.html @@ -120,16 +120,8 @@ -
-
- -
-
- -
-
+ diff --git a/src/app/features/administration/form/steps/step-one/step-one.component.html b/src/app/features/administration/form/steps/step-one/step-one.component.html index f27612f8..8d39700d 100644 --- a/src/app/features/administration/form/steps/step-one/step-one.component.html +++ b/src/app/features/administration/form/steps/step-one/step-one.component.html @@ -73,14 +73,11 @@ > -
-
-
-
- -
-
-
+ + 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 70999691..58c44c42 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 @@ -1,4 +1,4 @@ -
+
@@ -80,20 +80,12 @@
-
-
- -
-
- -
-
+
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 e5d51687..3d64ada8 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,4 +1,4 @@ -
+
@@ -18,16 +18,8 @@
-
-
- -
-
- -
-
+
diff --git a/src/app/features/administration/form/steps/step-three/step-three.component.html b/src/app/features/administration/form/steps/step-three/step-three.component.html index a1140307..216de505 100644 --- a/src/app/features/administration/form/steps/step-three/step-three.component.html +++ b/src/app/features/administration/form/steps/step-three/step-three.component.html @@ -35,16 +35,7 @@ >
-
-
- -
-
- - -
-
+ diff --git a/src/app/features/administration/form/steps/step-two/step-two.component.html b/src/app/features/administration/form/steps/step-two/step-two.component.html index f1b7f16a..f10ecfb8 100644 --- a/src/app/features/administration/form/steps/step-two/step-two.component.html +++ b/src/app/features/administration/form/steps/step-two/step-two.component.html @@ -41,20 +41,9 @@ -
-
-
- -
-
- - -
-
-
+ diff --git a/src/app/features/administration/nav-steps/nav-steps.component.html b/src/app/features/administration/nav-steps/nav-steps.component.html new file mode 100644 index 00000000..14dbadb0 --- /dev/null +++ b/src/app/features/administration/nav-steps/nav-steps.component.html @@ -0,0 +1,30 @@ +
+
+
+ +
+
+ +
+
+
diff --git a/src/app/features/administration/nav-steps/nav-steps.component.scss b/src/app/features/administration/nav-steps/nav-steps.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/features/administration/nav-steps/nav-steps.component.spec.ts b/src/app/features/administration/nav-steps/nav-steps.component.spec.ts new file mode 100644 index 00000000..6f475223 --- /dev/null +++ b/src/app/features/administration/nav-steps/nav-steps.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NavStepsComponent } from './nav-steps.component'; + +describe('NavStepsComponent', () => { + let component: NavStepsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [NavStepsComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(NavStepsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/features/administration/nav-steps/nav-steps.component.ts b/src/app/features/administration/nav-steps/nav-steps.component.ts new file mode 100644 index 00000000..bdb193b6 --- /dev/null +++ b/src/app/features/administration/nav-steps/nav-steps.component.ts @@ -0,0 +1,29 @@ +import { Component, Input, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-nav-steps', + templateUrl: './nav-steps.component.html', + styleUrls: ['./nav-steps.component.scss'], +}) +export class NavStepsComponent implements OnInit { + @Input() + display_next_button = true; + @Input() + previous_step_number = 1; + @Input() + next_step_number = 1; + @Input() + display_previous_button = true; + @Input() + is_finish_step = false; + @Input() + endAction: Function; + + constructor() {} + + ngOnInit(): void {} + + runEndAction() { + return this.endAction(); + } +} diff --git a/src/app/features/administration/stepper/stepper.component.html b/src/app/features/administration/stepper/stepper.component.html index 296faeb0..faab6932 100644 --- a/src/app/features/administration/stepper/stepper.component.html +++ b/src/app/features/administration/stepper/stepper.component.html @@ -62,18 +62,10 @@

Étape {{ step_current }} sur {{ step_max }}

- - Annuler - + Annuler
-
diff --git a/src/app/features/administration/stepper/stepper.component.ts b/src/app/features/administration/stepper/stepper.component.ts index 14609cf2..cff61967 100644 --- a/src/app/features/administration/stepper/stepper.component.ts +++ b/src/app/features/administration/stepper/stepper.component.ts @@ -30,6 +30,8 @@ export class StepperComponent { showCancelDialog() { this.confirmationService.confirm({ header: 'Quitter ?', + acceptLabel: 'Quitter', + rejectLabel: 'Rester', message: 'Souhaitez-vous vraiment quitter le sondage ? Toutes les informations seront effacées.', accept: () => this.goToHome(), reject: () => console.log('rejected'), diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index a650625e..75548c70 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -15,7 +15,7 @@ const apiV1 = { }; export const environment = { - advanced_options_display: false, + advanced_options_display: true, appLogo: 'assets/img/logo.png', appTitle: 'FramaDate', appVersion: '2.2.1', diff --git a/src/styles/partials/_forms.scss b/src/styles/partials/_forms.scss index 1820efbf..3b502c87 100644 --- a/src/styles/partials/_forms.scss +++ b/src/styles/partials/_forms.scss @@ -297,14 +297,9 @@ mat-checkbox { } .advanced-config { - .box { - background: $light; - border: 3px solid $primary-color; - } - .work-in-progress { padding: 1em 2em; - background: $border-color; + border-left: 3px solid $warning-dark; color: $light; } }