From 3e29f2e4280ad4e228dc1003beacf4d5e16810e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 28 Aug 2019 09:32:07 +0200
Subject: [PATCH 1/2] MOBILE-3068 loading: Fix loading styles on blocks and
 tabs

---
 .../addon-mod-assign-submission.html          |  2 +-
 src/components/empty-box/empty-box.scss       |  5 +++++
 src/components/loading/loading.scss           |  2 ++
 .../components/format/core-course-format.html | 22 +++++++++----------
 .../core-siteplugins-plugin-content.html      |  2 +-
 5 files changed, 20 insertions(+), 13 deletions(-)

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 c46b8942e..06bebe6cb 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
@@ -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">
diff --git a/src/components/empty-box/empty-box.scss b/src/components/empty-box/empty-box.scss
index 5d265575c..e5d0c3edb 100644
--- a/src/components/empty-box/empty-box.scss
+++ b/src/components/empty-box/empty-box.scss
@@ -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;
+}
+
diff --git a/src/components/loading/loading.scss b/src/components/loading/loading.scss
index 92f001805..bc1faec9f 100644
--- a/src/components/loading/loading.scss
+++ b/src/components/loading/loading.scss
@@ -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;
diff --git a/src/core/course/components/format/core-course-format.html b/src/core/course/components/format/core-course-format.html
index 2d01ef5a1..c7c3bf6ed 100644
--- a/src/core/course/components/format/core-course-format.html
+++ b/src/core/course/components/format/core-course-format.html
@@ -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>
 
diff --git a/src/core/siteplugins/components/plugin-content/core-siteplugins-plugin-content.html b/src/core/siteplugins/components/plugin-content/core-siteplugins-plugin-content.html
index c306b73a7..06651d0f4 100644
--- a/src/core/siteplugins/components/plugin-content/core-siteplugins-plugin-content.html
+++ b/src/core/siteplugins/components/plugin-content/core-siteplugins-plugin-content.html
@@ -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>

From 9dbe9150b805f19ac5bde0c3983fba7016383216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 28 Aug 2019 10:40:51 +0200
Subject: [PATCH 2/2] MOBILE-3068 scorm: Reduce index page length

---
 .../index/addon-mod-scorm-index.html          | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
index 20ca8751f..5aeb8dec5 100644
--- a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -31,38 +31,38 @@
             <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>
@@ -130,7 +130,7 @@
                 <!-- 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>