From: Chocobozzz <me@florianbigard.com>
Date: Wed, 23 May 2018 08:41:08 +0000 (+0200)
Subject: Add short description in about page
X-Git-Tag: v1.0.0-beta.7~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=45c0fb35eb3904cbea91ff1ee450d308bbb4ebdb;p=oweals%2Fpeertube.git

Add short description in about page
---

diff --git a/client/src/app/about/about.component.html b/client/src/app/about/about.component.html
index bc6a8c6f3..6fa856742 100644
--- a/client/src/app/about/about.component.html
+++ b/client/src/app/about/about.component.html
@@ -3,6 +3,10 @@
     Welcome to the {{ instanceName }} instance
   </div>
 
+  <div class="short-description">
+    <div>{{ shortDescription }}</div>
+  </div>
+
   <div class="description">
     <div class="section-title">Description</div>
 
diff --git a/client/src/app/about/about.component.scss b/client/src/app/about/about.component.scss
index 2a22b9528..a63cd229c 100644
--- a/client/src/app/about/about.component.scss
+++ b/client/src/app/about/about.component.scss
@@ -7,6 +7,6 @@
   margin-bottom: 5px;
 }
 
-.description, .terms, .signup {
+.short-description, .description, .terms, .signup {
   margin-bottom: 30px;
 }
diff --git a/client/src/app/about/about.component.ts b/client/src/app/about/about.component.ts
index 2fd48f0d3..3948d5c46 100644
--- a/client/src/app/about/about.component.ts
+++ b/client/src/app/about/about.component.ts
@@ -10,6 +10,7 @@ import { NotificationsService } from 'angular2-notifications'
 })
 
 export class AboutComponent implements OnInit {
+  shortDescription = ''
   descriptionHTML = ''
   termsHTML = ''
 
@@ -35,6 +36,7 @@ export class AboutComponent implements OnInit {
     this.serverService.getAbout()
       .subscribe(
         res => {
+          this.shortDescription = res.instance.shortDescription
           this.descriptionHTML = this.markdownService.textMarkdownToHTML(res.instance.description)
           this.termsHTML = this.markdownService.textMarkdownToHTML(res.instance.terms)
         },