diff --git a/scripts/create_langindex.sh b/scripts/create_langindex.sh index d0c64ea9e..1988778e4 100755 --- a/scripts/create_langindex.sh +++ b/scripts/create_langindex.sh @@ -219,6 +219,7 @@ function find_better_file { #Parses the file. function parse_file { + findbetter=$2 keys=`jq -r 'keys[]' $1` for key in $keys; do # Check if already parsed. @@ -229,7 +230,7 @@ function parse_file { value=`$exec` if [ -z "$found" ] || [ "$found" == 'null' ]; then guess_file $key "$value" - else + elif [ ! -z "$findbetter" ]; then find_better_file "$key" "$value" "$found" fi done @@ -253,7 +254,8 @@ if [ ! -f 'langindex.json' ]; then echo "{}" > langindex.json fi -parse_file '../src/assets/lang/en.json' +findbetter=$1 +parse_file '../src/assets/lang/en.json' $findbetter echo diff --git a/scripts/langindex.json b/scripts/langindex.json index c0dc480fb..0c05cd558 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -10,6 +10,7 @@ "addon.badges.issuername": "badges", "addon.badges.nobadges": "badges", "addon.badges.recipientdetails": "badges", + "addon.block_myoverview.all": "block_myoverview", "addon.block_myoverview.future": "block_myoverview", "addon.block_myoverview.inprogress": "block_myoverview", "addon.block_myoverview.morecourses": "block_myoverview", diff --git a/src/addon/block/classes/block-component.ts b/src/addon/block/classes/block-component.ts index 11e685922..3a2282d1c 100644 --- a/src/addon/block/classes/block-component.ts +++ b/src/addon/block/classes/block-component.ts @@ -26,7 +26,7 @@ export class AddonBlockComponent implements OnInit { protected domUtils: CoreDomUtilsProvider; protected logger; - constructor(injector: Injector, loggerName: string = 'CoreCourseModuleMainResourceComponent') { + constructor(injector: Injector, loggerName: string = 'AddonBlockComponent') { this.domUtils = injector.get(CoreDomUtilsProvider); const loggerProvider = injector.get(CoreLoggerProvider); this.logger = loggerProvider.getInstance(loggerName); diff --git a/src/addon/block/myoverview/component/addon-block-myoverview.html b/src/addon/block/myoverview/component/addon-block-myoverview.html index 2212cc77a..8a5cf1324 100644 --- a/src/addon/block/myoverview/component/addon-block-myoverview.html +++ b/src/addon/block/myoverview/component/addon-block-myoverview.html @@ -9,6 +9,7 @@
+ {{ 'addon.block_myoverview.all' | translate }}∫ {{ 'addon.block_myoverview.inprogress' | translate }} {{ 'addon.block_myoverview.future' | translate }} {{ 'addon.block_myoverview.past' | translate }} @@ -22,9 +23,11 @@
- - - + + + + + @@ -39,4 +42,4 @@ - \ No newline at end of file + diff --git a/src/addon/block/myoverview/component/myoverview.ts b/src/addon/block/myoverview/component/myoverview.ts index b3db61f7e..21176abce 100644 --- a/src/addon/block/myoverview/component/myoverview.ts +++ b/src/addon/block/myoverview/component/myoverview.ts @@ -36,6 +36,7 @@ export class AddonBlockMyOverviewComponent extends AddonBlockComponent implement courses = { filter: '', + all: [], past: [], inprogress: [], future: [] @@ -44,6 +45,7 @@ export class AddonBlockMyOverviewComponent extends AddonBlockComponent implement downloadAllCoursesEnabled: boolean; filteredCourses: any[]; prefetchCoursesData = { + all: {}, inprogress: {}, past: {}, future: {} @@ -139,6 +141,7 @@ export class AddonBlockMyOverviewComponent extends AddonBlockComponent implement }).then((courses) => { const today = moment().unix(); + this.courses.all = courses; this.courses.past = []; this.courses.inprogress = []; this.courses.future = []; diff --git a/src/addon/block/myoverview/lang/en.json b/src/addon/block/myoverview/lang/en.json index ad5a1b7f7..b18d8b53e 100644 --- a/src/addon/block/myoverview/lang/en.json +++ b/src/addon/block/myoverview/lang/en.json @@ -1,4 +1,5 @@ { + "all": "All", "future": "Future", "inprogress": "In progress", "past": "Past", @@ -6,4 +7,4 @@ "nocoursesfuture": "No future courses", "nocoursesinprogress": "No in progress courses", "nocoursespast": "No past courses" -} \ No newline at end of file +} diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html index 463d9bbdf..dc4b05221 100644 --- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html +++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html @@ -48,7 +48,7 @@ -

+

{{discussion.created | coreDateDayOrTime}} diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json index 3b9112a85..d8dbc7f79 100644 --- a/src/assets/lang/en.json +++ b/src/assets/lang/en.json @@ -10,6 +10,7 @@ "addon.badges.issuername": "Issuer name", "addon.badges.nobadges": "There are no badges available.", "addon.badges.recipientdetails": "Recipient details", + "addon.block_myoverview.all": "All", "addon.block_myoverview.future": "Future", "addon.block_myoverview.inprogress": "In progress", "addon.block_myoverview.morecourses": "More courses", diff --git a/src/components/progress-bar/progress-bar.scss b/src/components/progress-bar/progress-bar.scss index cb1c71cc5..cdab090cc 100644 --- a/src/components/progress-bar/progress-bar.scss +++ b/src/components/progress-bar/progress-bar.scss @@ -1,4 +1,4 @@ -$core-progress-bar-height: 5px !default; +$core-progress-bar-height: 10px !default; ion-app.app-root core-progress-bar { @include padding(null, 55px, null, null); @@ -8,10 +8,10 @@ ion-app.app-root core-progress-bar { .core-progress-text { @include margin(null, null, null, 10px); - line-height: normal; + line-height: 40px; font-size: 1.4rem; color: $gray-darker; - @include position(-6px, 0, null, null); + @include position(-15px, 10px, null, null); position: absolute; } @@ -26,15 +26,16 @@ ion-app.app-root core-progress-bar { .progress-bar-fallback, &[value]::-webkit-progress-bar { - background-color: $gray-light; - border-radius: 2px; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1) inset; + background-color: $gray-lighter; + border-radius: 999px; + border: 1px solid $gray-light; + box-shadow: none; } .progress-bar-fallback span, &[value]::-webkit-progress-value { background-color: $core-progressbar-color; - border-radius: 2px; + border-radius: 999px; } .progress-bar-fallback { diff --git a/src/components/send-message-form/send-message-form.scss b/src/components/send-message-form/send-message-form.scss index 784480f65..ea9f7c367 100644 --- a/src/components/send-message-form/send-message-form.scss +++ b/src/components/send-message-form/send-message-form.scss @@ -17,6 +17,7 @@ ion-app.app-root core-send-message-form { @include appearance(none); display: block; width: 100%; + min-height: 28px; border: 0; font-family: inherit; align-self: self-start; diff --git a/src/core/courses/components/course-progress/core-courses-course-progress.html b/src/core/courses/components/course-progress/core-courses-course-progress.html index e9cca5e8a..ca7d88f2a 100644 --- a/src/core/courses/components/course-progress/core-courses-course-progress.html +++ b/src/core/courses/components/course-progress/core-courses-course-progress.html @@ -1,5 +1,5 @@ - -

+ +
diff --git a/src/core/courses/components/course-progress/course-progress.scss b/src/core/courses/components/course-progress/course-progress.scss index 241553bd5..259eac524 100644 --- a/src/core/courses/components/course-progress/course-progress.scss +++ b/src/core/courses/components/course-progress/course-progress.scss @@ -3,6 +3,19 @@ ion-app.app-root core-courses-course-progress { display: flex; flex-direction: column; + @for $i from 0 to length($core-course-image-background) { + &[course-color="#{$i}"] { + .core-course-thumb { + background: nth($core-course-image-background, $i + 1); + } + + progress .progress-bar-fallback span, + progress[value]::-webkit-progress-value { + background-color: nth($core-course-image-background, $i + 1); + } + } + } + .core-course-thumb { height: 150px; width: 100%; @@ -11,12 +24,6 @@ ion-app.app-root core-courses-course-progress { pointer-events: auto; position: relative; - @for $i from 0 to length($core-course-image-background) { - &.core-course-color-#{$i} { - background: nth($core-course-image-background, $i + 1); - } - } - &.core-course-color-img { background: white; } diff --git a/src/core/courses/pages/dashboard/dashboard.html b/src/core/courses/pages/dashboard/dashboard.html index c152e5b29..5e24c1474 100644 --- a/src/core/courses/pages/dashboard/dashboard.html +++ b/src/core/courses/pages/dashboard/dashboard.html @@ -12,7 +12,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/src/core/courses/pages/dashboard/dashboard.ts b/src/core/courses/pages/dashboard/dashboard.ts index 2bffccbb2..e02bb632c 100644 --- a/src/core/courses/pages/dashboard/dashboard.ts +++ b/src/core/courses/pages/dashboard/dashboard.ts @@ -43,7 +43,6 @@ export class CoreCoursesDashboardPage implements OnDestroy { timelineEnabled = false; coursesEnabled = false; tabsReady = false; - tabShown = 'courses'; searchEnabled: boolean; tabs = []; siteName: string; @@ -111,15 +110,6 @@ export class CoreCoursesDashboardPage implements OnDestroy { this.tabsComponent && this.tabsComponent.ionViewDidLeave(); } - /** - * The tab has changed. - * - * @param {string} tab Name of the new tab. - */ - tabChanged(tab: string): void { - this.tabShown = tab; - } - /** * Go to search courses. */ diff --git a/src/theme/variables.scss b/src/theme/variables.scss index b83a4e539..44d572b52 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -18,7 +18,7 @@ $black: #3a3a3a; // Headings, standard text. $gray-darker: #626262; // Text (emphasis-detail), placeholder, background. $gray-dark: #9e9e9e; // Borders (never text). $gray: #dddddd; -$gray-light: #eeeeee; // Background. +$gray-light: #e9e9e9; // Background. $gray-lighter: #f5f5f5; $white: #ffffff; // Background, reversed text.