From 3de60760b09989d2b42e64bbb2a2fc821438682a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 4 Jun 2021 14:40:07 +0200
Subject: [PATCH] MOBILE-3320 core: Fix wraps on chat and assignment submission

---
 src/addons/calendar/pages/day/day.html        |  2 +-
 .../messages/pages/discussion/discussion.html |  2 +-
 .../addon-mod-assign-submission.html          | 19 ++++++++-----------
 .../index/addon-mod-chat-index.html           |  4 ++--
 .../mod/forum/components/index/index.html     | 10 ++++++----
 .../index/addon-mod-glossary-index.html       |  2 +-
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html
index 4ca58a438..5177df833 100644
--- a/src/addons/calendar/pages/day/day.html
+++ b/src/addons/calendar/pages/day/day.html
@@ -53,7 +53,7 @@
             </ion-item>
         </ion-card>
 
-        <core-empty-box *ngIf="!filteredEvents || !filteredEvents.length" icon="fas-calendar" inline="true"
+        <core-empty-box *ngIf="!filteredEvents || !filteredEvents.length" icon="fas-calendar"
             [message]="'addon.calendar.noevents' | translate">
         </core-empty-box>
 
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 6ff35dea0..cf6b37e40 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -96,7 +96,7 @@
                             <core-user-avatar slot="start" [user]="members[message.useridfrom]" [linkProfile]="false"
                                 aria-hidden="true">
                             </core-user-avatar>
-                            {{ members[message.useridfrom].fullname }}
+                            <div>{{ members[message.useridfrom].fullname }}</div>
                         </div>
                         <div *ngIf="!message.showUserData" class="sr-only">
                             {{ message.useridfrom == currentUserId
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index 09d1c6416..7f368c34a 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -8,7 +8,6 @@
             <h2>{{ user!.fullname }}</h2>
             <ng-container *ngTemplateOutlet="submissionStatus"></ng-container>
         </ion-label>
-        <ng-container *ngTemplateOutlet="submissionStatusBadges"></ng-container>
     </ion-item>
 
     <!-- Status of the submission if user is blinded. -->
@@ -17,7 +16,6 @@
             <h2>{{ 'addon.mod_assign.hiddenuser' | translate }} {{blindId}}</h2>
             <ng-container *ngTemplateOutlet="submissionStatus"></ng-container>
         </ion-label>
-        <ng-container *ngTemplateOutlet="submissionStatusBadges"></ng-container>
     </ion-item>
 
     <!-- Status of the submission in the rest of cases. -->
@@ -26,7 +24,6 @@
             <h2>{{ 'addon.mod_assign.submissionstatus' | translate }}</h2>
             <ng-container *ngTemplateOutlet="submissionStatus"></ng-container>
         </ion-label>
-        <ng-container *ngTemplateOutlet="submissionStatusBadges"></ng-container>
     </ion-item>
 
     <!-- Tabs: see the submission or grade it. -->
@@ -385,12 +382,12 @@
             {{ 'addon.mod_assign.defaultteam' | translate }}
         </p>
     </ng-container>
-</ng-template>
-<ng-template #submissionStatusBadges>
-    <ion-badge slot="end" *ngIf="statusTranslated" [color]="statusColor">
-        {{ statusTranslated }}
-    </ion-badge>
-    <ion-badge slot="end" *ngIf="gradingStatusTranslationId" [color]="gradingColor">
-        {{ gradingStatusTranslationId | translate }}
-    </ion-badge>
+    <p>
+        <ion-badge *ngIf="statusTranslated" [color]="statusColor">
+            {{ statusTranslated }}
+        </ion-badge>
+        <ion-badge class="ion-margin-start" *ngIf="gradingStatusTranslationId" [color]="gradingColor">
+            {{ gradingStatusTranslationId | translate }}
+        </ion-badge>
+    </p>
 </ng-template>
diff --git a/src/addons/mod/chat/components/index/addon-mod-chat-index.html b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
index 6a2c21ff3..2efee98b1 100644
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@@ -43,10 +43,10 @@
     </ion-card>
 
     <ng-container *ngIf="chat">
-        <ion-button class="ion-margin" expand="block" color="primary" (click)="enterChat()">
+        <ion-button class="ion-margin ion-text-wrap" expand="block" color="primary" (click)="enterChat()">
             {{ 'addon.mod_chat.enterchat' | translate }}
         </ion-button>
-        <ion-button class="ion-margin" expand="block" color="light" *ngIf="sessionsAvailable" (click)="viewSessions()">
+        <ion-button class="ion-margin ion-text-wrap" expand="block" color="light" *ngIf="sessionsAvailable" (click)="viewSessions()">
             {{ 'addon.mod_chat.viewreport' | translate }}
         </ion-button>
     </ng-container>
diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 5e3d2bbf4..db45724cc 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -10,11 +10,13 @@
         <core-context-menu-item *ngIf="blog"
             [priority]="750" content="{{'addon.blog.blog' | translate}}" [iconAction]="'far-newspaper'" (action)="gotoBlog()">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="discussions.loaded && !(hasOffline || hasOfflineRatings) && isOnline"
+        <core-context-menu-item
+            *ngIf="discussions.onlineLoaded && discussions.loaded && !(hasOffline || hasOfflineRatings) && isOnline"
             [priority]="700" [content]="'addon.mod_forum.refreshdiscussions' | translate" [iconAction]="refreshIcon" [closeOnClick]="false"
             (action)="doRefresh(null, $event)">
         </core-context-menu-item>
-        <core-context-menu-item *ngIf="discussions.loaded && (hasOffline || hasOfflineRatings) && isOnline"
+        <core-context-menu-item
+            *ngIf="discussions.onlineLoaded && discussions.loaded && (hasOffline || hasOfflineRatings) && isOnline"
             [priority]="600" [content]="'core.settings.synchronizenow' | translate" [iconAction]="syncIcon" [closeOnClick]="false"
             (action)="doRefresh(null, $event, true)">
         </core-context-menu-item>
@@ -37,11 +39,11 @@
 
 <!-- Content. -->
 <core-split-view>
-    <ion-refresher slot="fixed" [disabled]="!discussions.loaded" (ionRefresh)="doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="!discussions.onlineLoaded || !discussions.loaded" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="discussions.loaded">
+    <core-loading [hideUntil]="discussions.onlineLoaded && discussions.loaded">
         <!-- Activity info. -->
         <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
             (completionChanged)="onCompletionChange()">
diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index 8e3bcab19..6906bf761 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -49,7 +49,7 @@
         [autoFocus]="true" [lengthCheck]="2" (onClear)="toggleSearch()" searchArea="AddonModGlossary-{{module.id}}">
     </core-search-box>
 
-    <core-loading [hideUntil]="entries.loaded">
+    <core-loading [hideUntil]="loaded">
         <!-- Activity info. -->
         <core-course-module-info *ngIf="showCompletion" [module]="module" [showManualCompletion]="true"
             (completionChanged)="onCompletionChange()">