commit
73e4279785
|
@ -30,14 +30,14 @@
|
||||||
|
|
||||||
<form [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form" #credentialsForm>
|
<form [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form" #credentialsForm>
|
||||||
<ion-item *ngIf="siteChecked && !isBrowserSSO">
|
<ion-item *ngIf="siteChecked && !isBrowserSSO">
|
||||||
<ion-label></ion-label>
|
<ion-label class="sr-only">{{ 'core.login.username' | translate }}</ion-label>
|
||||||
<ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}"
|
<ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}"
|
||||||
formControlName="username" autocapitalize="none" autocorrect="off" autocomplete="username" enterkeyhint="next"
|
formControlName="username" autocapitalize="none" autocorrect="off" autocomplete="username" enterkeyhint="next"
|
||||||
required="true" core-auto-focus>
|
required="true" core-auto-focus>
|
||||||
</ion-input>
|
</ion-input>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
<ion-item *ngIf="siteChecked && !isBrowserSSO" class="ion-margin-bottom">
|
<ion-item *ngIf="siteChecked && !isBrowserSSO" class="ion-margin-bottom">
|
||||||
<ion-label></ion-label>
|
<ion-label class="sr-only">{{ 'core.login.password' | translate }}</ion-label>
|
||||||
<core-show-password name="password">
|
<core-show-password name="password">
|
||||||
<ion-input name="password" type="password" placeholder="{{ 'core.login.password' | translate }}"
|
<ion-input name="password" type="password" placeholder="{{ 'core.login.password' | translate }}"
|
||||||
formControlName="password" [clearOnEdit]="false" autocomplete="current-password" enterkeyhint="go"
|
formControlName="password" [clearOnEdit]="false" autocomplete="current-password" enterkeyhint="go"
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
</ion-label>
|
</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
<ion-item class="ion-margin-bottom">
|
<ion-item class="ion-margin-bottom">
|
||||||
<ion-label></ion-label>
|
<ion-label class="sr-only">{{ 'core.login.password' | translate }}</ion-label>
|
||||||
<core-show-password name="password">
|
<core-show-password name="password">
|
||||||
<ion-input class="core-ioninput-password" name="password" type="password"
|
<ion-input class="core-ioninput-password" name="password" type="password"
|
||||||
placeholder="{{ 'core.login.password' | translate }}" formControlName="password" [clearOnEdit]="false"
|
placeholder="{{ 'core.login.password' | translate }}" formControlName="password" [clearOnEdit]="false"
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
[disabled]="tab.hide"
|
[disabled]="tab.hide"
|
||||||
layout="label-hide"
|
layout="label-hide"
|
||||||
class="{{tab.class}}"
|
class="{{tab.class}}"
|
||||||
|
[selected]="tab.page === selectedTab"
|
||||||
[tabindex]="selectedTab == tab.page ? 0 : -1"
|
[tabindex]="selectedTab == tab.page ? 0 : -1"
|
||||||
[attr.aria-controls]="tab.id"
|
[attr.aria-controls]="tab.id"
|
||||||
[attr.aria-label]="tab.title | translate"
|
[attr.aria-label]="tab.title | translate"
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
import { ApplicationRef } from '@angular/core';
|
import { ApplicationRef } from '@angular/core';
|
||||||
|
import { CorePushNotifications, CorePushNotificationsProvider } from '@features/pushnotifications/services/pushnotifications';
|
||||||
import { CoreApp, CoreAppProvider } from '@services/app';
|
import { CoreApp, CoreAppProvider } from '@services/app';
|
||||||
import { CoreCronDelegate, CoreCronDelegateService } from '@services/cron';
|
import { CoreCronDelegate, CoreCronDelegateService } from '@services/cron';
|
||||||
import { Application } from '@singletons';
|
import { Application } from '@singletons';
|
||||||
|
@ -21,12 +22,14 @@ type AutomatedTestsWindow = Window & {
|
||||||
appRef?: ApplicationRef;
|
appRef?: ApplicationRef;
|
||||||
appProvider?: CoreAppProvider;
|
appProvider?: CoreAppProvider;
|
||||||
cronProvider?: CoreCronDelegateService;
|
cronProvider?: CoreCronDelegateService;
|
||||||
|
pushNotifications?: CorePushNotificationsProvider;
|
||||||
};
|
};
|
||||||
|
|
||||||
function initializeAutomatedTestsWindow(window: AutomatedTestsWindow) {
|
function initializeAutomatedTestsWindow(window: AutomatedTestsWindow) {
|
||||||
window.appRef = Application.instance;
|
window.appRef = Application.instance;
|
||||||
window.appProvider = CoreApp.instance;
|
window.appProvider = CoreApp.instance;
|
||||||
window.cronProvider = CoreCronDelegate.instance;
|
window.cronProvider = CoreCronDelegate.instance;
|
||||||
|
window.pushNotifications = CorePushNotifications.instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function(): void {
|
export default function(): void {
|
||||||
|
|
Loading…
Reference in New Issue