Merge branch 'release/2.1.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / +about / about-instance / about-instance.component.html

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 25d41674079cecc99860a0a99015890c7c7bbfd0..fc5736aba4a5556d31022877d6c8a13a0c8a1fcb 100644 (file)
--- a/client/src/app/+about/about-instance/about-instance.component.html
+++ b/client/src/app/+about/about-instance/about-instance.component.html
@@ -2,7 +2,7 @@
   <div class="col-md-12 col-xl-6">
 
     <div class="about-instance-title">
-      <div i18n class="title">About {{ instanceName }} instance</div>
+      <div i18n class="title">About {{ instanceName }}</div>
 
       <div i18n *ngIf="isContactFormEnabled" (click)="openContactModal()" role="button" class="contact-admin">Contact administrator</div>
     </div>
@@ -42,7 +42,7 @@
     </div>
 
     <div class="block business-model" *ngIf="businessModel">
-      <div i18n class="section-title">How we will pay this instance</div>
+      <div i18n class="section-title">How we will pay for this instance</div>
 
       <p>{{ businessModel }}</p>
     </div>
@@ -83,7 +83,7 @@
       Other information
     </div>
 
-    <div class="block hardware-information">
+    <div class="block hardware-information" *ngIf="html.hardwareInformation">
       <div i18n class="section-title">Hardware information</div>
 
       <div [innerHTML]="html.hardwareInformation"></div>
@@ -94,6 +94,13 @@
     <label i18n>Features found on this instance</label>
     <my-instance-features-table></my-instance-features-table>
   </div>
+
+  <div class="col">
+    <div i18n class="middle-title">
+      Statistics
+    </div>
+    <my-instance-statistics></my-instance-statistics>
+  </div>
 </div>
 
 <my-contact-admin-modal #contactAdminModal></my-contact-admin-modal>