Client: simplify simple menu/admin menu displaying logic

6 files changed, 11 insertions, 29 deletions

diff --git a/client/src/app/admin/menu-admin.component.html b/client/src/app/admin/menu-admin.component.html
index 26a3f3492..f821974bd 100644
--- a/client/src/app/admin/menu-admin.component.html
+++ b/client/src/app/admin/menu-admin.component.html
@@ -15,7 +15,7 @@
   <div class="panel-block">
     <div id="panel-quit-administration" class="panel-button">
       <span class="hidden-xs glyphicon glyphicon-cog"></span>
-      <a [routerLink]="['/videos/list']" (click)="quitAdmin()">Quit admin.</a>
+      <a [routerLink]="['/videos/list']">Quit admin.</a>
     </div>
   </div>
 </menu>
diff --git a/client/src/app/admin/menu-admin.component.ts b/client/src/app/admin/menu-admin.component.ts
index b23f7409e..788592872 100644
--- a/client/src/app/admin/menu-admin.component.ts
+++ b/client/src/app/admin/menu-admin.component.ts
@@ -1,4 +1,4 @@
-import { Component, Output, EventEmitter } from '@angular/core';
+import { Component } from '@angular/core';
 import { ROUTER_DIRECTIVES } from '@angular/router';
 
 @Component({
@@ -6,10 +6,4 @@ import { ROUTER_DIRECTIVES } from '@angular/router';
   template: require('./menu-admin.component.html'),
   directives: [ ROUTER_DIRECTIVES ]
 })
-export class MenuAdminComponent {
-  @Output() quittedAdmin = new EventEmitter<boolean>();
-
-  quitAdmin() {
-    this.quittedAdmin.emit(true);
-  }
-}
+export class MenuAdminComponent { }
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index a7538ee7a..ead491968 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -14,14 +14,11 @@
 
 
   <div class="row">
-    <my-menu *ngIf="isInAdmin === false" (enteredInAdmin)="onEnteredInAdmin()"></my-menu>
-    <my-menu-admin *ngIf="isInAdmin === true" (quittedAdmin)="onQuittedAdmin()"></my-menu-admin>
+    <my-menu *ngIf="isInAdmin() === false"></my-menu>
+    <my-menu-admin *ngIf="isInAdmin() === true"></my-menu-admin>
 
     <div class="col-md-9 col-sm-8 col-xs-8 router-outlet-container">
       <router-outlet></router-outlet>
-    </div>
-  </div>
-
 
   <footer>
     PeerTube, CopyLeft 2015-2016
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index d9549ad5b..2e0fd13f1 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { ROUTER_DIRECTIVES } from '@angular/router';
+import { Router, ROUTER_DIRECTIVES } from '@angular/router';
 
 import { MenuAdminComponent } from './admin';
 import { MenuComponent } from './menu.component';
@@ -15,13 +15,9 @@ import { VideoService } from './videos';
 })
 
 export class AppComponent {
-  isInAdmin = false;
+  constructor(private router: Router) {}
 
-  onEnteredInAdmin() {
-    this.isInAdmin = true;
-  }
-
-  onQuittedAdmin() {
-    this.isInAdmin = false;
+  isInAdmin() {
+    return this.router.url.indexOf('/admin/') !== -1;
   }
 }
diff --git a/client/src/app/menu.component.html b/client/src/app/menu.component.html
index 8ea99138d..29ef7f9cf 100644
--- a/client/src/app/menu.component.html
+++ b/client/src/app/menu.component.html
@@ -33,7 +33,7 @@
   <div class="panel-block" *ngIf="isUserAdmin()">
     <div id="panel-get-videos" class="panel-button">
       <span class="hidden-xs glyphicon glyphicon-cog"></span>
-      <a [routerLink]="['/admin']" (click)="enterInAdmin()">Administration</a>
+      <a [routerLink]="['/admin']">Administration</a>
     </div>
   </div>
 </menu>
diff --git a/client/src/app/menu.component.ts b/client/src/app/menu.component.ts
index 594cd996e..6b08301df 100644
--- a/client/src/app/menu.component.ts
+++ b/client/src/app/menu.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { Router, ROUTER_DIRECTIVES } from '@angular/router';
 
 import { AuthService, AuthStatus } from './shared';
@@ -9,7 +9,6 @@ import { AuthService, AuthStatus } from './shared';
   directives: [ ROUTER_DIRECTIVES ]
 })
 export class MenuComponent implements OnInit {
-  @Output() enteredInAdmin = new EventEmitter<boolean>();
   isLoggedIn: boolean;
 
   constructor (
@@ -35,10 +34,6 @@ export class MenuComponent implements OnInit {
     );
   }
 
-  enterInAdmin() {
-    this.enteredInAdmin.emit(true);
-  }
-
   isUserAdmin() {
     return this.authService.isAdmin();
   }