Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-instance / instance-features-table.component.html

diff --git a/client/src/app/shared/shared-instance/instance-features-table.component.html b/client/src/app/shared/shared-instance/instance-features-table.component.html
index d505b673940e167afb6aeee359d4113d090d2d60..761243bfe7df3126cf7c2e3e13d37b0137ba4c5b 100644 (file)
--- a/client/src/app/shared/shared-instance/instance-features-table.component.html
+++ b/client/src/app/shared/shared-instance/instance-features-table.component.html
@@ -1,6 +1,6 @@
-<div class="feature-table">
+<div *ngIf="serverConfig" class="feature-table">
 
-  <table class="table" *ngIf="serverConfig">
+  <table *ngIf="serverConfig">
     <caption i18n>Features found on this instance</caption>
     <tr>
       <th i18n class="label" scope="row">PeerTube version</th>
@@ -74,14 +74,14 @@
       </td>
     </tr>
 
-    <tr>
+    <tr *ngIf="serverConfig.live.enabled">
       <th i18n class="sub-label" scope="row">Transcode live video in multiple resolutions</th>
       <td>
         <my-feature-boolean [value]="serverConfig.live.transcoding.enabled && serverConfig.live.transcoding.enabledResolutions.length > 1"></my-feature-boolean>
       </td>
     </tr>
 
-    <tr>
+    <tr *ngIf="serverConfig.live.enabled">
       <th i18n class="sub-label" scope="row">Max parallel lives</th>
       <td i18n>
         {{ maxUserLives }} per user / {{ maxInstanceLives }} per instance
@@ -106,26 +106,36 @@
       </td>
     </tr>
 
-
     <tr>
-      <th i18n class="label" colspan="2">Player</th>
+      <th i18n class="label" colspan="2">Search</th>
     </tr>
 
     <tr>
-      <th i18n class="sub-label" scope="row">P2P enabled</th>
+      <th i18n class="sub-label" scope="row">Users can resolve distant content</th>
       <td>
-        <my-feature-boolean [value]="serverConfig.tracker.enabled"></my-feature-boolean>
+        <my-feature-boolean [value]="serverConfig.search.remoteUri.users"></my-feature-boolean>
       </td>
     </tr>
 
     <tr>
-      <th i18n class="label" colspan="2">Search</th>
+      <th i18n class="label" colspan="2">Plugins & Themes</th>
     </tr>
 
     <tr>
-      <th i18n class="sub-label" scope="row">Users can resolve distant content</th>
+      <th i18n class="sub-label" scope="row">Available themes</th>
       <td>
-        <my-feature-boolean [value]="serverConfig.search.remoteUri.users"></my-feature-boolean>
+        <span class="theme" *ngFor="let theme of serverConfig.theme.registered">
+          {{ theme.name }}
+        </span>
+      </td>
+    </tr>
+
+    <tr>
+      <th i18n class="sub-label" scope="row">Plugins enabled</th>
+      <td>
+        <span class="plugin" *ngFor="let plugin of serverConfig.plugin.registered">
+          {{ plugin.name }}
+        </span>
       </td>
     </tr>
   </table>