diff --git a/src/addon/coursecompletion/lang/en.json b/src/addon/coursecompletion/lang/en.json index 69547f49a..1dd76f339 100644 --- a/src/addon/coursecompletion/lang/en.json +++ b/src/addon/coursecompletion/lang/en.json @@ -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", diff --git a/src/addon/coursecompletion/providers/course-option-handler.ts b/src/addon/coursecompletion/providers/course-option-handler.ts index 52e2ed2cd..0c61157fa 100644 --- a/src/addon/coursecompletion/providers/course-option-handler.ts +++ b/src/addon/coursecompletion/providers/course-option-handler.ts @@ -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, }; diff --git a/src/addon/mod/choice/components/index/addon-mod-choice-index.html b/src/addon/mod/choice/components/index/addon-mod-choice-index.html index b89c63214..dda24a3bf 100644 --- a/src/addon/mod/choice/components/index/addon-mod-choice-index.html +++ b/src/addon/mod/choice/components/index/addon-mod-choice-index.html @@ -72,7 +72,7 @@ {{ 'addon.mod_choice.resultsnotsynced' | translate }} - + diff --git a/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html index 3778a757a..6f34f15c7 100644 --- a/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html +++ b/src/addon/mod/glossary/components/index/addon-mod-glossary-index.html @@ -16,7 +16,7 @@ - + @@ -60,5 +60,11 @@ + + + + diff --git a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html index 532649f9a..2747bb87e 100644 --- a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html +++ b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html @@ -72,3 +72,9 @@ + + + + diff --git a/src/app/app.ios.scss b/src/app/app.ios.scss index 084c5f5e1..2c8c9ef57 100644 --- a/src/app/app.ios.scss +++ b/src/app/app.ios.scss @@ -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)}); diff --git a/src/app/app.scss b/src/app/app.scss index dadf2360d..b75aebfeb 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -815,3 +815,7 @@ ion-alert.core-inapp-notification { font-size: 16px; } } + +body.keyboard-is-open core-ion-tabs .tabbar { + display: none; +} \ No newline at end of file diff --git a/src/components/rich-text-editor/rich-text-editor.ts b/src/components/rich-text-editor/rich-text-editor.ts index fe2aaef96..d1695d05e 100644 --- a/src/components/rich-text-editor/rich-text-editor.ts +++ b/src/components/rich-text-editor/rich-text-editor.ts @@ -155,7 +155,6 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy */ protected maximizeEditorSize(): Promise { this.content.resize(); - const contentVisibleHeight = this.content.contentHeight; const deferred = this.utils.promiseDefer(); diff --git a/src/components/tabs/tabs.scss b/src/components/tabs/tabs.scss index 20b4e97dc..69ca79458 100644 --- a/src/components/tabs/tabs.scss +++ b/src/components/tabs/tabs.scss @@ -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] { diff --git a/src/providers/app.ts b/src/providers/app.ts index bac647c0a..cb449cbb6 100644 --- a/src/providers/app.ts +++ b/src/providers/app.ts @@ -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); });