diff --git a/src/addon/mod/quiz/pages/player/player.html b/src/addon/mod/quiz/pages/player/player.html index d3d07b9be..253ea995b 100644 --- a/src/addon/mod/quiz/pages/player/player.html +++ b/src/addon/mod/quiz/pages/player/player.html @@ -67,7 +67,7 @@ - diff --git a/src/app/app.scss b/src/app/app.scss index 6f2aa9226..ebe16db2b 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -416,7 +416,7 @@ ion-col ion-select { } -:not(.item) ion-select, +:not(.item) > * > * > ion-select, .core-button-select { background-color: white; color: $core-color; @@ -447,7 +447,7 @@ ion-col ion-select { } .button-inner { - justify-content: space-between; + justify-content: start; } .select-icon .select-icon-inner { @@ -456,6 +456,8 @@ ion-col ion-select { ion-icon:last-child { @include margin(null, null, null, 5px); + text-align: right; + flex-grow: 2; } } diff --git a/src/components/tabs/core-tabs.html b/src/components/tabs/core-tabs.html index 4045a3264..4958a47b6 100644 --- a/src/components/tabs/core-tabs.html +++ b/src/components/tabs/core-tabs.html @@ -2,7 +2,7 @@
- + @@ -18,7 +18,7 @@ - +
diff --git a/src/core/course/components/format/core-course-format.html b/src/core/course/components/format/core-course-format.html index 304ae4ce1..56eedc8d8 100644 --- a/src/core/course/components/format/core-course-format.html +++ b/src/core/course/components/format/core-course-format.html @@ -13,7 +13,7 @@
- + @@ -22,8 +22,9 @@ -
- @@ -49,6 +50,17 @@
+ + + + + diff --git a/src/core/course/components/format/format.scss b/src/core/course/components/format/format.scss index fd34053d6..5596893e1 100644 --- a/src/core/course/components/format/format.scss +++ b/src/core/course/components/format/format.scss @@ -55,4 +55,13 @@ core-course-format { line-height: 44px; } } + + .core-course-section-nav-buttons { + .button-inner core-format-text { + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + text-transform: none; + } + } } diff --git a/src/core/course/components/format/format.ts b/src/core/course/components/format/format.ts index 97e10bf48..c378fe847 100644 --- a/src/core/course/components/format/format.ts +++ b/src/core/course/components/format/format.ts @@ -63,6 +63,8 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy { displaySectionSelector: boolean; selectedSection: any; + previousSection: any; + nextSection: any; allSectionsId: number = CoreCourseProvider.ALL_SECTIONS_ID; selectOptions: any = {}; loaded: boolean; @@ -248,6 +250,26 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy { this.selectedSection = newSection; this.data.section = this.selectedSection; + // Select next and previous sections to show the arrows. + const i = this.sections.findIndex((value, index) => { + return this.compareSections(value, this.selectedSection); + }); + + let j; + for (j = i - 1; j >= 1; j--) { + if (!(this.sections[j].visible === 0 || this.sections[j].uservisible === false) && this.sections[j].hasContent) { + break; + } + } + this.previousSection = j >= 1 ? this.sections[j] : null; + + for (j = i + 1; j < this.sections.length; j++) { + if (!(this.sections[j].visible === 0 || this.sections[j].uservisible === false) && this.sections[j].hasContent) { + break; + } + } + this.nextSection = j < this.sections.length ? this.sections[j] : null; + if (this.moduleId && typeof previousValue == 'undefined') { setTimeout(() => { this.domUtils.scrollToElementBySelector(this.content, '#core-course-module-' + this.moduleId); diff --git a/src/core/course/pages/section-selector/section-selector.html b/src/core/course/pages/section-selector/section-selector.html index 3b1fec899..dcdd72a9c 100644 --- a/src/core/course/pages/section-selector/section-selector.html +++ b/src/core/course/pages/section-selector/section-selector.html @@ -11,6 +11,7 @@ +

{{ 'core.course.nocontentavailable' | translate }} diff --git a/src/core/login/pages/credentials/credentials.html b/src/core/login/pages/credentials/credentials.html index 9f6af1247..e7160fbc8 100644 --- a/src/core/login/pages/credentials/credentials.html +++ b/src/core/login/pages/credentials/credentials.html @@ -6,7 +6,7 @@
-
+
diff --git a/src/core/login/pages/reconnect/reconnect.html b/src/core/login/pages/reconnect/reconnect.html index e96b9846d..ca9d980b1 100644 --- a/src/core/login/pages/reconnect/reconnect.html +++ b/src/core/login/pages/reconnect/reconnect.html @@ -5,7 +5,7 @@
-
+
{{ 'core.pictureof' | translate:{$a: site.fullname} }}