diff --git a/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html index 61c013a05..931cd164b 100644 --- a/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html +++ b/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html @@ -226,12 +226,20 @@ -

- {{lastAttempt.submissiongroupname}} - {{ 'addon.mod_assign.noteam' | translate }} - {{ 'addon.mod_assign.multipleteams' | translate }} - {{ 'addon.mod_assign.defaultteam' | translate }} -

+ +

{{lastAttempt.submissiongroupname}}

+ +

{{ 'addon.mod_assign.noteam' | translate }}

+

{{ 'addon.mod_assign.noteam_desc' | translate }}

+
+ +

{{ 'addon.mod_assign.multipleteams' | translate }}

+

{{ 'addon.mod_assign.multipleteams_desc' | translate }}

+
+

+ {{ 'addon.mod_assign.defaultteam' | translate }} +

+
{{ statusTranslated }} diff --git a/src/addon/mod/assign/lang/en.json b/src/addon/mod/assign/lang/en.json index e04437755..35876b24c 100644 --- a/src/addon/mod/assign/lang/en.json +++ b/src/addon/mod/assign/lang/en.json @@ -51,12 +51,14 @@ "markingworkflowstatereadyforrelease": "Ready for release", "markingworkflowstatereleased": "Released", "multipleteams": "Member of more than one group", + "multipleteams_desc": "The assignment requires submission in groups. You are a member of more than one group. To be able to submit you must be a member of only one group. Please contact your teacher to change your group membership.", "noattempt": "No attempt", "nomoresubmissionsaccepted": "Only allowed for participants who have been granted an extension", "noonlinesubmissions": "This assignment does not require you to submit anything online", "nosubmission": "Nothing has been submitted for this assignment", "notallparticipantsareshown": "Participants who have not made a submission are not shown.", "noteam": "Not a member of any group", + "noteam_desc": "This assignment requires submission in groups. You are not a member of any group, so you cannot create a submission. Please contact your teacher to be added to a group.", "notgraded": "Not graded", "numberofdraftsubmissions": "Drafts", "numberofparticipants": "Participants", diff --git a/src/app/app.scss b/src/app/app.scss index 4ef93f97c..ca3ddbcc6 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -941,6 +941,15 @@ ion-app.app-root { } } +@each $color-name, $color-base, $color-contrast in get-colors($colors) { + // If there is text with a color it should use this color + // and override whatever item sets it to + .text-#{$color-name} { + color: $color-contrast; + } +} + + [dir="ltr"] body, [dir="rtl"] body { padding-top: constant(safe-area-inset-top); //for iOS 11.2 padding-top: env(safe-area-inset-top); //for iOS 11.1 diff --git a/src/core/courses/pages/course-preview/course-preview.html b/src/core/courses/pages/course-preview/course-preview.html index 75a6f7077..cf62ca683 100644 --- a/src/core/courses/pages/course-preview/course-preview.html +++ b/src/core/courses/pages/course-preview/course-preview.html @@ -58,6 +58,10 @@

{{ 'core.course.contents' | translate }}

+ + +

{{ 'core.openinbrowser' | translate }}

+
diff --git a/src/core/courses/pages/course-preview/course-preview.ts b/src/core/courses/pages/course-preview/course-preview.ts index 3d672fb12..703894eaa 100644 --- a/src/core/courses/pages/course-preview/course-preview.ts +++ b/src/core/courses/pages/course-preview/course-preview.ts @@ -48,6 +48,7 @@ export class CoreCoursesCoursePreviewPage implements OnDestroy { title: 'core.course.downloadcourse' }; downloadCourseEnabled: boolean; + courseUrl: string; protected guestWSAvailable: boolean; protected isGuestEnabled = false; @@ -55,7 +56,6 @@ export class CoreCoursesCoursePreviewPage implements OnDestroy { protected enrollmentMethods: any[]; protected waitStart = 0; protected enrolUrl: string; - protected courseUrl: string; protected paypalReturnUrl: string; protected isMobile: boolean; protected isDesktop: boolean;