Merge pull request #1368 from crazyserver/MOBILE-2430

Mobile 2430
main
Juan Leyva 2018-06-22 11:58:56 +02:00 committed by GitHub
commit 1d204c4c80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 25 additions and 4 deletions

View File

@ -3,6 +3,7 @@
"completecourse": "Complete course",
"completed": "Completed",
"completiondate": "Completion date",
"completionmenuitem": "Completion",
"couldnotloadreport": "Could not load the course completion report. Please try again later.",
"coursecompletion": "Course completion",
"criteria": "Criteria",

View File

@ -69,7 +69,7 @@ export class AddonCourseCompletionCourseOptionHandler implements CoreCourseOptio
*/
getDisplayData?(injector: Injector, courseId: number): CoreCourseOptionsHandlerData {
return {
title: 'addon.coursecompletion.coursecompletion',
title: 'addon.coursecompletion.completionmenuitem',
class: 'addon-coursecompletion-course-handler',
component: AddonCourseCompletionReportComponent,
};

View File

@ -72,7 +72,7 @@
<ion-icon item-start name="warning" color="warning"></ion-icon> {{ 'addon.mod_choice.resultsnotsynced' | translate }}
</ion-item>
<ion-item>
<canvas core-chart type="pie" [data]="data" [labels]="labels"></canvas>
<canvas core-chart type="pie" [data]="data" [labels]="labels" height="300"></canvas>
</ion-item>
</ion-col>
<ion-col *ngIf="choice.publish && results" col-12 col-lg-8>

View File

@ -16,7 +16,7 @@
<!-- Content. -->
<core-split-view>
<ion-content>
<ion-content [class.has-fab]="canAdd">
<ion-refresher [enabled]="loaded" (ionRefresh)="doRefresh($event)">
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher>
@ -60,5 +60,11 @@
<ion-infinite-scroll-content></ion-infinite-scroll-content>
</ion-infinite-scroll>
</core-loading>
<ion-fab bottom right *ngIf="canAdd">
<button ion-fab (click)="openNewEntry()" [attr.aria-label]="'addon.mod_glossary.addentry' | translate">
<ion-icon name="add"></ion-icon>
</button>
</ion-fab>
</ion-content>
</core-split-view>

View File

@ -72,3 +72,9 @@
</core-tabs>
</core-loading>
<ion-fab bottom right *ngIf="canEdit">
<button ion-fab (click)="goToNewPage()" [attr.aria-label]="'addon.mod_wiki.createpage' | translate">
<ion-icon name="add"></ion-icon>
</button>
</ion-fab>

View File

@ -41,6 +41,7 @@
height: calc(100% - #{($navbar-ios-height)});
}
.platform-cordova.ios .core-avoid-header ion-content.statusbar-padding,
.platform-cordova.ios .core-avoid-header .menu-inner > ion-content {
top: $navbar-ios-height + $cordova-ios-statusbar-padding;
height: calc(100% - #{($navbar-ios-height + $cordova-ios-statusbar-padding)});

View File

@ -815,3 +815,7 @@ ion-alert.core-inapp-notification {
font-size: 16px;
}
}
body.keyboard-is-open core-ion-tabs .tabbar {
display: none;
}

View File

@ -155,7 +155,6 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
*/
protected maximizeEditorSize(): Promise<number> {
this.content.resize();
const contentVisibleHeight = this.content.contentHeight;
const deferred = this.utils.promiseDefer();

View File

@ -17,6 +17,7 @@
color: $core-top-tabs-color !important;
font-size: 1.6rem;
border: 0;
padding: 0 !important;
span {
text-overflow: ellipsis;
@ -24,6 +25,7 @@
overflow: hidden;
word-wrap: break-word;
display: block;
width: 100%;
}
&[aria-selected=true] {

View File

@ -77,6 +77,7 @@ export class CoreAppProvider {
this.keyboard.onKeyboardShow().subscribe((data) => {
// Execute the callback in the Angular zone, so change detection doesn't stop working.
zone.run(() => {
document.body.classList.add('keyboard-is-open');
this.isKeyboardShown = true;
events.trigger(CoreEventsProvider.KEYBOARD_CHANGE, this.isKeyboardShown);
});
@ -84,6 +85,7 @@ export class CoreAppProvider {
this.keyboard.onKeyboardHide().subscribe((data) => {
// Execute the callback in the Angular zone, so change detection doesn't stop working.
zone.run(() => {
document.body.classList.remove('keyboard-is-open');
this.isKeyboardShown = false;
events.trigger(CoreEventsProvider.KEYBOARD_CHANGE, this.isKeyboardShown);
});