EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1523 from crazyserver/MOBILE-2058 

Mobile 2058
main
Juan Leyva 2018-09-20 16:38:34 +02:00 committed by GitHub
parent ebc2d24f84 e3f20a8ccf
commit 63c1ff79d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/addon/mod/assign/components/submission/addon-mod-assign-submission.html
View File

@ -226,12 +226,20 @@
<!-- Template to render some data regarding the submission status. -->
<ng-template #submissionStatus>
<p *ngIf="assign && assign.teamsubmission && lastAttempt">
<span *ngIf="lastAttempt.submissiongroup && lastAttempt.submissiongroupname">{{lastAttempt.submissiongroupname}}</span>
<span *ngIf="assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup && !lastAttempt.usergroups">{{ 'addon.mod_assign.noteam' | translate }}</span>
<span *ngIf="assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup && lastAttempt.usergroups">{{ 'addon.mod_assign.multipleteams' | translate }}</span>
<span *ngIf="!assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup">{{ 'addon.mod_assign.defaultteam' | translate }}</span>
</p>
<ng-container *ngIf="assign && assign.teamsubmission && lastAttempt">
<p *ngIf="lastAttempt.submissiongroup && lastAttempt.submissiongroupname">{{lastAttempt.submissiongroupname}}</p>
<ng-container *ngIf="assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup && (!lastAttempt.usergroups || lastAttempt.usergroups.length <= 0)">
<p class="text-danger"><strong>{{ 'addon.mod_assign.noteam' | translate }}</strong></p>
<p class="text-danger">{{ 'addon.mod_assign.noteam_desc' | translate }}</p>
</ng-container>
<ng-container *ngIf="assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup && lastAttempt.usergroups && lastAttempt.usergroups.length > 0">
<p class="text-danger"><strong>{{ 'addon.mod_assign.multipleteams' | translate }}</strong></p>
<p class="text-danger">{{ 'addon.mod_assign.multipleteams_desc' | translate }}</p>
</ng-container>
<p *ngIf="!assign.preventsubmissionnotingroup && !lastAttempt.submissiongroup">
{{ 'addon.mod_assign.defaultteam' | translate }}
</p>
</ng-container>
<ion-badge item-end *ngIf="statusTranslated" [color]="statusColor">
{{ statusTranslated }}
</ion-badge>

2
src/addon/mod/assign/lang/en.json
View File

@ -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",

9
src/app/app.scss
View File

@ -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

4
src/core/courses/pages/course-preview/course-preview.html
View File

@ -58,6 +58,10 @@
<ion-icon name="briefcase" item-start></ion-icon>
<h2>{{ 'core.course.contents' | translate }}</h2>
</a>
<a ion-item [href]="courseUrl" core-link [title]="course.fullname">
<ion-icon name="open" item-start></ion-icon>
<h2>{{ 'core.openinbrowser' | translate }}</h2>
</a>
</ion-list>
</core-loading>
</ion-content>

2
src/core/courses/pages/course-preview/course-preview.ts
View File

@ -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;