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 a4095a96..14b2d8ca 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 @@ -7,14 +7,14 @@ {{ 'resume.description' | translate }}

-

{{ 'resume.general' | translate }}

+

{{ 'resume.general' | translate }}

-

+

{{ pollService.form.value.title }} - - (pas de titre) - -

+

+

+ (pas de titre) +

{{ pollService.form.value.description }} @@ -22,21 +22,28 @@


-
- icone crayon +
{{ 'resume.edit' | translate }}
-

{{ 'resume.kind' | translate }}

+

{{ 'resume.kind' | translate }}

{{ pollService.form.value.isAboutDate ? 'Date' : 'Propositions' }}
-
- +
{{ 'resume.edit' | translate }}
-

{{ 'resume.dates_and_hours' | translate }}

+

+ {{ 'resume.dates_and_hours' | translate }} +

+

{{ 'SENTENCES.Choice' | translate }}

    @@ -53,28 +60,52 @@
-
    +
    • - {{ choice }} + {{ choice.name }}

-
- +
{{ 'resume.edit' | translate }}
-

{{ 'resume.params_notifs' | translate }}

+

{{ 'resume.params_notifs' | translate }}

-
Protégé par mot de passe: {{ pollService.form.value.password ? 'oui' : 'non' }}
+

+ {{ 'SENTENCES.password-protected' | translate }} +

+
+ + +

+ {{ 'SENTENCES.voters-can-modify-their-own-vote-themselves' | translate }} +

+ + +

+ email on comment: + {{ pollService.form.value.isOwnerNotifiedByEmailOnNewComment ? 'oui' : 'non' }} +

+

+ email on vote: + {{ pollService.form.value.isOwnerNotifiedByEmailOnNewVote ? 'oui' : 'non' }} +

+
+
-
- +
{{ 'resume.edit' | translate }}
-

{{ 'resume.owner' | translate }}

+

{{ 'resume.owner' | translate }}

@@ -89,8 +120,10 @@ {{ pollService.form.value.creatorEmail }}

-
- +
{{ 'resume.edit' | translate }}
diff --git a/src/app/features/administration/form/steps/step-seven/step-seven.component.scss b/src/app/features/administration/form/steps/step-seven/step-seven.component.scss index e69de29b..613e49df 100644 --- a/src/app/features/administration/form/steps/step-seven/step-seven.component.scss +++ b/src/app/features/administration/form/steps/step-seven/step-seven.component.scss @@ -0,0 +1,26 @@ +.step-resume { + .description { + font-weight: 400; + font-size: 16px; + line-height: 20px; + } + .title { + margin-top: 2rem; + } + .block-label { + font-weight: 700; + font-size: 16px; + line-height: 20px; + margin-bottom: 1rem; + .rounded-block > & { + margin-top: 0; + } + } + .go-to-step { + margin-left: -1rem; + margin-right: -1rem; + &:hover { + color: #000; + } + } +} diff --git a/src/app/features/administration/form/steps/step-seven/step-seven.component.ts b/src/app/features/administration/form/steps/step-seven/step-seven.component.ts index 4974f404..19220265 100644 --- a/src/app/features/administration/form/steps/step-seven/step-seven.component.ts +++ b/src/app/features/administration/form/steps/step-seven/step-seven.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { PollService } from '../../../../../core/services/poll.service'; +import { StorageService } from '../../../../../core/services/storage.service'; @Component({ selector: 'app-step-seven', @@ -8,7 +9,7 @@ import { PollService } from '../../../../../core/services/poll.service'; styleUrls: ['./step-seven.component.scss'], }) export class StepSevenComponent implements OnInit { - constructor(private router: Router, public pollService: PollService) { + constructor(private router: Router, public StorageService: StorageService, public pollService: PollService) { this.pollService.step_current = 7; } diff --git a/src/styles/dev-utilities/_helpers.scss b/src/styles/dev-utilities/_helpers.scss index 64aeaf15..59b9ac3e 100644 --- a/src/styles/dev-utilities/_helpers.scss +++ b/src/styles/dev-utilities/_helpers.scss @@ -57,7 +57,7 @@ } .rounded-block { - border-radius: 0.25em; + border-radius: 8px; background: $d-blue30; padding: 1em; margin-bottom: 1rem; diff --git a/src/styles/partials/_forms.scss b/src/styles/partials/_forms.scss index 620352bd..6cdc94f0 100644 --- a/src/styles/partials/_forms.scss +++ b/src/styles/partials/_forms.scss @@ -326,10 +326,11 @@ mat-checkbox { padding-bottom: 0; } .go-to-step { - padding: 1rem 0.75rem; - padding-left: 1rem; - margin-left: -1em; - margin-right: -1em; + color: $primary; + padding: 1rem 0.5rem; + padding-left: 44px; + //margin-left: -1em; + //margin-right: -1em; } .list-datechoices {