EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2345 from crazyserver/MOBILE-2870 

MOBILE-2870 feedback: Solve cut buttons in columns
main
Juan Leyva 2020-04-27 17:48:17 +02:00 committed by GitHub
parent 394cd8275c 8e9a841a8c
commit c5f51d51b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
View File

@ -108,18 +108,18 @@
</ion-item>
<ion-grid>
<ion-row align-items-center>
<ion-col>
<button ion-button block outline icon-start (click)="gotoAnswerQuestions(true)">
<ion-col col-12 [attr.col-sm-6]="(access.cancomplete && access.cansubmit && access.isopen) || null">
<button ion-button block outline icon-start (click)="gotoAnswerQuestions(true)" text-wrap>
<ion-icon name="search"></ion-icon>
{{ 'addon.mod_feedback.preview' | translate }}
</button>
</ion-col>
<ion-col *ngIf="access.cancomplete && access.cansubmit && access.isopen">
<button ion-button block icon-end *ngIf="!goPage" (click)="gotoAnswerQuestions()">
<ion-col *ngIf="access.cancomplete && access.cansubmit && access.isopen" col-12 col-sm-6>
<button ion-button block icon-end *ngIf="!goPage" (click)="gotoAnswerQuestions()" text-wrap>
{{ 'addon.mod_feedback.complete_the_form' | translate }}
<ion-icon name="arrow-forward"></ion-icon>
</button>
<button ion-button block icon-end *ngIf="goPage" (click)="gotoAnswerQuestions()">
<button ion-button block icon-end *ngIf="goPage" (click)="gotoAnswerQuestions()" text-wrap>
{{ 'addon.mod_feedback.continue_the_form' | translate }}
<ion-icon name="arrow-forward"></ion-icon>
</button>

20
src/addon/mod/feedback/pages/form/form.html
View File

@ -67,20 +67,20 @@
</ng-container>
<ion-grid *ngIf="!preview">
<ion-row align-items-center>
<ion-col *ngIf="hasPrevPage">
<button ion-button block outline icon-start (click)="gotoPage(true)">
<ion-col *ngIf="hasPrevPage" col-12 col-sm-6>
<button ion-button block outline icon-start (click)="gotoPage(true)" text-wrap>
<ion-icon name="arrow-back"></ion-icon>
{{ 'addon.mod_feedback.previous_page' | translate }}
</button>
</ion-col>
<ion-col *ngIf="hasNextPage">
<button ion-button block icon-end (click)="gotoPage(false)">
<ion-col *ngIf="hasNextPage" col-12 [attr.col-sm-6]="(hasPrevPage) || null">
<button ion-button block icon-end (click)="gotoPage(false)" text-wrap>
{{ 'addon.mod_feedback.next_page' | translate }}
<ion-icon name="arrow-forward"></ion-icon>
</button>
</ion-col>
<ion-col *ngIf="!hasNextPage">
<button ion-button block (click)="gotoPage(false)">
<ion-col *ngIf="!hasNextPage" col-12 [attr.col-sm-6]="(hasPrevPage) || null">
<button ion-button block (click)="gotoPage(false)" text-wrap>
{{ 'addon.mod_feedback.save_entries' | translate }}
</button>
</ion-col>
@ -98,14 +98,14 @@
<ion-grid *ngIf="completed">
<ion-row align-items-center>
<ion-col *ngIf="access.canviewanalysis">
<button ion-button block outline icon-start (click)="showAnalysis()">
<ion-col *ngIf="access.canviewanalysis" col-12 [attr.col-sm-6]="(hasNextPage) || null">
<button ion-button block outline icon-start (click)="showAnalysis()" text-wrap>
<ion-icon name="stats"></ion-icon>
{{ 'addon.mod_feedback.completed_feedbacks' | translate }}
</button>
</ion-col>
<ion-col *ngIf="hasNextPage">
<button ion-button block icon-end (click)="continue()">
<ion-col *ngIf="hasNextPage" col-12 [attr.col-sm-6]="(access.canviewanalysis) || null">
<button ion-button block icon-end (click)="continue()" text-wrap>
{{ 'core.continue' | translate }}
<ion-icon name="arrow-forward"></ion-icon>
</button>