From 697ef74d465f46c5bfb5fb4f898ba03529404504 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:22:25 +0200
Subject: [PATCH 1/7] MOBILE-3120 forum: Don't display description in single
 discussion forums

---
 src/addon/mod/forum/components/index/addon-mod-forum-index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
index 4c8be80bf..859e70d59 100644
--- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html
+++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
@@ -19,7 +19,7 @@
             <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
         </ion-refresher>
         <core-loading [hideUntil]="loaded" class="core-loading-center">
-            <core-course-module-description [description]="description" [component]="component" [componentId]="componentId" [note]="descriptionNote"></core-course-module-description>
+            <core-course-module-description *ngIf="forum && forum.type != 'single'" [description]="description" [component]="component" [componentId]="componentId" [note]="descriptionNote"></core-course-module-description>
 
             <!-- Forum discussions found to be synchronized -->
             <ion-card class="core-warning-card" icon-start *ngIf="hasOffline || hasOfflineRatings">

From 62a6913f30b238ec22c2c1b023407ff97e8e99da Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:33:20 +0200
Subject: [PATCH 2/7] MOBILE-3120 imscp: Display description

---
 src/addon/mod/imscp/components/index/addon-mod-imscp-index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html b/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
index a07aa6be4..775db0670 100644
--- a/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addon/mod/imscp/components/index/addon-mod-imscp-index.html
@@ -16,6 +16,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
     <div class="addon-mod-imscp-container">
+        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
         <core-navigation-bar [previous]="previousItem" [next]="nextItem" (action)="loadItem($event)" [info]="description" [title]="'core.description' | translate" [component]="component" [componentId]="componentId"></core-navigation-bar>
         <core-iframe [src]="src"></core-iframe>
     </div>

From f441ce79f7eabc4f882cf6fb767e2a76c3532126 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:34:03 +0200
Subject: [PATCH 3/7] MOBILE-3120 lti: Display description if setting enabled

---
 src/addon/mod/lti/components/index/addon-mod-lti-index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/lti/components/index/addon-mod-lti-index.html b/src/addon/mod/lti/components/index/addon-mod-lti-index.html
index 492303fa3..e46b4fdae 100644
--- a/src/addon/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addon/mod/lti/components/index/addon-mod-lti-index.html
@@ -11,9 +11,9 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description *ngIf="lti && lti.showdescriptionlaunch" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
-    <div padding-horizontal>
+    <div padding>
         <button ion-button block icon-left (click)="launch()">
             <ion-icon name="link"></ion-icon>
             {{ 'addon.mod_lti.launchactivity' | translate }}

From eb8f286d59778869e89acb79b01e8d837876da79 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:34:45 +0200
Subject: [PATCH 4/7] MOBILE-3120 resource: Display description if setting
 enabled

---
 .../resource/components/index/addon-mod-resource-index.html    | 2 +-
 src/addon/mod/resource/components/index/index.ts               | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/addon/mod/resource/components/index/addon-mod-resource-index.html b/src/addon/mod/resource/components/index/addon-mod-resource-index.html
index 45056cdcd..bfe0d9270 100644
--- a/src/addon/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addon/mod/resource/components/index/addon-mod-resource-index.html
@@ -13,7 +13,7 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description *ngIf="mode != 'iframe'" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description *ngIf="mode != 'iframe' && (mode != 'embedded' || displayDescription)" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
     <ng-container *ngIf="mode == 'iframe'">
         <core-iframe [src]="src"></core-iframe>
diff --git a/src/addon/mod/resource/components/index/index.ts b/src/addon/mod/resource/components/index/index.ts
index 1717d360a..815aa1388 100644
--- a/src/addon/mod/resource/components/index/index.ts
+++ b/src/addon/mod/resource/components/index/index.ts
@@ -36,6 +36,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
     mode: string;
     src: string;
     contentText: string;
