diff --git a/src/addons/messages/pages/search/search.html b/src/addons/messages/pages/search/search.html index 60fa3c1ca..30d66eff8 100644 --- a/src/addons/messages/pages/search/search.html +++ b/src/addons/messages/pages/search/search.html @@ -28,7 +28,7 @@ + icon="fas-magnifying-glass" [message]="'core.noresults' | translate" role="alert" /> diff --git a/src/addons/mod/forum/pages/search/search.html b/src/addons/mod/forum/pages/search/search.html index c31a0b312..18ed2b35d 100644 --- a/src/addons/mod/forum/pages/search/search.html +++ b/src/addons/mod/forum/pages/search/search.html @@ -31,7 +31,7 @@ - +

{{ 'core.search.empty' | translate }}

{{ 'core.search.noresults' | translate: { $a: resultsSource.getQuery() } }}

diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html index fc3f19726..10ff6ad2e 100644 --- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html +++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html @@ -24,7 +24,7 @@ - + @@ -65,7 +65,7 @@ + [message]="'addon.mod_glossary.noentriesfound' | translate" [attr.role]="hasSearched ? 'alert' : null" /> diff --git a/src/core/features/courses/pages/list/list.html b/src/core/features/courses/pages/list/list.html index 35b91bb56..b896132fb 100644 --- a/src/core/features/courses/pages/list/list.html +++ b/src/core/features/courses/pages/list/list.html @@ -28,7 +28,7 @@ [placeholder]="'core.courses.search' | translate" [searchLabel]="'core.courses.search' | translate" [autoFocus]="searchMode" searchArea="CoreCoursesSearch" [lengthCheck]="1" /> - + @@ -45,7 +45,7 @@ + [message]="'core.courses.nosearchresults' | translate" role="alert" /> diff --git a/src/core/features/courses/pages/list/list.ts b/src/core/features/courses/pages/list/list.ts index 0a3d460ec..1993496cb 100644 --- a/src/core/features/courses/pages/list/list.ts +++ b/src/core/features/courses/pages/list/list.ts @@ -49,6 +49,7 @@ export class CoreCoursesListPage implements OnInit, OnDestroy { coursesLoaded = 0; canLoadMore = false; loadMoreError = false; + loadingMessage = Translate.instant('core.loading'); showOnlyEnrolled = false; @@ -176,6 +177,8 @@ export class CoreCoursesListPage implements OnInit, OnDestroy { * @returns Promise resolved when done. */ protected async loadCourses(clearTheList = false): Promise { + this.loadingMessage = Translate.instant('core.loading'); + this.loadMoreError = false; try { @@ -249,9 +252,10 @@ export class CoreCoursesListPage implements OnInit, OnDestroy { this.searchTotal = 0; this.logSearch = CoreTime.once(() => this.performLogSearch()); - const modal = await CoreDomUtils.showModalLoading('core.searching', true); + this.loaded = false; await this.searchCourses().finally(() => { - modal.dismiss(); + this.loaded = true; + }); } @@ -310,6 +314,7 @@ export class CoreCoursesListPage implements OnInit, OnDestroy { */ protected async searchCourses(): Promise { this.loadMoreError = false; + this.loadingMessage = Translate.instant('core.searching'); try { const response = await CoreCourses.search(this.searchText, this.searchPage, undefined, this.showOnlyEnrolled); diff --git a/src/core/features/search/pages/global-search/global-search.html b/src/core/features/search/pages/global-search/global-search.html index 61f677773..ebdb674d9 100644 --- a/src/core/features/search/pages/global-search/global-search.html +++ b/src/core/features/search/pages/global-search/global-search.html @@ -35,7 +35,7 @@ [error]="loadMoreError" /> -

{{ 'core.search.empty' | translate }}

+

{{ 'core.search.empty' | translate }}

{{ 'core.search.noresults' | translate: { $a: resultsSource.getQuery() } }}

{{ 'core.search.noresultshelp' | translate }}

diff --git a/src/core/features/tag/pages/search/search.html b/src/core/features/tag/pages/search/search.html index d04d7e819..8416209e6 100644 --- a/src/core/features/tag/pages/search/search.html +++ b/src/core/features/tag/pages/search/search.html @@ -34,7 +34,7 @@ + [message]="'core.tag.notagsfound' | translate: {$a: query}" role="alert" />
diff --git a/src/core/features/user/pages/participants/participants.html b/src/core/features/user/pages/participants/participants.html index 4775bb79f..96bb9d5d9 100644 --- a/src/core/features/user/pages/participants/participants.html +++ b/src/core/features/user/pages/participants/participants.html @@ -12,7 +12,7 @@ [message]="'core.user.noparticipants' | translate" /> + [message]="'core.noresults' | translate" [attr.role]="searchQuery ? 'alert' : null" />