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

put correct icons in participation vote, add dropdown on option button

This commit is contained in:
Tykayn 2022-03-22 10:31:05 +01:00 committed by tykayn
parent 873c7dd9c8
commit c6861d1690
7 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/features/administration/actions-menu/actions-menu.component.html
View File

@ -1,21 +1,17 @@
<div class="actions">
<button class="button" (click)="displayMenu = false">
{{ 'SENTENCES.Close' | translate }}
<i class="fa fa-times"></i>
</button>
<button class="export export-print btn" (click)="print()">
<div class="actions-menu">
<button class="export export-print button is-secondary" (click)="print()">
<i class="fa fa-print"></i>
{{ 'participation.modal.options.print' | translate }}
</button>
<button class="export export-csv btn" (click)="exportCSV()">
<button class="export export-csv button is-secondary" (click)="exportCSV()">
<i class="fa fa-file-calc-o" aria-hidden="true"></i>
{{ 'participation.modal.options.export_csv' | translate }}
</button>
<button class="export export-json btn" (click)="exportJson()">
<button class="export export-json button is-secondary" (click)="exportJson()">
<i class="fa fa-file-archive-o" aria-hidden="true"></i>
JSON
</button>
<button class="replicate duplicate btn" (click)="duplicate()">
<button class="replicate duplicate button is-secondary" (click)="duplicate()">
<i class="fa fa-copy" aria-hidden="true"></i>
{{ 'success.copy' | translate }}
</button>

15
src/app/features/administration/actions-menu/actions-menu.component.scss
View File

@ -0,0 +1,15 @@
.actions-menu {
background: white;
padding: 1rem;
border-radius: 8px;
border: solid 1px #ccc;
position: relative;
z-index: 10;
margin-top: 4rem;
margin-bottom: 1rem;
.button {
margin-right: 1ch;
margin-bottom: 1ch;
width: 100%;
}
}

2
src/app/features/administration/actions-menu/actions-menu.component.ts
View File

@ -14,7 +14,7 @@ import { ConfirmationService } from 'primeng/api';
styleUrls: ['./actions-menu.component.scss'],
})
export class ActionsMenuComponent implements OnInit {
@Input() displayMenu = false;
@Input() displayMenu: boolean;
constructor(
private router: Router,

32
src/app/features/consultation/consultation.component.html
View File

@ -3,9 +3,9 @@
<section class="poll_loaded padded consultation" *ngIf="!fetching && poll">
<div class="step contained-in-large-column">
<div class="rounded-block admin-share-link" *ngIf="poll.admin_key || show_admin_stuff">
<h2 class="title is-2">
<h1 class="title is-2">
{{ 'participation.share_title' | translate }}
</h2>
</h1>
<p class="description">
{{ 'participation.share_description' | translate }}
</p>
@ -22,24 +22,24 @@
</div>
</div>
<section class="main-title-poll rounded-block">
<div class="columns">
<div class="column">
<h2 class="title is-2">
{{ poll.title }}
</h2>
</div>
<div class="columns">
<button class="options-button pull-right" (click)="displayOptions()">
{{ 'participation.menu_label' | translate }}
<i class="fa fa-chevron-down"></i>
</button>
</div>
</div>
<h2 class="title is-2">
{{ poll.title }}
</h2>
<button
class="pull-right button is-action"
(click)="displayOptions()"
[ngClass]="{ 'is-active': display_options_menu }"
>
{{ 'participation.menu_label' | translate }}
<i class="fa fa-chevron-down"></i>
</button>
<app-actions-menu [displayMenu]="display_options_menu" *ngIf="display_options_menu"></app-actions-menu>
<p class="description">
{{ poll.description }}
</p>
<app-actions-menu [displayMenu]="display_options_menu" *ngIf="display_options_menu"></app-actions-menu>
<button
class="vote-button is-primary button"
*ngIf="poll.votes_allowed"

3
src/app/features/consultation/consultation.component.scss
View File

@ -15,5 +15,6 @@
background: transparent;
}
.vote-button {
margin-right: 2rem;
margin-right: 1ch;
margin-bottom: 1ch;
}

2
src/app/features/participation/participation.component.html
View File

@ -1,6 +1,6 @@
<div class="columns">
<div class="column has-text-centered">
<h1>Participation</h1>
<h1 class="title is-1">Participation</h1>
</div>
</div>

6
src/styles/dev-utilities/_helpers.scss
View File

@ -127,13 +127,13 @@
}
.has-background-answer-YES {
background: url('/assets/icons/plus-circle.svg') no-repeat 28px center;
background: url('/assets/icons/advanced/yes.svg') no-repeat 28px center;
}
.has-background-answer-MAYBE {
background: url('/assets/icons/help-circle.svg') no-repeat 28px center;
background: url('/assets/icons/advanced/maybe.svg') no-repeat 28px center;
}
.has-background-answer-NO {
background: url('/assets/icons/x.svg') no-repeat 28px center;
background: url('/assets/icons/advanced/no.svg') no-repeat 28px center;
}
.has-background-link-icon {