tykayn/funky-framadate-front
1
1
Fork 1
mirror of https://framagit.org/framasoft/framadate/funky-framadate-front.git synced 2023-08-25 13:53:14 +02:00
Code Issues Projects Releases Wiki Activity

remove column and container in resume step

Browse Source
This commit is contained in:
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 showDateInterval = false;
public allowSeveralHours = false; public allowSeveralHours = false;
public richTextMode = 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 calendar: Date[] = [new Date()];
public disabled_dates: 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 }} {{ 'hours.modal.title' | translate }}
</h1> </h1>
<section class="same-time-slices"> <section class="same-time-slices">
<section class="same-time-slices"> <section class="marged-v">
<section class="proposals" *ngIf="environment.creation_display_proposals_time_slices"> <section class="proposals" *ngIf="environment.creation_display_proposals_time_slices">
<div class="time-slices-proposals"> <div class="time-slices-proposals">
<div <div
@ -114,7 +114,7 @@
<input class="input" type="text" id="timeList_{{ id }}" [(ngModel)]="timeSlice.literal" /> <input class="input" type="text" id="timeList_{{ id }}" [(ngModel)]="timeSlice.literal" />
<button <button
[attr.aria-label]="'choices.delete' | translate" [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)" (click)="pollService.timeList.splice(id, 1)"
></button> ></button>
</div> </div>
@ -147,7 +147,7 @@
> >
{{ 'hours.modal.validate' | translate }} {{ 'hours.modal.validate' | translate }}
</button> </button>
<button class="button is-outlined pull-right" (click)="closeModalAndFocusOnOpenModalButton()"> <button class="button is-secondary pull-right" (click)="closeModalAndFocusOnOpenModalButton()">
{{ 'SENTENCES.Cancel' | translate }} {{ 'SENTENCES.Cancel' | translate }}
</button> </button>
</div> </div>

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

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

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

@ -1,22 +1,20 @@
<app-stepper [step_current]="7" [step_max]="pollService.step_max"></app-stepper> <app-stepper [step_current]="7" [step_max]="pollService.step_max"></app-stepper>
<div class="step min-height step-resume"> <div class="step min-height step-resume">
<div class="columns content"> <h1 class="title is-1">
<div class="column">
<h2 class="title is-2">
{{ 'resume.title' | translate }} {{ 'resume.title' | translate }}
</h2> </h1>
<p class="helper description"> <p class="helper description">
{{ 'resume.description' | translate }} {{ 'resume.description' | translate }}
</p> </p>
<div class="resume"> <div class="resume">
<h3 class="title is-3">{{ 'resume.general' | translate }}</h3> <h2 class="title is-3">{{ 'resume.general' | translate }}</h2>
<div class="block-resume"> <div class="block-resume">
<h4 class="title is-4"> <h3 class="title is-4">
{{ pollService.form.value.title }} {{ pollService.form.value.title }}
<i *ngIf="!pollService.form.value.title"> <i *ngIf="!pollService.form.value.title">
(pas de titre) (pas de titre)
</i> </i>
</h4> </h3>
<p class="description"> <p class="description">
{{ pollService.form.value.description }} {{ pollService.form.value.description }}
<i *ngIf="!pollService.form.value.description"> <i *ngIf="!pollService.form.value.description">
@ -29,7 +27,7 @@
{{ 'resume.edit' | translate }} {{ 'resume.edit' | translate }}
</div> </div>
</div> </div>
<h3 class="title is-3">{{ 'resume.kind' | translate }}</h3> <h2 class="title is-3">{{ 'resume.kind' | translate }}</h2>
<div class="block-resume"> <div class="block-resume">
{{ pollService.form.value.isAboutDate ? 'Date' : 'Propositions' }} {{ pollService.form.value.isAboutDate ? 'Date' : 'Propositions' }}
<hr /> <hr />
@ -38,7 +36,7 @@
{{ 'resume.edit' | translate }} {{ 'resume.edit' | translate }}
</div> </div>
</div> </div>
<h3 class="title is-3">{{ 'resume.dates_and_hours' | translate }}</h3> <h2 class="title is-3">{{ 'resume.dates_and_hours' | translate }}</h2>
<div class="block-resume"> <div class="block-resume">
<div class="list-datechoices" *ngIf="pollService.form.value.isAboutDate"> <div class="list-datechoices" *ngIf="pollService.form.value.isAboutDate">
<ul *ngFor="let choice of pollService.dateChoiceList"> <ul *ngFor="let choice of pollService.dateChoiceList">
@ -67,18 +65,16 @@
{{ 'resume.edit' | translate }} {{ 'resume.edit' | translate }}
</div> </div>
</div> </div>
<h3 class="title is-3">{{ 'resume.params_notifs' | translate }}</h3> <h2 class="title is-3">{{ 'resume.params_notifs' | translate }}</h2>
<div class="block-resume"> <div class="block-resume">
<div class="password"> <div class="password">Protégé par mot de passe: {{ pollService.form.value.password ? 'oui' : 'non' }}</div>
Protégé par mot de passe: {{ pollService.form.value.password ? 'oui' : 'non' }}
</div>
<hr /> <hr />
<div class="go-to-step clickable" [routerLink]="['/administration/step/4']"> <div class="go-to-step clickable" [routerLink]="['/administration/step/4']">
<img class="icon" aria-hidden="true" src="assets/icons/edit.svg" /> <img class="icon" aria-hidden="true" src="assets/icons/edit.svg" />
{{ 'resume.edit' | translate }} {{ 'resume.edit' | translate }}
</div> </div>
</div> </div>
<h3 class="title is-3">{{ 'resume.owner' | translate }}</h3> <h2 class="title is-3">{{ 'resume.owner' | translate }}</h2>
<div class="block-resume"> <div class="block-resume">
<div class="name"> <div class="name">
<strong> <strong>
@ -100,8 +96,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<app-nav-steps <app-nav-steps
[next_step_number]="pollService.step_current + 1" [next_step_number]="pollService.step_current + 1"
[previous_step_number]="pollService.step_current - 1" [previous_step_number]="pollService.step_current - 1"

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 { .p-datepicker .p-datepicker-header .p-datepicker-next:focus {
outline: 3px solid $outline-color !important; outline: 3px solid $outline-color !important;
} }
.p-button.p-button-text {
color: $primary-color;
}