tykayn
/
funky-framadate-front
mirror of https://framagit.org/framasoft/framadate/funky-framadate-front
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

remove column and container in resume step

merge-requests/73/head
Tykayn 2022-03-10 13:13:42 +01:00 committed by tykayn
parent ffeb21e8fe
commit 4f5f8df077
5 changed files with 100 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/services/poll.service.ts
View File

@ -50,7 +50,7 @@ export class PollService implements Resolve<Poll> {
public showDateInterval = false;
public allowSeveralHours = false;
public richTextMode = false;
public mode_calendar = false; // default input to select dates in creation step
public mode_calendar = true; // default input to select dates in creation step
public calendar: Date[] = [new Date()];
public disabled_dates: Date[] = [];

6
src/app/features/administration/form/steps/step-four/step-four.component.html
View File

@ -94,7 +94,7 @@
{{ 'hours.modal.title' | translate }}
</h1>
<section class="same-time-slices">
<section class="same-time-slices">
<section class="marged-v">
<section class="proposals" *ngIf="environment.creation_display_proposals_time_slices">
<div class="time-slices-proposals">
<div
@ -114,7 +114,7 @@
<input class="input" type="text" id="timeList_{{ id }}" [(ngModel)]="timeSlice.literal" />
<button
[attr.aria-label]="'choices.delete' | translate"
class="has-no-border delete-hour has-background-trash has-background-icon-left"
class="has-no-border delete-hour has-background-trash has-background-icon-left is-filtered-icon-primary"
(click)="pollService.timeList.splice(id, 1)"
></button>
</div>
@ -147,7 +147,7 @@
>
{{ 'hours.modal.validate' | translate }}
</button>
<button class="button is-outlined pull-right" (click)="closeModalAndFocusOnOpenModalButton()">
<button class="button is-secondary pull-right" (click)="closeModalAndFocusOnOpenModalButton()">
{{ 'SENTENCES.Cancel' | translate }}
</button>
</div>

5
src/app/features/administration/form/steps/step-four/step-four.component.scss
View File

@ -66,3 +66,8 @@
height: 40px;
}
}
#add_time_button {
padding-left: 40px;
background-position: left;
background-size: 20px 20px;
}

182
src/app/features/administration/form/steps/step-seven/step-seven.component.html
View File

