MOBILE-2488 sitehome: Fix content displayed under tab bar
parent
5f614a5677
commit
b6c38b4006
|
@ -17,7 +17,12 @@
|
||||||
<!-- Site home tab. -->
|
<!-- Site home tab. -->
|
||||||
<core-tab [show]="siteHomeEnabled" [title]="'core.sitehome.sitehome' | translate" (ionSelect)="tabChanged('sitehome')">
|
<core-tab [show]="siteHomeEnabled" [title]="'core.sitehome.sitehome' | translate" (ionSelect)="tabChanged('sitehome')">
|
||||||
<ng-template>
|
<ng-template>
|
||||||
|
<ion-content>
|
||||||
|
<ion-refresher [enabled]="siteHomeComponent && siteHomeComponent.dataLoaded" (ionRefresh)="siteHomeComponent.doRefresh($event)">
|
||||||
|
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
|
||||||
|
</ion-refresher>
|
||||||
<core-sitehome-index></core-sitehome-index>
|
<core-sitehome-index></core-sitehome-index>
|
||||||
|
</ion-content>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</core-tab>
|
</core-tab>
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@ import { CoreCourseOptionsDelegate } from '@core/course/providers/options-delega
|
||||||
import { CoreSiteHomeProvider } from '@core/sitehome/providers/sitehome';
|
import { CoreSiteHomeProvider } from '@core/sitehome/providers/sitehome';
|
||||||
import * as moment from 'moment';
|
import * as moment from 'moment';
|
||||||
import { CoreTabsComponent } from '@components/tabs/tabs';
|
import { CoreTabsComponent } from '@components/tabs/tabs';
|
||||||
|
import { CoreSiteHomeIndexComponent } from '@core/sitehome/components/index/index';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Page that displays My Overview.
|
* Page that displays My Overview.
|
||||||
|
@ -37,6 +38,7 @@ import { CoreTabsComponent } from '@components/tabs/tabs';
|
||||||
export class CoreCoursesMyOverviewPage implements OnDestroy {
|
export class CoreCoursesMyOverviewPage implements OnDestroy {
|
||||||
@ViewChild(CoreTabsComponent) tabsComponent: CoreTabsComponent;
|
@ViewChild(CoreTabsComponent) tabsComponent: CoreTabsComponent;
|
||||||
@ViewChild('searchbar') searchbar: Searchbar;
|
@ViewChild('searchbar') searchbar: Searchbar;
|
||||||
|
@ViewChild(CoreSiteHomeIndexComponent) siteHomeComponent: CoreSiteHomeIndexComponent;
|
||||||
|
|
||||||
firstSelectedTab: number;
|
firstSelectedTab: number;
|
||||||
siteHomeEnabled: boolean;
|
siteHomeEnabled: boolean;
|
||||||
|
|
|
@ -1,8 +1,3 @@
|
||||||
<ion-content>
|
|
||||||
<ion-refresher [enabled]="dataLoaded" (ionRefresh)="doRefresh($event)">
|
|
||||||
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
|
|
||||||
</ion-refresher>
|
|
||||||
|
|
||||||
<core-loading [hideUntil]="dataLoaded">
|
<core-loading [hideUntil]="dataLoaded">
|
||||||
|
|
||||||
<ion-list>
|
<ion-list>
|
||||||
|
@ -40,4 +35,3 @@
|
||||||
|
|
||||||
<core-empty-box *ngIf="!hasContent" icon="qr-scanner" [message]="'core.course.nocontentavailable' | translate"></core-empty-box>
|
<core-empty-box *ngIf="!hasContent" icon="qr-scanner" [message]="'core.course.nocontentavailable' | translate"></core-empty-box>
|
||||||
</core-loading>
|
</core-loading>
|
||||||
</ion-content>
|
|
||||||
|
|
|
@ -3,4 +3,9 @@
|
||||||
<ion-title>{{ 'core.sitehome.sitehome' | translate }}</ion-title>
|
<ion-title>{{ 'core.sitehome.sitehome' | translate }}</ion-title>
|
||||||
</ion-navbar>
|
</ion-navbar>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
|
<ion-content>
|
||||||
|
<ion-refresher [enabled]="siteHomeComponent && siteHomeComponent.dataLoaded" (ionRefresh)="siteHomeComponent.doRefresh($event)">
|
||||||
|
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
|
||||||
|
</ion-refresher>
|
||||||
<core-sitehome-index></core-sitehome-index>
|
<core-sitehome-index></core-sitehome-index>
|
||||||
|
</ion-content>
|
|
@ -1,5 +0,0 @@
|
||||||
page-core-sitehome-index {
|
|
||||||
ion-header {
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -12,10 +12,11 @@
|
||||||
// See the License for the specific language governing permissions and
|
// See the License for the specific language governing permissions and
|
||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
import { Component } from '@angular/core';
|
import { Component, ViewChild } from '@angular/core';
|
||||||
import { IonicPage, NavParams, NavController } from 'ionic-angular';
|
import { IonicPage, NavParams, NavController } from 'ionic-angular';
|
||||||
import { CoreSitesProvider } from '@providers/sites';
|
import { CoreSitesProvider } from '@providers/sites';
|
||||||
import { CoreCourseHelperProvider } from '@core/course/providers/helper';
|
import { CoreCourseHelperProvider } from '@core/course/providers/helper';
|
||||||
|
import { CoreSiteHomeIndexComponent } from '../../components/index/index';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Page that displays site home index.
|
* Page that displays site home index.
|
||||||
|
@ -26,6 +27,7 @@ import { CoreCourseHelperProvider } from '@core/course/providers/helper';
|
||||||
templateUrl: 'index.html',
|
templateUrl: 'index.html',
|
||||||
})
|
})
|
||||||
export class CoreSiteHomeIndexPage {
|
export class CoreSiteHomeIndexPage {
|
||||||
|
@ViewChild(CoreSiteHomeIndexComponent) siteHomeComponent: CoreSiteHomeIndexComponent;
|
||||||
|
|
||||||
constructor(navParams: NavParams, navCtrl: NavController, courseHelper: CoreCourseHelperProvider,
|
constructor(navParams: NavParams, navCtrl: NavController, courseHelper: CoreCourseHelperProvider,
|
||||||
sitesProvider: CoreSitesProvider) {
|
sitesProvider: CoreSitesProvider) {
|
||||||
|
|
Loading…
Reference in New Issue