+    displayDescription = true;
 
     constructor(injector: Injector, private resourceProvider: AddonModResourceProvider, private courseProvider: CoreCourseProvider,
             private appProvider: CoreAppProvider, private prefetchHandler: AddonModResourcePrefetchHandler,
@@ -96,6 +97,8 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
         }).then((resource) => {
             if (resource) {
                 this.description = resource.intro || resource.description;
+                const options = this.textUtils.unserialize(resource.displayoptions) || {};
+                this.displayDescription = typeof options.printintro == 'undefined' || !!options.printintro;
                 this.dataRetrieved.emit(resource);
             }
 

From caa8ee76631ecd6da7b79ece12777ebe2037882b Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:35:26 +0200
Subject: [PATCH 5/7] MOBILE-3120 survey: Don't display description if survey
 is done

---
 .../mod/survey/components/index/addon-mod-survey-index.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/survey/components/index/addon-mod-survey-index.html b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
index 3f5eec9f1..58f12a502 100644
--- a/src/addon/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addon/mod/survey/components/index/addon-mod-survey-index.html
@@ -14,10 +14,10 @@
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
 
-    <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <core-course-module-description *ngIf="survey && !survey.surveydone && !hasOffline" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
     <!-- Survey already done -->
-    <ion-card padding *ngIf="survey && survey.surveydone">
+    <ion-card padding *ngIf="survey && survey.surveydone">  
         <p padding>{{ 'addon.mod_survey.surveycompletednograph' | translate }}</p>
         <a ion-button block icon-start [href]="externalUrl" core-link>
             <ion-icon name="open" start></ion-icon>

From b7f201aeaf6670c66c16db2a95566b8648c13d4a Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:36:04 +0200
Subject: [PATCH 6/7] MOBILE-3120 wiki: Display description in all pages

---
 src/addon/mod/wiki/components/index/addon-mod-wiki-index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
index c16f7462c..78033eeab 100644
--- a/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addon/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -24,8 +24,8 @@
 
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
-    <div padding *ngIf="(isMainPage && description) || pageIsOffline || hasOffline || pageWarning">
-        <core-course-module-description *ngIf="isMainPage" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
+    <div padding *ngIf="description || pageIsOffline || hasOffline || pageWarning">
+        <core-course-module-description [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
 
         <!-- Wiki has something offline. -->
         <div class="core-warning-card" icon-start *ngIf="pageIsOffline || hasOffline">

From a1280122e0f73a853d1f051dfc26aff74f7f8850 Mon Sep 17 00:00:00 2001
From: Albert Gasset <albertgasset@fsfe.org>
Date: Fri, 6 Sep 2019 16:36:56 +0200
Subject: [PATCH 7/7] MOBILE-3120 workshop: Display description in setup phase
 only

---
 .../components/index/addon-mod-workshop-index.html     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
index c90bb99ae..14631e93c 100644
--- a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -13,8 +13,6 @@
 
 <!-- Content. -->
 <core-loading [hideUntil]="loaded" class="core-loading-center">
-    <core-course-module-description *ngIf="description" [description]="description" [component]="component" [componentId]="componentId"></core-course-module-description>
-
     <ion-card class="with-borders" *ngIf="phases">
         <a ion-item (click)="viewPhaseInfo()">
             <h2 stacked text-wrap>{{ phases[workshop.phase].title }}</h2>
@@ -39,6 +37,14 @@
         {{ 'core.hasdatatosync' | translate: {$a: moduleName} }}
     </div>
 
+    <!-- Description (setup phase only) -->
+    <ion-card *ngIf="description && workshop && workshop.phase == workshopPhases.PHASE_SETUP">
+        <ion-item text-wrap>
+            <h2>{{ 'core.description' | translate }}</h2>
+            <core-format-text [text]="description" [component]="component" [componentId]="componentId"></core-format-text>
+        </ion-item>
+    </ion-card>
+
     <div *ngIf="access && workshop && workshop.phase >= workshopPhases.PHASE_SUBMISSION">
         <!-- CLOSED PHASE -->
         <ng-container *ngIf="workshop.phase >= workshopPhases.PHASE_CLOSED">