@ -1,103 +1,97 @@
<app-stepper [step_current]="7" [step_max]="pollService.step_max"></app-stepper>
<div class="step min-height step-resume">
<div class="columns content">
<div class="column">
<h2 class="title is-2">
{{ 'resume.title' | translate }}
</h2>
<p class="helper description">
{{ 'resume.description' | translate }}
<h1 class="title is-1">
{{ 'resume.title' | translate }}
</h1>
<p class="helper description">
{{ 'resume.description' | translate }}
</p>
<div class="resume">
<h2 class="title is-3">{{ 'resume.general' | translate }}</h2>
<div class="block-resume">
<h3 class="title is-4">
{{ pollService.form.value.title }}
<i *ngIf="!pollService.form.value.title">
(pas de titre)
</i>
</h3>
<p class="description">
{{ pollService.form.value.description }}
<i *ngIf="!pollService.form.value.description">
{{ 'resume.no_description' | translate }}
</i>
</p>
<div class="resume">
<h3 class="title is-3">{{ 'resume.general' | translate }}</h3>
<div class="block-resume">
<h4 class="title is-4">
{{ pollService.form.value.title }}
<i *ngIf="!pollService.form.value.title">
(pas de titre)
</i>
</h4>
<p class="description">
{{ pollService.form.value.description }}
<i *ngIf="!pollService.form.value.description">
{{ 'resume.no_description' | translate }}
</i>
</p>
<hr />
<div class="go-to-step" [routerLink]="['/administration/step/1']">
<img class="icon" src="assets/icons/edit.svg" alt="icone crayon" />
{{ 'resume.edit' | translate }}
</div>
</div>
<h3 class="title is-3">{{ 'resume.kind' | translate }}</h3>
<div class="block-resume">
{{ pollService.form.value.isAboutDate ? 'Date' : 'Propositions' }}
<hr />
<div class="go-to-step" [routerLink]="['/administration/step/2']">
<img class="icon" aria-hidden="true" src="assets/icons/edit.svg" />
{{ 'resume.edit' | translate }}
</div>
</div>
<h3 class="title is-3">{{ 'resume.dates_and_hours' | translate }}</h3>
<div class="block-resume">
<div class="list-datechoices" *ngIf="pollService.form.value.isAboutDate">
<ul *ngFor="let choice of pollService.dateChoiceList">
<hr />
<div class="go-to-step" [routerLink]="['/administration/step/1']">
<img class="icon" src="assets/icons/edit.svg" alt="icone crayon" />
{{ 'resume.edit' | translate }}
</div>
</div>
<h2 class="title is-3">{{ 'resume.kind' | translate }}</h2>
<div class="block-resume">
{{ pollService.form.value.isAboutDate ? 'Date' : 'Propositions' }}
<hr />
<div class="go-to-step" [routerLink]="['/administration/step/2']">
<img class="icon" aria-hidden="true" src="assets/icons/edit.svg" />
{{ 'resume.edit' | translate }}
</div>
</div>
<h2 class="title is-3">{{ 'resume.dates_and_hours' | translate }}</h2>
<div class="block-resume">
<div class="list-datechoices" *ngIf="pollService.form.value.isAboutDate">
<ul *ngFor="let choice of pollService.dateChoiceList">
<li>
<strong class="date">
{{ choice.date_object | date: 'E d/M/yyy':'Europe/Paris' }}
</strong>
<ul *ngFor="let timeSlice of choice.timeSlices">
<li>
<strong class="date">
{{ choice.date_object | date: 'E d/M/yyy':'Europe/Paris' }}
</strong>
<ul *ngFor="let timeSlice of choice.timeSlices">
<li>
{{ timeSlice.literal }}
</li>
</ul>
{{ timeSlice.literal }}
</li>
</ul>
</div>
<div class="list-texts" *ngIf="!pollService.form.value.isAboutDate">
<ul *ngFor="let choice of pollService.choices">
<li>
{{ choice }}
</li>
</ul>
</div>
<hr />
<div class="go-to-step" [routerLink]="['/administration/step/3']">
<img class="icon" aria-hidden="true" src="assets/icons/edit.svg" />
{{ 'resume.edit' | translate }}
</div>
</div>
<h3 class="title is-3">{{ 'resume.params_notifs' | translate }}</h3>
<div class="block-resume">
<div class="password">
Protégé par mot de passe: {{ pollService.form.value.password ? 'oui' : 'non' }}
</div>
<hr />
<div class="go-to-step clickable" [routerLink]="['/administration/step/4']">
<img class="icon" aria-hidden="true" src="assets/icons/edit.svg" />
{{ 'resume.edit' | translate }}
</div>
</div>
<h3 class="title is-3">{{ 'resume.owner' | translate }}</h3>
<div class="block-resume">
<div class="name">
<strong>
{{ 'SENTENCES.your-name' | translate }}
</strong>
{{ pollService.form.value.creatorPseudo }}
</div>
<div class="email">
<strong>
{{ 'creation.email' | translate }}
</strong>
{{ pollService.form.value.creatorEmail }}
</div>
<hr />
<div class="go-to-step" [routerLink]="['/administration/step/6']">
<img class="icon" aria-hidden="true" src="assets/icons/edit.svg" />
{{ 'resume.edit' | translate }}
</div>
</div>
</li>
</ul>
</div>
<div class="list-texts" *ngIf="!pollService.form.value.isAboutDate">
<ul *ngFor="let choice of pollService.choices">
<li>
{{ choice }}
</li>
</ul>
</div>
<hr />
<div class="go-to-step" [routerLink]="['/administration/step/3']">
<img class="icon" aria-hidden="true" src="assets/icons/edit.svg" />
{{ 'resume.edit' | translate }}
</div>
</div>
<h2 class="title is-3">{{ 'resume.params_notifs' | translate }}</h2>
<div class="block-resume">
<div class="password">Protégé par mot de passe: {{ pollService.form.value.password ? 'oui' : 'non' }}</div>
<hr />
<div class="go-to-step clickable" [routerLink]="['/administration/step/4']">
<img class="icon" aria-hidden="true" src="assets/icons/edit.svg" />
{{ 'resume.edit' | translate }}
</div>
</div>
<h2 class="title is-3">{{ 'resume.owner' | translate }}</h2>
<div class="block-resume">
<div class="name">
<strong>
{{ 'SENTENCES.your-name' | translate }}
</strong>
{{ pollService.form.value.creatorPseudo }}
</div>
<div class="email">
<strong>
{{ 'creation.email' | translate }}
</strong>
{{ pollService.form.value.creatorEmail }}
</div>
<hr />
<div class="go-to-step" [routerLink]="['/administration/step/6']">
<img class="icon" aria-hidden="true" src="assets/icons/edit.svg" />
{{ 'resume.edit' | translate }}
</div>
</div>
</div>

3
src/styles/libraries/_overrides.scss
View File

@ -101,3 +101,6 @@ button .icon:first-child:last-child,
.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
outline: 3px solid $outline-color !important;
}
.p-button.p-button-text {
color: $primary-color;
}