Cleanup menu footer links

4 files changed, 40 insertions, 27 deletions

diff --git a/client/src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.html
index b12184ddc..6119e7380 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.html
@@ -1,4 +1,18 @@
 <form role="form" (ngSubmit)="updateInterfaceSettings()" [formGroup]="form">
+
+  <div class="form-group">
+    <label i18n for="theme">Interface language</label>
+
+    <div class="peertube-select-container">
+      <select formControlName="theme" id="theme" class="form-control">
+        <option i18n value="instance-default">instance default</option>
+        <option i18n value="default">peertube default</option>
+
+        <option *ngFor="let theme of availableThemes" [value]="theme">{{ theme }}</option>
+      </select>
+    </div>
+  </div>
+
   <div class="form-group">
     <label i18n for="theme">Theme</label>
 
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index f1c131184..32e48d6b6 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -149,29 +149,29 @@
         </a>
       </div>
 
-      <div class="d-flex flex-column">
-        <div class="footer-links">
-          <a i18n routerLink="/about/instance">Contact</a>
-          <a i18n routerLink="/about/instance">Terms of Service</a>
-          <a i18n routerLink="/about/instance" fragment="statistics">Stats</a>
-          <a (click)="openLanguageChooser()" class="c-hand">
-            <span i18n>Interface: {{ language }}</span>
-          </a>
-        </div>
+      <div class="bottom-links">
+
         <div class="footer-links">
-          <a i18n href="https://joinpeertube.org/#you-are-a-video-maker" i18n-title title="Creator guide" target="_blank" rel="noopener noreferrer">Creators</a>
-          <a i18n href="https://docs.joinpeertube.org/#/contribute-getting-started" i18n-title title="PeerTube license" target="_blank" rel="noopener noreferrer">Contributors</a>
-          <a i18n routerLink="/about/peertube" i18n-title title="More information about privacy within PeerTube">Privacy</a>
-          <a i18n href="https://joinpeertube.org/faq" i18n-title title="Frequently asked questions about PeerTube" target="_blank" rel="noopener noreferrer">FAQ</a>
-          <a i18n href="https://docs.joinpeertube.org/api-rest-reference.html" i18n-title title="API documentation" target="_blank" rel="noopener noreferrer">API</a>
-          <a i18n href="https://joinpeertube.org/help" i18n-title title="Get help using PeerTube" target="_blank" rel="noopener noreferrer">Help</a>
-          <a (click)="openHotkeysCheatSheet()" class="c-hand" i18n>Shortcuts</a>
+          <div *ngIf="isLoggedIn === false">
+            <span role="button" (click)="openLanguageChooser()" class="c-hand" i18n>Interface: {{ language }}</span>
+          </div>
+
+          <div>
+            <a i18n routerLink="/about/instance">Contact</a>
+            <a i18n href="https://joinpeertube.org/help" i18n-title title="Get help using PeerTube" target="_blank" rel="noopener noreferrer">Help</a>
+            <a i18n href="https://joinpeertube.org/faq" i18n-title title="Frequently asked questions about PeerTube" target="_blank" rel="noopener noreferrer">FAQ</a>
+            <a i18n routerLink="/about/instance" fragment="statistics">Stats</a>
+            <a i18n href="https://docs.joinpeertube.org/api-rest-reference.html" i18n-title title="API documentation" target="_blank" rel="noopener noreferrer">API</a>
+            <a (click)="openHotkeysCheatSheet()" class="c-hand" i18n>Shortcuts</a>
+          </div>
         </div>
+
         <div class="footer-copyleft">
           <small class="d-inline" i18n-title title="powered by PeerTube - CopyLeft 2015-2020">
             <a href="https://joinpeertube.org" i18n-title title="PeerTube website" target="_blank" rel="noopener noreferrer" i18n>
               powered by PeerTube
             </a>
+
             <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" i18n-title title="PeerTube license" target="_blank" rel="noopener noreferrer">
               <span aria-label="copyleft" class="d-inline-block" style="transform: rotateY(180deg)">&copy;</span> 2015-2020
             </a>
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index a4b1ec000..9ae40493d 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -185,21 +185,21 @@ menu {
     width: $menu-width;
     padding-bottom: 15px;
 
-    & > div:not(.panel-block) {
-      padding-left: $menu-lateral-padding;
-      padding-right: $menu-lateral-padding;
-      row-gap: 1em;
+    .bottom-links {
+      display: flex;
+      flex-direction: column;
+      padding: 0 $menu-lateral-padding;
     }
 
     $footer-links-base-opacity: .8;
 
     .footer-links {
-      display: inline-flex;
-      flex-wrap: wrap;
-
-      & > a {
-        @include disable-default-a-behaviour;
+      &, > div {
+        display: flex;
+        flex-wrap: wrap;
+      }
 
+      a, span[role=button] {
         display: inline-block;
         text-decoration: none;
         color: var(--mainBackgroundColor);
@@ -218,7 +218,7 @@ menu {
 
           my-global-icon {
             @include apply-svg-color(var(--mainBackgroundColor));
-        
+
             display: flex;
             width: auto;
             height: 90%;
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 56ada6b9e..6a272494b 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -13,7 +13,6 @@
   }
 }
 
-
 @mixin ellipsis {
   white-space: nowrap;
   overflow: hidden;