From 4a83b2b29f6d1c3435ba1d80a45af184b06717a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 19 Jan 2022 14:54:43 +0100
Subject: [PATCH] MOBILE-3814 mod: Add module name to module info box

---
 src/addons/mod/forum/components/index/index.html     |  2 +-
 .../wiki/components/index/addon-mod-wiki-index.html  |  2 +-
 src/addons/mod/wiki/components/index/index.ts        |  1 -
 src/addons/mod/wiki/pages/index/index.html           |  4 ----
 src/addons/mod/wiki/pages/index/index.ts             | 12 ------------
 .../module-info/core-course-module-info.html         |  1 +
 .../components/module-info/course-module-info.scss   | 10 +++++++++-
 7 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 5000be62a..09e94eb1a 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -41,7 +41,7 @@
         <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()"
             [description]="forum && forum.type != 'single' && description" [component]="component" [componentId]="componentId"
             [courseId]="courseId" [hasDataToSync]="hasOffline || hasOfflineRatings">
-            <ion-item>
+            <ion-item lines="none" class="ion-text-wrap">
                 <ion-label>
                     {{descriptionNote}}
                 </ion-label>
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index ee8fec538..9d9fdf7fb 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -50,7 +50,6 @@
     <!-- Activity info. -->
     <core-course-module-info [module]="module" (completionChanged)="onCompletionChange()" [description]="description"
         [component]="component" [componentId]="componentId" [courseId]="courseId">
-        <h2 *ngIf="pageTitle" title>{{pageTitle}}</h2>
     </core-course-module-info>
 
     <div *ngIf="pageIsOffline || hasOffline || pageWarning">
@@ -74,6 +73,7 @@
         </ion-card>
     </div>
     <div class="ion-padding addon-mod_wiki-page-content">
+        <h2 *ngIf="pageTitle">{{pageTitle}}</h2>
         <article [ngClass]="{'addon-mod_wiki-noedit': !canEdit}">
             <core-format-text *ngIf="pageContent" [component]="component" [componentId]="componentId" [text]="pageContent"
                 contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts
index 45ea90277..4f5a4709f 100644
--- a/src/addons/mod/wiki/components/index/index.ts
+++ b/src/addons/mod/wiki/components/index/index.ts
@@ -427,7 +427,6 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
         const pageContents = await this.fetchPageContents(this.currentPage);
 
         if (pageContents) {
-            this.dataRetrieved.emit(pageContents.title);
             this.setSelectedWiki(pageContents.subwikiid, pageContents.userid, pageContents.groupid);
 
             this.pageTitle = pageContents.title;
diff --git a/src/addons/mod/wiki/pages/index/index.html b/src/addons/mod/wiki/pages/index/index.html
index 6c07ead01..a33c7c251 100644
--- a/src/addons/mod/wiki/pages/index/index.html
+++ b/src/addons/mod/wiki/pages/index/index.html
@@ -8,10 +8,6 @@
                 <core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
                 </core-format-text>
             </h1>
-            <h2>
-                <core-format-text [text]="pageTitle" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
-                </core-format-text>
-            </h2>
         </ion-title>
 
         <ion-buttons slot="end">
diff --git a/src/addons/mod/wiki/pages/index/index.ts b/src/addons/mod/wiki/pages/index/index.ts
index 0d374feaa..34311f8ad 100644
--- a/src/addons/mod/wiki/pages/index/index.ts
+++ b/src/addons/mod/wiki/pages/index/index.ts
@@ -49,18 +49,6 @@ export class AddonModWikiIndexPage extends CoreCourseModuleMainActivityPage<Addo
         this.groupId = CoreNavigator.getRouteNumberParam('groupId');
     }
 
-    /**
-     * @inheritdoc
-     */
-    updateData(data: { name: string } | string): void {
-        if (typeof data == 'string') {
-            // We received the title to display.
-            this.pageTitle = data;
-        } else {
-            super.updateData(data);
-        }
-    }
-
     /**
      * User entered the page.
      */
diff --git a/src/core/features/course/components/module-info/core-course-module-info.html b/src/core/features/course/components/module-info/core-course-module-info.html
index 702b6ff54..66eb61541 100644
--- a/src/core/features/course/components/module-info/core-course-module-info.html
+++ b/src/core/features/course/components/module-info/core-course-module-info.html
@@ -2,6 +2,7 @@
     <core-mod-icon slot="start" [modicon]="modicon" [modname]="module.modname" [componentId]="module.instance">
     </core-mod-icon>
     <ion-label>
+        <p class="core-modulename" *ngIf="moduleNameTranslated">{{moduleNameTranslated}}</p>
         <h1>
             <core-format-text [text]="module.name" contextLevel="module" [component]="component" [componentId]="componentId"
                 [contextInstanceId]="module.id" [courseId]="courseId">
diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss
index 0a0b5bce7..514315b48 100644
--- a/src/core/features/course/components/module-info/course-module-info.scss
+++ b/src/core/features/course/components/module-info/course-module-info.scss
@@ -6,6 +6,14 @@
     margin-bottom: 8px;
     padding-bottom: 1px; // To allow margins inside.
     background-color: var(--contrast-background);
-    
+
     @include padding-horizontal(var(--ion-safe-area-left), var(--ion-safe-area-right));
+
+    .core-modulename {
+        text-transform: uppercase;
+    }
+
+    core-mod-icon {
+        align-self: flex-start;
+    }
 }