From 5e48a314cd1e3fa1448be0c06caf97f84817543f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 9 Jul 2021 11:54:00 +0200
Subject: [PATCH 1/2] MOBILE-3320 siteplugins: Fix routes of some type of
 plugins

---
 .../siteplugins/classes/handlers/course-option-handler.ts       | 2 +-
 .../features/siteplugins/classes/handlers/main-menu-handler.ts  | 2 +-
 .../siteplugins/classes/handlers/message-output-handler.ts      | 2 +-
 .../features/siteplugins/classes/handlers/settings-handler.ts   | 2 +-
 src/core/features/siteplugins/siteplugins.module.ts             | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/core/features/siteplugins/classes/handlers/course-option-handler.ts b/src/core/features/siteplugins/classes/handlers/course-option-handler.ts
index e3960190d..4f8d04a28 100644
--- a/src/core/features/siteplugins/classes/handlers/course-option-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/course-option-handler.ts
@@ -94,7 +94,7 @@ export class CoreSitePluginsCourseOptionHandler extends CoreSitePluginsBaseHandl
             title: this.title,
             class: this.handlerSchema.displaydata?.class,
             icon: this.handlerSchema.displaydata?.icon || '',
-            page: `siteplugins/${this.plugin.component}/${this.handlerSchema.method}/${hash}`,
+            page: `siteplugins/content/${this.plugin.component}/${this.handlerSchema.method}/${hash}`,
             pageParams: {
                 title: this.title,
                 args,
diff --git a/src/core/features/siteplugins/classes/handlers/main-menu-handler.ts b/src/core/features/siteplugins/classes/handlers/main-menu-handler.ts
index aa118ccda..1d06b9bea 100644
--- a/src/core/features/siteplugins/classes/handlers/main-menu-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/main-menu-handler.ts
@@ -47,7 +47,7 @@ export class CoreSitePluginsMainMenuHandler extends CoreSitePluginsBaseHandler i
             title: this.title,
             icon: this.handlerSchema.displaydata?.icon || 'fas-question',
             class: this.handlerSchema.displaydata?.class,
-            page: `siteplugins/${this.plugin.component}/${this.handlerSchema.method}/0`,
+            page: `siteplugins/content/${this.plugin.component}/${this.handlerSchema.method}/0`,
             pageParams: {
                 title: this.title,
                 initResult: this.initResult,
diff --git a/src/core/features/siteplugins/classes/handlers/message-output-handler.ts b/src/core/features/siteplugins/classes/handlers/message-output-handler.ts
index a67af0f94..07db94336 100644
--- a/src/core/features/siteplugins/classes/handlers/message-output-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/message-output-handler.ts
@@ -44,7 +44,7 @@ export class CoreSitePluginsMessageOutputHandler extends CoreSitePluginsBaseHand
             priority: this.handlerSchema.priority || 0,
             label: this.title,
             icon: this.handlerSchema.displaydata?.icon || 'fas-question',
-            page: `siteplugins/${this.plugin.component}/${this.handlerSchema.method}/0`,
+            page: `siteplugins/content/${this.plugin.component}/${this.handlerSchema.method}/0`,
             pageParams: {
                 title: this.title,
                 initResult: this.initResult,
diff --git a/src/core/features/siteplugins/classes/handlers/settings-handler.ts b/src/core/features/siteplugins/classes/handlers/settings-handler.ts
index 950f00039..8ec559901 100644
--- a/src/core/features/siteplugins/classes/handlers/settings-handler.ts
+++ b/src/core/features/siteplugins/classes/handlers/settings-handler.ts
@@ -49,7 +49,7 @@ export class CoreSitePluginsSettingsHandler extends CoreSitePluginsBaseHandler i
             title: this.title,
             icon: this.handlerSchema.displaydata?.icon,
             class: this.handlerSchema.displaydata?.class,
-            page: `siteplugins/${this.plugin.component}/${this.handlerSchema.method}/0`,
+            page: `siteplugins/content/${this.plugin.component}/${this.handlerSchema.method}/0`,
             params: {
                 title: this.title,
                 initResult: this.initResult,
diff --git a/src/core/features/siteplugins/siteplugins.module.ts b/src/core/features/siteplugins/siteplugins.module.ts
index aaf1c573d..61b9c7503 100644
--- a/src/core/features/siteplugins/siteplugins.module.ts
+++ b/src/core/features/siteplugins/siteplugins.module.ts
@@ -18,6 +18,7 @@ import { Routes } from '@angular/router';
 import { CoreCourseIndexRoutingModule } from '@features/course/pages/index/index-routing.module';
 import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module';
 import { CoreMainMenuHomeRoutingModule } from '@features/mainmenu/pages/home/home-routing.module';
+import { CoreSitePreferencesRoutingModule } from '@features/settings/pages/site/site-routing';
 import { CoreSitePluginsComponentsModule } from './components/components.module';
 import { CoreSitePluginsHelper } from './services/siteplugins-helper';
 
@@ -55,6 +56,7 @@ const moduleRoutes: Routes = [
         CoreMainMenuTabRoutingModule.forChild(moduleRoutes.concat(routes)),
         CoreCourseIndexRoutingModule.forChild({ children: courseIndexRoutes }),
         CoreMainMenuHomeRoutingModule.forChild({ children: homeRoutes }),
+        CoreSitePreferencesRoutingModule.forChild(routes),
         CoreSitePluginsComponentsModule,
     ],
     providers: [

From 6d8c363e47c0f70333d03a00248ee65df7c512a8 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 9 Jul 2021 12:04:15 +0200
Subject: [PATCH 2/2] MOBILE-3320 blog: Add missing ion-text-wrap class

---
 src/addons/blog/pages/entries/entries.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html
index 3e1a1a772..6dd13b87c 100644
--- a/src/addons/blog/pages/entries/entries.html
+++ b/src/addons/blog/pages/entries/entries.html
@@ -41,7 +41,7 @@
                     </ion-label>
                 </ion-item>
                 <ion-card-content>
-                    <ion-item>
+                    <ion-item class="ion-text-wrap">
                         <ion-label>
                             <core-format-text [text]="entry.summary" [component]="this.component" [componentId]="entry.id"
                                 [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId">