Merge pull request #1382 from albertgasset/MOBILE-2454

MOBILE-2454 courses: Title of my overview page set to site name
main
Juan Leyva 2018-07-04 10:33:55 +02:00 committed by GitHub
commit 98101f3194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions

View File

@ -1,6 +1,6 @@
<ion-header> <ion-header>
<ion-navbar> <ion-navbar>
<ion-title>{{ 'core.courses.courseoverview' | translate }}</ion-title> <ion-title><core-format-text [text]="siteName"></core-format-text></ion-title>
<ion-buttons end> <ion-buttons end>
<button *ngIf="tabShown == 'courses' && courses[courses.selected] && courses[courses.selected].length > 5" ion-button icon-only [attr.aria-label]="'core.courses.filtermycourses' | translate" (click)="switchFilter()"> <button *ngIf="tabShown == 'courses' && courses[courses.selected] && courses[courses.selected].length > 5" ion-button icon-only [attr.aria-label]="'core.courses.filtermycourses' | translate" (click)="switchFilter()">

View File

@ -17,6 +17,7 @@ import { IonicPageModule } from 'ionic-angular';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { CoreCoursesMyOverviewPage } from './my-overview'; import { CoreCoursesMyOverviewPage } from './my-overview';
import { CoreComponentsModule } from '@components/components.module'; import { CoreComponentsModule } from '@components/components.module';
import { CoreDirectivesModule } from '@directives/directives.module';
import { CoreCoursesComponentsModule } from '../../components/components.module'; import { CoreCoursesComponentsModule } from '../../components/components.module';
import { CoreSiteHomeComponentsModule } from '@core/sitehome/components/components.module'; import { CoreSiteHomeComponentsModule } from '@core/sitehome/components/components.module';
@ -26,6 +27,7 @@ import { CoreSiteHomeComponentsModule } from '@core/sitehome/components/componen
], ],
imports: [ imports: [
CoreComponentsModule, CoreComponentsModule,
CoreDirectivesModule,
CoreCoursesComponentsModule, CoreCoursesComponentsModule,
CoreSiteHomeComponentsModule, CoreSiteHomeComponentsModule,
IonicPageModule.forChild(CoreCoursesMyOverviewPage), IonicPageModule.forChild(CoreCoursesMyOverviewPage),

View File

@ -71,6 +71,7 @@ export class CoreCoursesMyOverviewPage implements OnDestroy {
future: {} future: {}
}; };
downloadAllCoursesEnabled: boolean; downloadAllCoursesEnabled: boolean;
siteName: string;
protected prefetchIconsInitialized = false; protected prefetchIconsInitialized = false;
protected isDestroyed; protected isDestroyed;
@ -82,6 +83,7 @@ export class CoreCoursesMyOverviewPage implements OnDestroy {
private courseHelper: CoreCourseHelperProvider, private sitesProvider: CoreSitesProvider, private courseHelper: CoreCourseHelperProvider, private sitesProvider: CoreSitesProvider,
private siteHomeProvider: CoreSiteHomeProvider, private courseOptionsDelegate: CoreCourseOptionsDelegate, private siteHomeProvider: CoreSiteHomeProvider, private courseOptionsDelegate: CoreCourseOptionsDelegate,
private eventsProvider: CoreEventsProvider, private utils: CoreUtilsProvider) { private eventsProvider: CoreEventsProvider, private utils: CoreUtilsProvider) {
this.loadSiteName();
} }
/** /**
@ -102,6 +104,8 @@ export class CoreCoursesMyOverviewPage implements OnDestroy {
// Download all courses is enabled now, initialize it. // Download all courses is enabled now, initialize it.
this.initPrefetchCoursesIcons(); this.initPrefetchCoursesIcons();
} }
this.loadSiteName();
}); });
// Decide which tab to load first. // Decide which tab to load first.
@ -474,6 +478,13 @@ export class CoreCoursesMyOverviewPage implements OnDestroy {
}); });
} }
/**
* Load the site name.
*/
protected loadSiteName(): void {
this.siteName = this.sitesProvider.getCurrentSite().getInfo().sitename;
}
/** /**
* Component being destroyed. * Component being destroyed.
*/ */