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

Merge pull request #2420 from crazyserver/MOBILE-3401 

Mobile 3401
main
Juan Leyva 2020-06-22 10:58:29 +02:00 committed by GitHub
parent a1b557d926 27a92adaac
commit e1a889fb97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/courses/components/course-progress/core-courses-course-progress.html
View File

@ -3,7 +3,7 @@
<img *ngIf="course.courseImage" [src]="course.courseImage" core-external-content alt=""/>
</div>
<ion-item tappable text-wrap detail-none (click)="openCourse(course)" [title]="course.displayname || course.fullname" class="core-course-link" [class.item-disabled]="course.visible == 0" [class.core-course-more-than-title]="(course.progress != null && course.progress >= 0)">
<div class="core-course-title" [class.core-course-with-buttons]="courseOptionMenuEnabled || (downloadCourseEnabled && showDownload)">
<div class="core-course-title" [class.core-course-with-buttons]="courseOptionMenuEnabled || (downloadCourseEnabled && showDownload)" [class.core-course-with-spinner]="(downloadCourseEnabled && prefetchCourseData.prefetchCourseIcon == 'spinner') || showSpinner">
<p *ngIf="course.categoryname || (course.displayname && course.shortname && course.fullname != course.displayname)" class="core-course-additional-info">
<span *ngIf="course.categoryname" class="core-course-category"><core-format-text [text]="course.categoryname"></core-format-text></span>
<span *ngIf="course.categoryname && course.displayname && course.shortname && course.fullname != course.displayname" class="core-course-category"> | </span>
@ -30,7 +30,7 @@
<ion-spinner *ngIf="(downloadCourseEnabled && prefetchCourseData.prefetchCourseIcon == 'spinner') || showSpinner"></ion-spinner>
<!-- Downloaded icon. -->
<ion-icon *ngIf="downloadCourseEnabled && prefetchCourseData.downloadSucceeded && !showSpinner" class="core-icon-downloaded" name="cloud-done" color="success" [attr.aria-label]="'core.downloaded' | translate" role="status"></ion-icon>
<ion-icon *ngIf="downloadCourseEnabled && prefetchCourseData.downloadSucceeded && !showSpinner" class="core-icon-downloaded" name="cloud-done" color="success" [attr.aria-label]="'core.downloaded' | translate" role="status"></ion-icon>
<!-- Options menu. -->
<button ion-button icon-only clear color="dark" (click)="showCourseOptionsMenu($event)" *ngIf="!showSpinner" [attr.aria-label]="('core.displayoptions' | translate)">

4
src/core/courses/components/course-progress/course-progress.scss
View File

@ -62,6 +62,10 @@ ion-app.app-root core-courses-course-progress {
&.core-course-with-buttons {
max-width: calc(100% - 50px);
&.core-course-with-spinner {
max-width: calc(100% - 100px);
}
}
}

15
src/core/login/pages/reconnect/reconnect.ts
View File

@ -50,6 +50,8 @@ export class CoreLoginReconnectPage {
protected siteConfig: any;
protected isLoggedOut: boolean;
protected siteId: string;
protected viewLeft = false;
protected eventThrown = false;
constructor(protected navCtrl: NavController,
navParams: NavParams,
@ -121,6 +123,14 @@ export class CoreLoginReconnectPage {
});
}
/**
* View destroyed.
*/
ionViewWillUnload(): void {
this.viewLeft = true;
this.eventsProvider.trigger(CoreEventsProvider.LOGIN_SITE_UNCHECKED, { config: this.siteConfig }, this.siteId);
}
/**
* Get some data (like identity providers) from the site config.
*
@ -131,6 +141,11 @@ export class CoreLoginReconnectPage {
this.identityProviders = this.loginHelper.getValidIdentityProviders(config, disabledFeatures);
this.showForgottenPassword = !this.loginHelper.isForgottenPasswordDisabled(config);
if (!this.eventThrown && !this.viewLeft) {
this.eventThrown = true;
this.eventsProvider.trigger(CoreEventsProvider.LOGIN_SITE_CHECKED, { config: config });
}
}
/**