From 56af5222c1ab3d6aaa76b1237bfa381ecc4878b1 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 5 Dec 2018 14:53:13 +0100
Subject: Put features table in about page

---
 .../about-instance/about-instance.component.html   | 63 ++++++++++++----------
 client/src/app/signup/signup.component.html        |  2 +-
 2 files changed, 37 insertions(+), 28 deletions(-)

(limited to 'client/src/app')

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 5970cac01..37ff795f5 100644
--- a/client/src/app/+about/about-instance/about-instance.component.html
+++ b/client/src/app/+about/about-instance/about-instance.component.html
@@ -1,39 +1,48 @@
-<div i18n class="about-instance-title">
-  About {{ instanceName }} instance
-</div>
+<div class="row">
+  <div class="col-md-12 col-xl-6">
+    <div i18n class="about-instance-title">
+      About {{ instanceName }} instance
+    </div>
 
-<div class="short-description">
-  <div>{{ shortDescription }}</div>
-</div>
+    <div class="short-description">
+      <div>{{ shortDescription }}</div>
+    </div>
 
-<div class="description">
-  <div i18n class="section-title">Description</div>
+    <div class="description">
+      <div i18n class="section-title">Description</div>
 
-  <div [innerHTML]="descriptionHTML"></div>
-</div>
+      <div [innerHTML]="descriptionHTML"></div>
+    </div>
 
-<div class="terms" id="terms-section">
-  <div i18n class="section-title">Terms</div>
+    <div class="terms" id="terms-section">
+      <div i18n class="section-title">Terms</div>
 
-  <div [innerHTML]="termsHTML"></div>
-</div>
+      <div [innerHTML]="termsHTML"></div>
+    </div>
+
+    <div class="signup">
+      <div i18n class="section-title">Signup</div>
 
-<div class="signup">
-  <div i18n class="section-title">Signup</div>
+      <div *ngIf="isSignupAllowed">
+        <ng-container i18n>User registration is allowed and</ng-container>
 
-  <div *ngIf="isSignupAllowed">
-    <ng-container i18n>User registration is allowed and</ng-container>
+        <ng-container i18n *ngIf="userVideoQuota !== -1">
+          this instance provides a baseline quota of {{ userVideoQuota | bytes: 0 }} space for the videos of its users.
+        </ng-container>
 
-    <ng-container i18n *ngIf="userVideoQuota !== -1">
-      this instance provides a baseline quota of {{ userVideoQuota | bytes: 0 }} space for the videos of its users.
-    </ng-container>
+        <ng-container i18n *ngIf="userVideoQuota === -1">
+          this instance provides unlimited space for the videos of its users.
+        </ng-container>
+      </div>
 
-    <ng-container i18n *ngIf="userVideoQuota === -1">
-      this instance provides unlimited space for the videos of its users.
-    </ng-container>
+      <div i18n *ngIf="isSignupAllowed === false">
+        User registration is currently not allowed.
+      </div>
+    </div>
   </div>
 
-  <div i18n *ngIf="isSignupAllowed === false">
-    User registration is currently not allowed.
+  <div class="col-md-12 col-xl-6">
+    <label>Features found on this instance</label>
+    <my-instance-features-table></my-instance-features-table>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/client/src/app/signup/signup.component.html b/client/src/app/signup/signup.component.html
index 0207a166e..07d24b381 100644
--- a/client/src/app/signup/signup.component.html
+++ b/client/src/app/signup/signup.component.html
@@ -64,7 +64,7 @@
     </form>
 
     <div>
-      <label for="email" i18n>Features found on this instance</label>
+      <label i18n>Features found on this instance</label>
       <my-instance-features-table></my-instance-features-table>
     </div>
   </div>
-- 
cgit v1.2.3