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

Merge pull request #2411 from crazyserver/MOBILE-3401 

MOBILE-3401 login: Enable qr instructions
main
Juan Leyva 2020-06-16 14:22:01 +02:00 committed by GitHub
parent 0bb0fd9162 8e1aa942fd
commit 8508cf6813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/login/pages/site-help/site-help.ts
View File

@ -37,7 +37,7 @@ export class CoreLoginSiteHelpPage {
protected translate: TranslateService, protected translate: TranslateService,
protected utils: CoreUtilsProvider) { protected utils: CoreUtilsProvider) {
this.canScanQR = this.utils.canScanQR() && false; // @todo: Enable it for 3.9 release. this.canScanQR = this.utils.canScanQR();
this.urlImageHtml = CoreLoginHelperProvider.FAQ_URL_IMAGE_HTML; this.urlImageHtml = CoreLoginHelperProvider.FAQ_URL_IMAGE_HTML;
this.qrCodeImageHtml = CoreLoginHelperProvider.FAQ_QRCODE_IMAGE_HTML; this.qrCodeImageHtml = CoreLoginHelperProvider.FAQ_QRCODE_IMAGE_HTML;
this.setupLinkHtml = '<a href="https://moodle.com/getstarted/" title="' + this.setupLinkHtml = '<a href="https://moodle.com/getstarted/" title="' +

2
src/core/login/pages/site/site.html
View File

@ -60,7 +60,7 @@
<ng-container *ngIf="!fixedSites && showScanQR && !hasSites && !enteredSiteUrl"> <ng-container *ngIf="!fixedSites && showScanQR && !hasSites && !enteredSiteUrl">
<div class="core-login-site-qrcode-separator">{{ 'core.login.or' | translate }}</div> <div class="core-login-site-qrcode-separator">{{ 'core.login.or' | translate }}</div>
<ion-item> <ion-item>
<a ion-button block color="light" margin-top icon-start (click)="scanQR()"> <a ion-button block color="light" margin-top icon-start (click)="showInstructionsAndScanQR()">
<core-icon name="fa-qrcode" aria-hidden="true"></core-icon> <core-icon name="fa-qrcode" aria-hidden="true"></core-icon>
{{ 'core.scanqr' | translate }} {{ 'core.scanqr' | translate }}
</a> </a>

4
src/core/login/pages/site/site.ts
View File

@ -279,7 +279,7 @@ export class CoreLoginSitePage {
} }
]; ];
// @TODO: Remove CoreSite.MINIMUM_MOODLE_VERSION, not used on translations since 3.8.3. // @TODO: Remove CoreSite.MINIMUM_MOODLE_VERSION, not used on translations since 3.9.0.
this.domUtils.showAlertWithOptions({ this.domUtils.showAlertWithOptions({
title: this.translate.instant('core.cannotconnect', {$a: CoreSite.MINIMUM_MOODLE_VERSION}), title: this.translate.instant('core.cannotconnect', {$a: CoreSite.MINIMUM_MOODLE_VERSION}),
message, message,
@ -383,8 +383,6 @@ export class CoreLoginSitePage {
/** /**
* Show instructions and scan QR code. * Show instructions and scan QR code.
*
* @todo Use it in 3.9 release instead of scanQR.
*/ */
showInstructionsAndScanQR(): void { showInstructionsAndScanQR(): void {
// Show some instructions first. // Show some instructions first.