Skip to content

Mobile 3068 #2083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 28, 2019
Merged

Mobile 3068 #2083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e29f2e
MOBILE-3068 loading: Fix loading styles on blocks and tabs
crazyserver Aug 28, 2019
9dbe915
MOBILE-3068 scorm: Reduce index page length
crazyserver Aug 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/addon/mod/assign/components/submission/addon-mod-assign-submission.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<core-loading [hideUntil]="loaded">
<core-loading [hideUntil]="loaded" class="core-loading-center">

<!-- User and status of the submission. -->
<a ion-item text-wrap *ngIf="!blindMarking && user" core-user-link [userId]="submitId" [courseId]="courseId" [title]="user.fullname">
Expand Down
40 changes: 20 additions & 20 deletions src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,38 @@ <h2>{{ 'addon.mod_scorm.attempts' | translate }}</h2>
<ion-list>
<ng-container *ngIf="scorm.displayattemptstatus">
<ion-item text-wrap *ngIf="scorm.maxattempt >= 0">
<p class="item-heading">{{ 'addon.mod_scorm.noattemptsallowed' | translate }}</p>
<p *ngIf="scorm.maxattempt == 0">{{ 'core.unlimited' | translate }}</p>
<p *ngIf="scorm.maxattempt > 0">{{ scorm.maxattempt }}</p>
<h3>{{ 'addon.mod_scorm.noattemptsallowed' | translate }}</h3>
<p item-content *ngIf="scorm.maxattempt == 0">{{ 'core.unlimited' | translate }}</p>
<p item-content *ngIf="scorm.maxattempt > 0">{{ scorm.maxattempt }}</p>
</ion-item>
<ion-item text-wrap *ngIf="scorm.numAttempts >= 0">
<p class="item-heading">{{ 'addon.mod_scorm.noattemptsmade' | translate }}</p>
<p>{{ scorm.numAttempts }}</p>
<h3>{{ 'addon.mod_scorm.noattemptsmade' | translate }}</h3>
<p item-content>{{ scorm.numAttempts }}</p>
</ion-item>
<ion-item text-wrap *ngFor="let attempt of scorm.onlineAttempts">
<p class="item-heading">{{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.number}}</p>
<p *ngIf="attempt.grade != -1">{{ attempt.grade }}</p>
<p *ngIf="attempt.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</p>
<h3>{{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.number}}</h3>
<p item-content *ngIf="attempt.grade != -1">{{ attempt.grade }}</p>
<p item-content *ngIf="attempt.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</p>
</ion-item>
</ng-container>
<ion-item text-wrap *ngFor="let attempt of scorm.offlineAttempts">
<p class="item-heading">{{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.number}}</p>
<p *ngIf="attempt.grade != -1">{{ attempt.grade }}</p>
<p *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 *ngIf="scorm.maxattempt != 0 && attempt.number > scorm.maxattempt">{{ 'addon.mod_scorm.offlineattemptovermax' | translate }}</p>
<h3>{{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.number}}</h3>
<p item-content *ngIf="attempt.grade != -1">{{ attempt.grade }}</p>
<p item-content *ngIf="attempt.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</p>
<p item-content *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.offlineattemptovermax' | translate }}</p>
</ion-item>
<ion-item text-wrap *ngIf="scorm.displayattemptstatus && scorm.gradeMethodReadable">
<p class="item-heading">{{ 'addon.mod_scorm.grademethod' | translate }}</p>
<p>{{ scorm.gradeMethodReadable }}</p>
<h3>{{ 'addon.mod_scorm.grademethod' | translate }}</h3>
<p item-content>{{ scorm.gradeMethodReadable }}</p>
</ion-item>
<ion-item text-wrap *ngIf="scorm.displayattemptstatus && scorm.grade">
<p class="item-heading">{{ 'addon.mod_scorm.gradereported' | translate }}</p>
<p *ngIf="scorm.grade != -1">{{ scorm.grade }}</p>
<p *ngIf="scorm.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</p>
<h3>{{ 'addon.mod_scorm.gradereported' | translate }}</h3>
<p item-content *ngIf="scorm.grade != -1">{{ scorm.grade }}</p>
<p item-content *ngIf="scorm.grade == -1">{{ 'addon.mod_scorm.cannotcalculategrade' | translate }}</p>
</ion-item>
<ion-item text-wrap *ngIf="syncTime">
<p class="item-heading">{{ 'core.lastsync' | translate }}</p>
<h3>{{ 'core.lastsync' | translate }}</h3>
<p>{{ syncTime }}</p>
</ion-item>
</ion-list>
Expand Down Expand Up @@ -130,7 +130,7 @@ <h2>{{ 'addon.mod_scorm.contents' | translate }}</h2>
<!-- Open mode (Preview or Normal) -->
<div *ngIf="!scorm.hidebrowse && !skip" radio-group [(ngModel)]="scormOptions.mode" name="mode">
<ion-item>
<p class="item-heading">{{ 'addon.mod_scorm.mode' | translate }}</p>
<h2>{{ 'addon.mod_scorm.mode' | translate }}</h2>
</ion-item>
<ion-item>
<ion-label>{{ 'addon.mod_scorm.browse' | translate }}</ion-label>
Expand Down
5 changes: 5 additions & 0 deletions src/components/empty-box/empty-box.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 0 deletions src/components/loading/loading.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ ion-app.app-root {

.scroll-content > core-loading,
ion-content > .scroll-content > core-loading,
core-tab core-loading,
.core-loading-center {
position: static !important;
}

.scroll-content > core-loading,
ion-content > .scroll-content > core-loading,
core-tab core-loading,
.core-loading-center,
core-loading.core-loading-loaded {
position: relative;
Expand Down
22 changes: 11 additions & 11 deletions src/core/course/components/format/core-course-format.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,18 @@

<core-infinite-loading [enabled]="canLoadMore" (action)="showMoreActivities($event)"></core-infinite-loading>
</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-block-course-blocks>

Expand Down
2 changes: 1 addition & 1 deletion src/core/siteplugins/components/plugin-content/core-siteplugins-plugin-content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-loading>