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

Merge pull request #2083 from crazyserver/MOBILE-3068 

Mobile 3068
main
Dani Palou 2019-08-28 12:44:34 +02:00 committed by GitHub
parent fcf1677559 9dbe9150b8
commit ee143c5a89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
<core-loading [hideUntil]="loaded"> <core-loading [hideUntil]="loaded" class="core-loading-center">
<!-- User and status of the submission. --> <!-- User and status of the submission. -->
<a ion-item text-wrap *ngIf="!blindMarking && user" core-user-link [userId]="submitId" [courseId]="courseId" [title]="user.fullname"> <a ion-item text-wrap *ngIf="!blindMarking && user" core-user-link [userId]="submitId" [courseId]="courseId" [title]="user.fullname">

40
src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
View File

@ -31,38 +31,38 @@
<ion-list> <ion-list>
<ng-container *ngIf="scorm.displayattemptstatus"> <ng-container *ngIf="scorm.displayattemptstatus">
<ion-item text-wrap *ngIf="scorm.maxattempt >= 0"> <ion-item text-wrap *ngIf="scorm.maxattempt >= 0">
<p class="item-heading">{{ 'addon.mod_scorm.noattemptsallowed' | translate }}</p> <h3>{{ 'addon.mod_scorm.noattemptsallowed' | translate }}</h3>
<p *ngIf="scorm.maxattempt == 0">{{ 'core.unlimited' | translate }}</p> <p item-content *ngIf="scorm.maxattempt == 0">{{ 'core.unlimited' | translate }}</p>
<p *ngIf="scorm.maxattempt > 0">{{ scorm.maxattempt }}</p> <p item-content *ngIf="scorm.maxattempt > 0">{{ scorm.maxattempt }}</p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="scorm.numAttempts >= 0"> <ion-item text-wrap *ngIf="scorm.numAttempts >= 0">
<p class="item-heading">{{ 'addon.mod_scorm.noattemptsmade' | translate }}</p> <h3>{{ 'addon.mod_scorm.noattemptsmade' | translate }}</h3>
<p>{{ scorm.numAttempts }}</p> <p item-content>{{ scorm.numAttempts }}</p>
</ion-item> </ion-item>
<ion-item text-wrap *ngFor="let attempt of scorm.onlineAttempts"> <ion-item text-wrap *ngFor="let attempt of scorm.onlineAttempts">
<p class="item-heading">{{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.number}}</p> <h3>{{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.number}}</h3>
<p *ngIf="attempt.grade != -1">{{ attempt.grade }}</p> <p item-content *ngIf="attempt.grade != -1">{{ attempt.grade }}</p>
<p *ngIf="attempt.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</p> <p item-content *ngIf="attempt.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</p>
</ion-item> </ion-item>
</ng-container> </ng-container>
<ion-item text-wrap *ngFor="let attempt of scorm.offlineAttempts"> <ion-item text-wrap *ngFor="let attempt of scorm.offlineAttempts">
<p class="item-heading">{{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.number}}</p> <h3>{{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.number}}</h3>
<p *ngIf="attempt.grade != -1">{{ attempt.grade }}</p> <p item-content *ngIf="attempt.grade != -1">{{ attempt.grade }}</p>
<p *ngIf="attempt.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</p> <p item-content *ngIf="attempt.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</p>
<p *ngIf="scorm.maxattempt == 0 || attempt.number <= scorm.maxattempt">{{ 'addon.mod_scorm.offlineattemptnote' | translate }}</p> <p item-content *ngIf="scorm.maxattempt == 0 || attempt.number <= scorm.maxattempt">{{ 'addon.mod_scorm.offlineattemptnote' | translate }}</p>
<p *ngIf="scorm.maxattempt != 0 && attempt.number > scorm.maxattempt">{{ 'addon.mod_scorm.offlineattemptovermax' | translate }}</p> <p item-content *ngIf="scorm.maxattempt != 0 && attempt.number > scorm.maxattempt">{{ 'addon.mod_scorm.offlineattemptovermax' | translate }}</p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="scorm.displayattemptstatus && scorm.gradeMethodReadable"> <ion-item text-wrap *ngIf="scorm.displayattemptstatus && scorm.gradeMethodReadable">
<p class="item-heading">{{ 'addon.mod_scorm.grademethod' | translate }}</p> <h3>{{ 'addon.mod_scorm.grademethod' | translate }}</h3>
<p>{{ scorm.gradeMethodReadable }}</p> <p item-content>{{ scorm.gradeMethodReadable }}</p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="scorm.displayattemptstatus && scorm.grade"> <ion-item text-wrap *ngIf="scorm.displayattemptstatus && scorm.grade">
<p class="item-heading">{{ 'addon.mod_scorm.gradereported' | translate }}</p> <h3>{{ 'addon.mod_scorm.gradereported' | translate }}</h3>
<p *ngIf="scorm.grade != -1">{{ scorm.grade }}</p> <p item-content *ngIf="scorm.grade != -1">{{ scorm.grade }}</p>
<p *ngIf="scorm.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</p> <p item-content *ngIf="scorm.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</p>
</ion-item> </ion-item>
<ion-item text-wrap *ngIf="syncTime"> <ion-item text-wrap *ngIf="syncTime">
<p class="item-heading">{{ 'core.lastsync' | translate }}</p> <h3>{{ 'core.lastsync' | translate }}</h3>
<p>{{ syncTime }}</p> <p>{{ syncTime }}</p>
</ion-item> </ion-item>
</ion-list> </ion-list>
@ -130,7 +130,7 @@
<!-- Open mode (Preview or Normal) --> <!-- Open mode (Preview or Normal) -->
<div *ngIf="!scorm.hidebrowse && !skip" radio-group [(ngModel)]="scormOptions.mode" name="mode"> <div *ngIf="!scorm.hidebrowse && !skip" radio-group [(ngModel)]="scormOptions.mode" name="mode">
<ion-item> <ion-item>
<p class="item-heading">{{ 'addon.mod_scorm.mode' | translate }}</p> <h2>{{ 'addon.mod_scorm.mode' | translate }}</h2>
</ion-item> </ion-item>
<ion-item> <ion-item>
<ion-label>{{ 'addon.mod_scorm.browse' | translate }}</ion-label> <ion-label>{{ 'addon.mod_scorm.browse' | translate }}</ion-label>

