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

Merge pull request #2776 from NoelDeMartin/MOBILE-3320 

MOBILE-3320: Tweaks
main
Pau Ferrer Ocaña 2021-05-19 18:03:06 +02:00 committed by GitHub
parent ba967ebbc9 5f7e18c2b3
commit 60dac52798
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/addons/messages/messages-lazy.module.ts
View File

@ -51,6 +51,10 @@ function buildRoutes(injector: Injector): Routes {
loadChildren: () => import('./pages/contacts/contacts.module') loadChildren: () => import('./pages/contacts/contacts.module')
.then(m => m.AddonMessagesContactsPageModule), .then(m => m.AddonMessagesContactsPageModule),
}, },
{
path: 'preferences',
loadChildren: () => import('./pages/settings/settings.module').then(m => m.AddonMessagesSettingsPageModule),
},
...buildTabMainRoutes(injector, { ...buildTabMainRoutes(injector, {
canActivate: [AddonMessagesIndexGuard], canActivate: [AddonMessagesIndexGuard],
}), }),

3
src/addons/messages/pages/group-conversations/group-conversations.page.ts
View File

@ -35,7 +35,6 @@ import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifi
import { ActivatedRoute, Params } from '@angular/router'; import { ActivatedRoute, Params } from '@angular/router';
import { CoreUtils } from '@services/utils/utils'; import { CoreUtils } from '@services/utils/utils';
import { CoreNavigator } from '@services/navigator'; import { CoreNavigator } from '@services/navigator';
import { AddonMessagesSettingsHandlerService } from '@addons/messages/services/handlers/settings';
import { CoreScreen } from '@services/screen'; import { CoreScreen } from '@services/screen';
/** /**
@ -529,7 +528,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
* Navigate to message settings. * Navigate to message settings.
*/ */
gotoSettings(): void { gotoSettings(): void {
CoreNavigator.navigateToSitePath(AddonMessagesSettingsHandlerService.PAGE_NAME); CoreNavigator.navigateToSitePath('../preferences');
} }
/** /**

2
src/addons/mod/data/components/search/search.html
View File

@ -19,7 +19,7 @@
<form (ngSubmit)="searchEntries($event)" [formGroup]="searchForm" #searchFormEl> <form (ngSubmit)="searchEntries($event)" [formGroup]="searchForm" #searchFormEl>
<ion-list class="ion-no-margin"> <ion-list class="ion-no-margin">
<ion-item [hidden]="search.searchingAdvanced"> <ion-item [hidden]="search.searchingAdvanced">
<ion-label></ion-label> <ion-label class="sr-only">{{ 'addon.mod_data.search' | translate}}</ion-label>
<ion-input type="text" placeholder="{{ 'addon.mod_data.search' | translate}}" <ion-input type="text" placeholder="{{ 'addon.mod_data.search' | translate}}"
[(ngModel)]="search.text" name="text" formControlName="text"> [(ngModel)]="search.text" name="text" formControlName="text">
</ion-input> </ion-input>

2
src/core/features/search/components/search-box/core-search-box.html
View File

@ -1,7 +1,7 @@
<ion-card> <ion-card>
<form (ngSubmit)="submitForm($event)" role="search" #searchForm> <form (ngSubmit)="submitForm($event)" role="search" #searchForm>
<ion-item> <ion-item>
<ion-label></ion-label> <ion-label class="sr-only">{{ placeholder }}</ion-label>
<ion-input type="search" name="search" [(ngModel)]="searchText" [placeholder]="placeholder" <ion-input type="search" name="search" [(ngModel)]="searchText" [placeholder]="placeholder"
[autocorrect]="autocorrect" [spellcheck]="spellcheck" [core-auto-focus]="autoFocus" [autocorrect]="autocorrect" [spellcheck]="spellcheck" [core-auto-focus]="autoFocus"
[disabled]="disabled" role="searchbox" (ionFocus)="focus($event)"> [disabled]="disabled" role="searchbox" (ionFocus)="focus($event)">