X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.ts;h=371beb4a579620775cf8a152fc162349ceaa2d8a;hb=c5a1ae500e68b759f76851552be6dd10631d34f4;hp=22ddfad0226ab61c0ae035f806fdd6fdff7d812d;hpb=8c985ef5cee948093a0c44bf9f09a96374a061d3;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts
index 22ddfad02..371beb4a5 100644
--- a/client/src/app/menu/menu.component.ts
+++ b/client/src/app/menu/menu.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { UserRight } from '../../../../shared/models/users/user-right.enum'
-import { AuthService, AuthStatus, RedirectService, ServerService } from '../core'
+import { AuthService, AuthStatus, RedirectService, ServerService, ThemeService } from '../core'
 import { User } from '../shared/users/user.model'
 import { LanguageChooserComponent } from '@app/menu/language-chooser.component'
-import { Hotkey, HotkeysService } from 'angular2-hotkeys'
+import { HotkeysService } from 'angular2-hotkeys'
 
 @Component({
   selector: 'my-menu',
@@ -16,21 +16,22 @@ export class MenuComponent implements OnInit {
   user: User
   isLoggedIn: boolean
   userHasAdminAccess = false
-  hotkeys: Hotkey[]
+  helpVisible = false
 
-  private routesPerRight = {
+  private routesPerRight: { [ role in UserRight ]?: string } = {
     [UserRight.MANAGE_USERS]: '/admin/users',
     [UserRight.MANAGE_SERVER_FOLLOW]: '/admin/friends',
-    [UserRight.MANAGE_VIDEO_ABUSES]: '/admin/video-abuses',
-    [UserRight.MANAGE_VIDEO_BLACKLIST]: '/admin/video-blacklist'
+    [UserRight.MANAGE_VIDEO_ABUSES]: '/admin/moderation/video-abuses',
+    [UserRight.MANAGE_VIDEO_BLACKLIST]: '/admin/moderation/video-blacklist',
+    [UserRight.MANAGE_JOBS]: '/admin/jobs',
+    [UserRight.MANAGE_CONFIGURATION]: '/admin/config'
   }
-  private theme = document.querySelector('body')
-  private previousTheme = { }
 
   constructor (
     private authService: AuthService,
     private serverService: ServerService,
     private redirectService: RedirectService,
+    private themeService: ThemeService,
     private hotkeysService: HotkeysService
   ) {}
 
@@ -57,20 +58,9 @@ export class MenuComponent implements OnInit {
       }
     )
 
-    // initialise the alternative theme with dark theme colors
-    this.previousTheme['mainBackgroundColor'] = '#111111'
-    this.previousTheme['mainForegroundColor'] = '#fff'
-    this.previousTheme['submenuColor'] = 'rgb(32,32,32)'
-    this.previousTheme['inputColor'] = 'gray'
-    this.previousTheme['inputPlaceholderColor'] = '#fff'
-
-    this.hotkeys = [
-      new Hotkey('T', (event: KeyboardEvent): boolean => {
-        this.toggleDarkTheme()
-        return false
-      }, undefined, 'Toggle Dark theme')
-    ]
-    this.hotkeysService.add(this.hotkeys)
+    this.hotkeysService.cheatSheetToggle.subscribe(isOpen => {
+      this.helpVisible = isOpen
+    })
   }
 
   isRegistrationAllowed () {
@@ -86,7 +76,9 @@ export class MenuComponent implements OnInit {
       UserRight.MANAGE_USERS,
       UserRight.MANAGE_SERVER_FOLLOW,
       UserRight.MANAGE_VIDEO_ABUSES,
-      UserRight.MANAGE_VIDEO_BLACKLIST
+      UserRight.MANAGE_VIDEO_BLACKLIST,
+      UserRight.MANAGE_JOBS,
+      UserRight.MANAGE_CONFIGURATION
     ]
 
     for (const adminRight of adminRights) {
@@ -116,19 +108,12 @@ export class MenuComponent implements OnInit {
     this.languageChooserModal.show()
   }
 
-  toggleDarkTheme () {
-    // switch properties
-    this.switchProperty('mainBackgroundColor')
-    this.switchProperty('mainForegroundColor')
-    this.switchProperty('submenuColor')
-    this.switchProperty('inputColor')
-    this.switchProperty('inputPlaceholderColor')
+  openHotkeysCheatSheet () {
+    this.hotkeysService.cheatSheetToggle.next(!this.helpVisible)
   }
 
-  private switchProperty (property, newValue?) {
-    const propertyOldvalue = window.getComputedStyle(this.theme).getPropertyValue('--' + property)
-    this.theme.style.setProperty('--' + property, (newValue) ? newValue : this.previousTheme[property])
-    this.previousTheme[property] = propertyOldvalue
+  toggleDarkTheme () {
+    this.themeService.toggleDarkTheme()
   }
 
   private computeIsUserHasAdminAccess () {