From f45c7cc770963670b3f2f1ac11d3ee3afc84a7ec Mon Sep 17 00:00:00 2001
From: Florian CUNY <poslovitch@bentobox.world>
Date: Mon, 30 Nov 2020 15:05:57 +0100
Subject: Added Markdown formatting in all the fields of the "About" page
 (#3371)

* Added Markdown formatting in all the fields of the "About" page

Fixes https://github.com/Chocobozzz/PeerTube/issues/3368

* Fixed compilation error in AboutInstanceComponent

Moved creationReason, maintenanceLifetime and businessModel into the html dict

* Removed textareaHeight for all md textareas in EditCustomConfig HTML

* Fixed failing bundlewatch
---
 .../+about/about-instance/about-instance.component.html    | 14 +++++++-------
 .../app/+about/about-instance/about-instance.component.ts  | 11 +++--------
 2 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'client/src/app/+about')

diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html
index 045bb3fbc..bb337fdf3 100644
--- a/client/src/app/+about/about-instance/about-instance.component.html
+++ b/client/src/app/+about/about-instance/about-instance.component.html
@@ -21,7 +21,7 @@
 
     <div class="anchor" id="administrators-and-sustainability"></div>
     <a
-      *ngIf="html.administrator || maintenanceLifetime || businessModel"
+      *ngIf="html.administrator || html.maintenanceLifetime || html.businessModel"
       class="anchor-link"
       routerLink="/about/instance"
       fragment="administrators-and-sustainability"
@@ -47,7 +47,7 @@
       <div [innerHTML]="html.administrator"></div>
     </div>
 
-    <div class="block creation-reason" *ngIf="creationReason">
+    <div class="block creation-reason" *ngIf="html.creationReason">
       <div class="anchor" id="creation-reason"></div>
       <a
         class="anchor-link"
@@ -58,10 +58,10 @@
         <h3 i18n class="section-title">Why we created this instance</h3>
       </a>
 
-      <p>{{ creationReason }}</p>
+      <div [innerHTML]="html.creationReason"></div>
     </div>
 
-    <div class="block maintenance-lifetime" *ngIf="maintenanceLifetime">
+    <div class="block maintenance-lifetime" *ngIf="html.maintenanceLifetime">
       <div class="anchor" id="maintenance-lifetime"></div>
       <a
         class="anchor-link"
@@ -72,10 +72,10 @@
         <h3 i18n class="section-title">How long we plan to maintain this instance</h3>
       </a>
 
-      <p>{{ maintenanceLifetime }}</p>
+      <div [innerHTML]="html.maintenanceLifetime"></div>
     </div>
 
-    <div class="block business-model" *ngIf="businessModel">
+    <div class="block business-model" *ngIf="html.businessModel">
         <div class="anchor" id="business-model"></div>
         <a
           class="anchor-link"
@@ -86,7 +86,7 @@
           <h3 i18n class="section-title">How we will pay for this instance</h3>
         </a>
 
-      <p>{{ businessModel }}</p>
+      <div [innerHTML]="html.businessModel"></div>
     </div>
 
     <div class="anchor" id="information"></div>
diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts
index 92ecd5263..7eb382a46 100644
--- a/client/src/app/+about/about-instance/about-instance.component.ts
+++ b/client/src/app/+about/about-instance/about-instance.component.ts
@@ -24,13 +24,12 @@ export class AboutInstanceComponent implements OnInit, AfterViewChecked {
     codeOfConduct: '',
     moderationInformation: '',
     administrator: '',
+    creationReason: '',
+    maintenanceLifetime: '',
+    businessModel: '',
     hardwareInformation: ''
   }
 
-  creationReason = ''
-  maintenanceLifetime = ''
-  businessModel = ''
-
   languages: string[] = []
   categories: string[] = []
 
@@ -69,10 +68,6 @@ export class AboutInstanceComponent implements OnInit, AfterViewChecked {
 
     this.shortDescription = about.instance.shortDescription
 
-    this.creationReason = about.instance.creationReason
-    this.maintenanceLifetime = about.instance.maintenanceLifetime
-    this.businessModel = about.instance.businessModel
-
     this.html = await this.instanceService.buildHtml(about)
 
     this.initialized = true
-- 
cgit v1.2.3