5
src/components/empty-box/empty-box.scss
View File

@ -61,3 +61,8 @@ ion-app.app-root core-empty-box {
} }
} }
} }
ion-app.app-root core-block-course-blocks core-empty-box .core-empty-box {
position: relative;
}

2
src/components/loading/loading.scss
View File

@ -21,12 +21,14 @@ ion-app.app-root {
.scroll-content > core-loading, .scroll-content > core-loading,
ion-content > .scroll-content > core-loading, ion-content > .scroll-content > core-loading,
core-tab core-loading,
.core-loading-center { .core-loading-center {
position: static !important; position: static !important;
} }
.scroll-content > core-loading, .scroll-content > core-loading,
ion-content > .scroll-content > core-loading, ion-content > .scroll-content > core-loading,
core-tab core-loading,
.core-loading-center, .core-loading-center,
core-loading.core-loading-loaded { core-loading.core-loading-loaded {
position: relative; position: relative;

22
src/core/course/components/format/core-course-format.html
View File

@ -54,18 +54,18 @@
<core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading> <core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
</div> </div>
</core-loading>
<ion-buttons padding end class="core-course-section-nav-buttons" *ngIf="displaySectionSelector && sections && sections.length">
<button *ngIf="previousSection" ion-button color="light" icon-only (click)="sectionChanged(previousSection)" title="{{ 'core.previous' | translate }}">
<ion-icon name="arrow-back" md="ios-arrow-back"></ion-icon>
<core-format-text class="accesshide" [text]="previousSection.formattedName || previousSection.name"></core-format-text>
</button>
<button *ngIf="nextSection" ion-button icon-only (click)="sectionChanged(nextSection)" title="{{ 'core.next' | translate }}">
<core-format-text class="accesshide" [text]="nextSection.formattedName || nextSection.name"></core-format-text>
<ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon>
</button>
</ion-buttons>
<ion-buttons padding end class="core-course-section-nav-buttons" *ngIf="displaySectionSelector && sections && sections.length">
<button *ngIf="previousSection" ion-button color="light" icon-only (click)="sectionChanged(previousSection)" title="{{ 'core.previous' | translate }}">
<ion-icon name="arrow-back" md="ios-arrow-back"></ion-icon>
<core-format-text class="accesshide" [text]="previousSection.formattedName || previousSection.name"></core-format-text>
</button>
<button *ngIf="nextSection" ion-button icon-only (click)="sectionChanged(nextSection)" title="{{ 'core.next' | translate }}">
<core-format-text class="accesshide" [text]="nextSection.formattedName || nextSection.name"></core-format-text>
<ion-icon name="arrow-forward" md="ios-arrow-forward"></ion-icon>
</button>
</ion-buttons>
</core-loading>
</core-dynamic-component> </core-dynamic-component>
</core-block-course-blocks> </core-block-course-blocks>

2
src/core/siteplugins/components/plugin-content/core-siteplugins-plugin-content.html
View File

@ -1,3 +1,3 @@
<core-loading [hideUntil]="dataLoaded"> <core-loading [hideUntil]="dataLoaded" class="core-loading-center">
<core-compile-html [text]="content" [javascript]="javascript" [jsData]="jsData" [forceCompile]="forceCompile" #compile></core-compile-html> <core-compile-html [text]="content" [javascript]="javascript" [jsData]="jsData" [forceCompile]="forceCompile" #compile></core-compile-html>
</core-loading> </core-loading>