diff options
author | Chocobozzz <me@florianbigard.com> | 2018-05-23 10:41:08 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-05-23 10:41:08 +0200 |
commit | 45c0fb35eb3904cbea91ff1ee450d308bbb4ebdb (patch) | |
tree | d70e91662e633079d862412f884538b441eef842 /client/src | |
parent | b365bb43c2f399dfc5191443956a8c48373fbffc (diff) | |
download | PeerTube-45c0fb35eb3904cbea91ff1ee450d308bbb4ebdb.tar.gz PeerTube-45c0fb35eb3904cbea91ff1ee450d308bbb4ebdb.tar.zst PeerTube-45c0fb35eb3904cbea91ff1ee450d308bbb4ebdb.zip |
Add short description in about page
Diffstat (limited to 'client/src')
-rw-r--r-- | client/src/app/about/about.component.html | 4 | ||||
-rw-r--r-- | client/src/app/about/about.component.scss | 2 | ||||
-rw-r--r-- | client/src/app/about/about.component.ts | 2 |
3 files changed, 7 insertions, 1 deletions
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 @@ | |||
3 | Welcome to the {{ instanceName }} instance | 3 | Welcome to the {{ instanceName }} instance |
4 | </div> | 4 | </div> |
5 | 5 | ||
6 | <div class="short-description"> | ||
7 | <div>{{ shortDescription }}</div> | ||
8 | </div> | ||
9 | |||
6 | <div class="description"> | 10 | <div class="description"> |
7 | <div class="section-title">Description</div> | 11 | <div class="section-title">Description</div> |
8 | 12 | ||
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 @@ | |||
7 | margin-bottom: 5px; | 7 | margin-bottom: 5px; |
8 | } | 8 | } |
9 | 9 | ||
10 | .description, .terms, .signup { | 10 | .short-description, .description, .terms, .signup { |
11 | margin-bottom: 30px; | 11 | margin-bottom: 30px; |
12 | } | 12 | } |
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' | |||
10 | }) | 10 | }) |
11 | 11 | ||
12 | export class AboutComponent implements OnInit { | 12 | export class AboutComponent implements OnInit { |
13 | shortDescription = '' | ||
13 | descriptionHTML = '' | 14 | descriptionHTML = '' |
14 | termsHTML = '' | 15 | termsHTML = '' |
15 | 16 | ||
@@ -35,6 +36,7 @@ export class AboutComponent implements OnInit { | |||
35 | this.serverService.getAbout() | 36 | this.serverService.getAbout() |
36 | .subscribe( | 37 | .subscribe( |
37 | res => { | 38 | res => { |
39 | this.shortDescription = res.instance.shortDescription | ||
38 | this.descriptionHTML = this.markdownService.textMarkdownToHTML(res.instance.description) | 40 | this.descriptionHTML = this.markdownService.textMarkdownToHTML(res.instance.description) |
39 | this.termsHTML = this.markdownService.textMarkdownToHTML(res.instance.terms) | 41 | this.termsHTML = this.markdownService.textMarkdownToHTML(res.instance.terms) |
40 | }, | 42 | }, |