diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts index ae1dab47b..94d36121b 100644 --- a/src/addon/mod/forum/pages/discussion/discussion.ts +++ b/src/addon/mod/forum/pages/discussion/discussion.ts @@ -68,6 +68,7 @@ export class AddonModForumDiscussionPage implements OnDestroy { }; refreshIcon = 'spinner'; syncIcon = 'spinner'; + discussionStr = ''; protected cmId: number; protected forumId: number; @@ -101,6 +102,8 @@ export class AddonModForumDiscussionPage implements OnDestroy { this.isOnline = this.appProvider.isOnline(); }); this.isSplitViewOn = this.svComponent && this.svComponent.isOn(); + + this.discussionStr = translate.instant('addon.mod_forum.discussion'); } /** diff --git a/src/addon/mod/lesson/pages/player/player.html b/src/addon/mod/lesson/pages/player/player.html index 34def2500..627b7757e 100644 --- a/src/addon/mod/lesson/pages/player/player.html +++ b/src/addon/mod/lesson/pages/player/player.html @@ -107,7 +107,7 @@ - + @@ -117,7 +117,7 @@ - {{ button.content }} + {{ button.content }} @@ -174,7 +174,7 @@ - + @@ -184,7 +184,7 @@ - + diff --git a/src/addon/mod/lesson/pages/player/player.scss b/src/addon/mod/lesson/pages/player/player.scss index 8a887b623..540e14ac8 100644 --- a/src/addon/mod/lesson/pages/player/player.scss +++ b/src/addon/mod/lesson/pages/player/player.scss @@ -12,10 +12,12 @@ page-addon-mod-lesson-player { .addon-mod_lesson-pagebuttons .button-block { contain: content; - height: auto; + height: 100%; + display: flex; + flex-direction: column; .button-inner { - height: auto; + flex-grow: 1; } } } diff --git a/src/app/app.scss b/src/app/app.scss index 63c59cae4..ae83c0189 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -39,6 +39,10 @@ .core-big { font-size: 115%; } .invisible { visibility: hidden; } +.button-no-uppercase { + text-transform: none; +} + @include media-breakpoint-up(sm) { .core-center-view .scroll-content { display: flex!important; diff --git a/src/components/loading/loading.scss b/src/components/loading/loading.scss index 503eca75b..3b05c5fdf 100644 --- a/src/components/loading/loading.scss +++ b/src/components/loading/loading.scss @@ -9,7 +9,7 @@ core-loading { } .core-loading-content { - display: unset; + display: inline; padding-bottom: 1px; /* This makes height be real */ } @@ -21,7 +21,7 @@ core-loading { .scroll-content > core-loading, ion-content > .scroll-content > core-loading, .core-loading-center { - position: unset !important; + position: static !important; } .scroll-content > core-loading, diff --git a/src/components/tabs/tabs.scss b/src/components/tabs/tabs.scss index b7e7618b1..20b4e97dc 100644 --- a/src/components/tabs/tabs.scss +++ b/src/components/tabs/tabs.scss @@ -18,6 +18,14 @@ font-size: 1.6rem; border: 0; + span { + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + word-wrap: break-word; + display: block; + } + &[aria-selected=true] { color: $core-top-tabs-color-active !important; border: 0 !important; diff --git a/src/core/course/components/format/core-course-format.html b/src/core/course/components/format/core-course-format.html index b90c2e218..c3dc312e4 100644 --- a/src/core/course/components/format/core-course-format.html +++ b/src/core/course/components/format/core-course-format.html @@ -16,7 +16,7 @@
- diff --git a/src/core/courses/pages/my-courses/my-courses.html b/src/core/courses/pages/my-courses/my-courses.html index 25d1308d0..9c01fb0f3 100644 --- a/src/core/courses/pages/my-courses/my-courses.html +++ b/src/core/courses/pages/my-courses/my-courses.html @@ -19,7 +19,7 @@ - + diff --git a/src/core/courses/pages/my-courses/my-courses.ts b/src/core/courses/pages/my-courses/my-courses.ts index 1508d2831..cd14a0d56 100644 --- a/src/core/courses/pages/my-courses/my-courses.ts +++ b/src/core/courses/pages/my-courses/my-courses.ts @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, OnDestroy } from '@angular/core'; -import { IonicPage, NavController } from 'ionic-angular'; +import { Component, OnDestroy, ViewChild } from '@angular/core'; +import { IonicPage, Searchbar, NavController } from 'ionic-angular'; import { CoreEventsProvider } from '@providers/events'; import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; @@ -31,6 +31,8 @@ import { CoreCourseOptionsDelegate } from '@core/course/providers/options-delega templateUrl: 'my-courses.html', }) export class CoreCoursesMyCoursesPage implements OnDestroy { + @ViewChild('searchbar') searchbar: Searchbar; + courses: any[]; filteredCourses: any[]; searchEnabled: boolean; @@ -153,6 +155,11 @@ export class CoreCoursesMyCoursesPage implements OnDestroy { this.filter = ''; this.showFilter = !this.showFilter; this.filteredCourses = this.courses; + if (this.showFilter) { + setTimeout(() => { + this.searchbar.setFocus(); + }); + } } /** diff --git a/src/core/courses/pages/my-overview/my-overview.html b/src/core/courses/pages/my-overview/my-overview.html index e34364830..c52f77707 100644 --- a/src/core/courses/pages/my-overview/my-overview.html +++ b/src/core/courses/pages/my-overview/my-overview.html @@ -80,7 +80,7 @@
- +
diff --git a/src/core/courses/pages/my-overview/my-overview.ts b/src/core/courses/pages/my-overview/my-overview.ts index fbc38ec9d..fd67329cd 100644 --- a/src/core/courses/pages/my-overview/my-overview.ts +++ b/src/core/courses/pages/my-overview/my-overview.ts @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, OnDestroy } from '@angular/core'; -import { IonicPage, NavController } from 'ionic-angular'; +import { Component, OnDestroy, ViewChild } from '@angular/core'; +import { IonicPage, Searchbar, NavController } from 'ionic-angular'; import { CoreEventsProvider } from '@providers/events'; import { CoreSitesProvider } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; @@ -34,6 +34,8 @@ import * as moment from 'moment'; templateUrl: 'my-overview.html', }) export class CoreCoursesMyOverviewPage implements OnDestroy { + @ViewChild('searchbar') searchbar: Searchbar; + firstSelectedTab: number; siteHomeEnabled: boolean; tabsReady = false; @@ -245,6 +247,11 @@ export class CoreCoursesMyOverviewPage implements OnDestroy { this.showFilter = !this.showFilter; this.courses.filter = ''; this.filteredCourses = this.courses[this.courses.selected]; + if (this.showFilter) { + setTimeout(() => { + this.searchbar.setFocus(); + }); + } } /**