From 1b4fea36ad0bd3b640a89dc67a2552f79d2293f6 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 13 May 2021 13:15:51 +0200
Subject: [PATCH] MOBILE-3320 core: Add ion-text-wrap to combobox
ion-select-options
---
.../myoverview/addon-block-myoverview.html | 18 ++++++------
.../timeline/addon-block-timeline.html | 28 ++++++++++++++-----
src/addons/notes/pages/list/list.html | 12 ++++++--
.../pages/settings/settings.html | 2 +-
.../privatefiles/pages/index/index.html | 8 ++++--
.../features/tag/pages/search/search.html | 6 ++--
6 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index f91a08355..b124408e6 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -37,32 +37,34 @@
<div class="safe-padding-horizontal" [hidden]="showFilter || !showSelectorFilter">
<!-- "Time" selector. -->
<core-combobox [label]="'core.show' | translate" [selection]="selectedFilter" (onChange)="selectedChanged($event)">
- <ion-select-option value="allincludinghidden" *ngIf="showFilters.allincludinghidden != 'hidden'">
+ <ion-select-option class="ion-text-wrap" value="allincludinghidden" *ngIf="showFilters.allincludinghidden != 'hidden'">
{{ 'addon.block_myoverview.allincludinghidden' | translate }}
</ion-select-option>
- <ion-select-option value="all" *ngIf="showFilters.all != 'hidden'">
+ <ion-select-option class="ion-text-wrap" value="all" *ngIf="showFilters.all != 'hidden'">
{{ 'addon.block_myoverview.all' | translate }}
</ion-select-option>
- <ion-select-option value="inprogress" *ngIf="showFilters.inprogress != 'hidden'"
+ <ion-select-option class="ion-text-wrap" value="inprogress" *ngIf="showFilters.inprogress != 'hidden'"
[disabled]="showFilters.inprogress == 'disabled'">
{{ 'addon.block_myoverview.inprogress' | translate }}
</ion-select-option>
- <ion-select-option value="future" *ngIf="showFilters.future != 'hidden'" [disabled]="showFilters.future == 'disabled'">
+ <ion-select-option class="ion-text-wrap" value="future" *ngIf="showFilters.future != 'hidden'"
+ [disabled]="showFilters.future == 'disabled'">
{{ 'addon.block_myoverview.future' | translate }}
</ion-select-option>
- <ion-select-option value="past" *ngIf="showFilters.past != 'hidden'" [disabled]="showFilters.past == 'disabled'">
+ <ion-select-option class="ion-text-wrap" value="past" *ngIf="showFilters.past != 'hidden'" [disabled]="showFilters.past == 'disabled'">
{{ 'addon.block_myoverview.past' | translate }}
</ion-select-option>
<ng-container *ngIf="showFilters.custom != 'hidden'">
<ng-container *ngFor="let customOption of customFilter; let index = index">
- <ion-select-option value="custom-{{index}}">{{ customOption.name }}</ion-select-option>
+ <ion-select-option class="ion-text-wrap" value="custom-{{index}}">{{ customOption.name }}</ion-select-option>
</ng-container>
</ng-container>
- <ion-select-option value="favourite" *ngIf="showFilters.favourite != 'hidden'"
+ <ion-select-option class="ion-text-wrap" value="favourite" *ngIf="showFilters.favourite != 'hidden'"
[disabled]="showFilters.favourite == 'disabled'">
{{ 'addon.block_myoverview.favourites' | translate }}
</ion-select-option>
- <ion-select-option value="hidden" *ngIf="showFilters.hidden != 'hidden'" [disabled]="showFilters.hidden == 'disabled'">
+ <ion-select-option class="ion-text-wrap" value="hidden" *ngIf="showFilters.hidden != 'hidden'"
+ [disabled]="showFilters.hidden == 'disabled'">
{{ 'addon.block_myoverview.hiddencourses' | translate }}
</ion-select-option>
</core-combobox>
diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
index 2249fac9e..6635ba016 100644
--- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html
+++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html
@@ -12,13 +12,27 @@
<core-loading [hideUntil]="loaded" class="core-loading-center">
<div class="safe-padding-horizontal">
<core-combobox [selection]="filter" (onChange)="switchFilter($event)">
- <ion-select-option value="all">{{ 'core.all' | translate }}</ion-select-option>
- <ion-select-option value="overdue">{{ 'addon.block_timeline.overdue' | translate }}</ion-select-option>
- <ion-select-option disabled value="disabled">{{ 'addon.block_timeline.duedate' | translate }}</ion-select-option>
- <ion-select-option value="next7days">{{ 'addon.block_timeline.next7days' | translate }}</ion-select-option>
- <ion-select-option value="next30days">{{ 'addon.block_timeline.next30days' | translate }}</ion-select-option>
- <ion-select-option value="next3months">{{ 'addon.block_timeline.next3months' | translate }}</ion-select-option>
- <ion-select-option value="next6months">{{ 'addon.block_timeline.next6months' | translate }}</ion-select-option>
+ <ion-select-option class="ion-text-wrap" value="all">
+ {{ 'core.all' | translate }}
+ </ion-select-option>
+ <ion-select-option class="ion-text-wrap" value="overdue">
+ {{ 'addon.block_timeline.overdue' | translate }}
+ </ion-select-option>
+ <ion-select-option class="ion-text-wrap" disabled value="disabled">
+ {{ 'addon.block_timeline.duedate' | translate }}
+ </ion-select-option>
+ <ion-select-option class="ion-text-wrap" value="next7days">
+ {{ 'addon.block_timeline.next7days' | translate }}
+ </ion-select-option>
+ <ion-select-option class="ion-text-wrap" value="next30days">
+ {{ 'addon.block_timeline.next30days' | translate }}
+ </ion-select-option>
+ <ion-select-option class="ion-text-wrap" value="next3months">
+ {{ 'addon.block_timeline.next3months' | translate }}
+ </ion-select-option>
+ <ion-select-option class="ion-text-wrap" value="next6months">
+ {{ 'addon.block_timeline.next6months' | translate }}
+ </ion-select-option>
</core-combobox>
</div>
<core-loading [hideUntil]="timeline.loaded" [hidden]="sort != 'sortbydates'" class="core-loading-center">
diff --git a/src/addons/notes/pages/list/list.html b/src/addons/notes/pages/list/list.html
index 0d5f1c048..2b4d264e7 100644
--- a/src/addons/notes/pages/list/list.html
+++ b/src/addons/notes/pages/list/list.html
@@ -36,9 +36,15 @@
</ion-item>
<core-combobox [selection]="type" (onChange)="typeChanged($event)">
- <ion-select-option value="site">{{ 'addon.notes.sitenotes' | translate }}</ion-select-option>
- <ion-select-option value="course">{{ 'addon.notes.coursenotes' | translate }}</ion-select-option>
- <ion-select-option value="personal">{{ 'addon.notes.personalnotes' | translate }}</ion-select-option>
+ <ion-select-option class="ion-text-wrap" value="site">
+ {{ 'addon.notes.sitenotes' | translate }}
+ </ion-select-option>
+ <ion-select-option class="ion-text-wrap" value="course">
+ {{ 'addon.notes.coursenotes' | translate }}
+ </ion-select-option>
+ <ion-select-option class="ion-text-wrap" value="personal">
+ {{ 'addon.notes.personalnotes' | translate }}
+ </ion-select-option>
</core-combobox>
<ion-card class="core-warning-card" *ngIf="hasOffline">
diff --git a/src/addons/notifications/pages/settings/settings.html b/src/addons/notifications/pages/settings/settings.html
index b343928fc..b8c711b94 100644
--- a/src/addons/notifications/pages/settings/settings.html
+++ b/src/addons/notifications/pages/settings/settings.html
@@ -43,7 +43,7 @@
<!-- Show processor selector. -->
<core-combobox *ngIf="preferences && preferences.processors && preferences.processors.length > 0"
[selection]="currentProcessor!.name" (onChange)="changeProcessor($event)">
- <ion-select-option *ngFor="let processor of preferences.processors" [value]="processor.name">
+ <ion-select-option class="ion-text-wrap" *ngFor="let processor of preferences.processors" [value]="processor.name">
{{ processor.displayname }}
</ion-select-option>
</core-combobox>
diff --git a/src/addons/privatefiles/pages/index/index.html b/src/addons/privatefiles/pages/index/index.html
index c35695fcb..2f145c520 100644
--- a/src/addons/privatefiles/pages/index/index.html
+++ b/src/addons/privatefiles/pages/index/index.html
@@ -15,8 +15,12 @@
<core-loading [hideUntil]="filesLoaded" *ngIf="showPrivateFiles || showSiteFiles">
<!-- Allow selecting the files to see: private or site. -->
<core-combobox [selection]="root" (onChange)="rootChanged($event)" *ngIf="showPrivateFiles && showSiteFiles && !path">
- <ion-select-option value="my">{{ 'addon.privatefiles.privatefiles' | translate }}</ion-select-option>
- <ion-select-option value="site">{{ 'addon.privatefiles.sitefiles' | translate }}</ion-select-option>
+ <ion-select-option class="ion-text-wrap" value="my">
+ {{ 'addon.privatefiles.privatefiles' | translate }}
+ </ion-select-option>
+ <ion-select-option class="ion-text-wrap" value="site">
+ {{ 'addon.privatefiles.sitefiles' | translate }}
+ </ion-select-option>
</core-combobox>
<!-- Display info about space used and space left. -->
diff --git a/src/core/features/tag/pages/search/search.html b/src/core/features/tag/pages/search/search.html
index 7155a6cf8..ce1af02b7 100644
--- a/src/core/features/tag/pages/search/search.html
+++ b/src/core/features/tag/pages/search/search.html
@@ -19,8 +19,10 @@
</ion-col>
<ion-col size="12" size-sm="6" *ngIf="collections && collections.length > 1">
<core-combobox [selection]="collectionId" (onChange)="searchTags($event)" [disabled]="searching">
- <ion-select-option [value]="0">{{ 'core.tag.inalltagcoll' | translate }}</ion-select-option>
- <ion-select-option *ngFor="let collection of collections" [value]="collection.id">
+ <ion-select-option class="ion-text-wrap" [value]="0">
+ {{ 'core.tag.inalltagcoll' | translate }}
+ </ion-select-option>
+ <ion-select-option class="ion-text-wrap" *ngFor="let collection of collections" [value]="collection.id">
{{ collection.name }}</ion-select-option>
</core-combobox>
</ion-col>