aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-09-05 09:43:35 +0200
committerChocobozzz <chocobozzz@cpy.re>2019-09-05 10:17:02 +0200
commitbe04c6fdab5d91a7a57fa3ff36cde22a549c29da (patch)
treeb273cfb4cf3d0b73b12a1b9bb25884851255fc7e /client/src/app
parent592c735c19b25e9b38f82d90d15a81307902ed62 (diff)
downloadPeerTube-be04c6fdab5d91a7a57fa3ff36cde22a549c29da.tar.gz
PeerTube-be04c6fdab5d91a7a57fa3ff36cde22a549c29da.tar.zst
PeerTube-be04c6fdab5d91a7a57fa3ff36cde22a549c29da.zip
Add hardware information in instance config
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/+about/about-instance/about-instance.component.html12
-rw-r--r--client/src/app/+about/about-instance/about-instance.component.ts3
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html14
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts2
-rw-r--r--client/src/app/shared/instance/instance.service.ts5
5 files changed, 32 insertions, 4 deletions
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 8b21137af..9499bbe4e 100644
--- a/client/src/app/+about/about-instance/about-instance.component.html
+++ b/client/src/app/+about/about-instance/about-instance.component.html
@@ -73,11 +73,21 @@
73 <div [innerHTML]="html.codeOfConduct"></div> 73 <div [innerHTML]="html.codeOfConduct"></div>
74 </div> 74 </div>
75 75
76 <div class="block terms" id="terms-section"> 76 <div class="block terms">
77 <div i18n class="section-title">Terms</div> 77 <div i18n class="section-title">Terms</div>
78 78
79 <div [innerHTML]="html.terms"></div> 79 <div [innerHTML]="html.terms"></div>
80 </div> 80 </div>
81
82 <div class="middle-title" *ngIf="html.hardwareInformation">
83 Other information
84 </div>
85
86 <div class="block hardware-information">
87 <div i18n class="section-title">Hardware information</div>
88
89 <div [innerHTML]="html.hardwareInformation"></div>
90 </div>
81 </div> 91 </div>
82 92
83 <div class="col-md-12 col-xl-6"> 93 <div class="col-md-12 col-xl-6">
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 b6cade4fe..16ccae2e2 100644
--- a/client/src/app/+about/about-instance/about-instance.component.ts
+++ b/client/src/app/+about/about-instance/about-instance.component.ts
@@ -22,7 +22,8 @@ export class AboutInstanceComponent implements OnInit {
22 terms: '', 22 terms: '',
23 codeOfConduct: '', 23 codeOfConduct: '',
24 moderationInformation: '', 24 moderationInformation: '',
25 administrator: '' 25 administrator: '',
26 hardwareInformation: ''
26 } 27 }
27 28
28 creationReason = '' 29 creationReason = ''
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index ef24e5b24..54115055a 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -174,6 +174,20 @@
174 <div *ngIf="formErrors.instance.businessModel" class="form-error">{{ formErrors.instance.businessModel }}</div> 174 <div *ngIf="formErrors.instance.businessModel" class="form-error">{{ formErrors.instance.businessModel }}</div>
175 </div> 175 </div>
176 176
177 <div i18n class="inner-form-title">Other information</div>
178
179 <div class="form-group">
180 <label i18n for="instanceHardwareInformation">On what server/hardware the instance runs?</label>
181 <div class="label-small-info">2vCore 2GB RAM/or directly the link to the server you rent etc</div>
182
183 <my-markdown-textarea
184 id="instanceHardwareInformation" formControlName="hardwareInformation" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
185 [classes]="{ 'input-error': formErrors['instance.hardwareInformation'] }"
186 ></my-markdown-textarea>
187
188 <div *ngIf="formErrors.instance.hardwareInformation" class="form-error">{{ formErrors.instance.hardwareInformation }}</div>
189 </div>
190
177 </ng-container> 191 </ng-container>
178 </ng-template> 192 </ng-template>
179 </ngb-tab> 193 </ngb-tab>
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index e6f56bc97..0a69f3481 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -107,6 +107,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
107 maintenanceLifetime: null, 107 maintenanceLifetime: null,
108 businessModel: null, 108 businessModel: null,
109 109
110 hardwareInformation: null,
111
110 categories: null, 112 categories: null,
111 languages: null, 113 languages: null,
112 114
diff --git a/client/src/app/shared/instance/instance.service.ts b/client/src/app/shared/instance/instance.service.ts
index 7c76bc98b..44b413fa4 100644
--- a/client/src/app/shared/instance/instance.service.ts
+++ b/client/src/app/shared/instance/instance.service.ts
@@ -46,10 +46,11 @@ export class InstanceService {
46 terms: '', 46 terms: '',
47 codeOfConduct: '', 47 codeOfConduct: '',
48 moderationInformation: '', 48 moderationInformation: '',
49 administrator: '' 49 administrator: '',
50 hardwareInformation: ''
50 } 51 }
51 52
52 for (const key of [ 'description', 'terms', 'codeOfConduct', 'moderationInformation', 'administrator' ]) { 53 for (const key of Object.keys(html)) {
53 html[ key ] = await this.markdownService.textMarkdownToHTML(about.instance[ key ]) 54 html[ key ] = await this.markdownService.textMarkdownToHTML(about.instance[ key ])
54 } 55 }
55 56