From 2e9fc87fb568f6952e843537f7b3073ba6d01079 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Wed, 8 Apr 2020 14:36:58 +0200 Subject: [PATCH] [DEV] update top menu --- .../src/app/component/top-menu/top-menu.html | 21 +++++++++++++++++-- .../src/app/component/top-menu/top-menu.less | 16 +++++++++++--- front/src/app/component/top-menu/top-menu.ts | 7 +++++++ 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/front/src/app/component/top-menu/top-menu.html b/front/src/app/component/top-menu/top-menu.html index 2b74274..9c7552c 100644 --- a/front/src/app/component/top-menu/top-menu.html +++ b/front/src/app/component/top-menu/top-menu.html @@ -79,7 +79,7 @@ style="float:right; height:56px;" (click)="onEdit()">
- edit Edit {{edit}} + edit Edit
edit @@ -88,7 +88,7 @@
-
+
+
+ +
+ +
+
+ +
+
\ No newline at end of file diff --git a/front/src/app/component/top-menu/top-menu.less b/front/src/app/component/top-menu/top-menu.less index ac7d6ce..8b9dfea 100644 --- a/front/src/app/component/top-menu/top-menu.less +++ b/front/src/app/component/top-menu/top-menu.less @@ -1,10 +1,8 @@ .top { - .user-menu { + .sub-menu { position: fixed; - top:75px; - right:15px; min-width:150px; min-height:70px; @@ -61,6 +59,18 @@ } } + .user-menu { + top:75px; + right:15px; + } + .edit-menu { + top:75px; + right:200px; + } + .edit-menu-mob { + top:75px; + right:25px; + } .fill-all { position: absolute; diff --git a/front/src/app/component/top-menu/top-menu.ts b/front/src/app/component/top-menu/top-menu.ts index ec3451e..587affe 100644 --- a/front/src/app/component/top-menu/top-menu.ts +++ b/front/src/app/component/top-menu/top-menu.ts @@ -22,6 +22,7 @@ export class TopMenuComponent implements OnInit { public login: string = null;//Session.getLogin(); public avatar: string = null;//Session.getAvatar(); public displayUserMenu: boolean = false; + public displayEditMenu: boolean = false; public ariane_type_id: number = null; public ariane_type_name: string = null; @@ -85,6 +86,7 @@ export class TopMenuComponent implements OnInit { onAvatar(): void { console.log("onAvatar() " + this.displayUserMenu); this.displayUserMenu = !this.displayUserMenu; + this.displayEditMenu = false; } updateEditable() { @@ -114,6 +116,9 @@ export class TopMenuComponent implements OnInit { } onEdit(): void { console.log("onEdit()"); + this.displayEditMenu = !this.displayEditMenu; + this.displayUserMenu = false; + /* if (this.arianeService.getVideoId() != null) { this.router.navigate(['video-edit/' + this.arianeService.getVideoId()]); return; @@ -135,6 +140,7 @@ export class TopMenuComponent implements OnInit { return; } this.edit = null; + */ } onHome(): void { @@ -177,6 +183,7 @@ export class TopMenuComponent implements OnInit { onOutUserProperty(): void { console.log("onOutUserProperty ==> event..."); this.displayUserMenu = false; + this.displayEditMenu = false; } onArianeType(): void {