From d29796a7f0e31cbf8e8eba1a7115e9c965b40c50 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Tue, 13 Jun 2017 10:34:27 +0800 Subject: [PATCH] feat(users): change score/status menu position --- .../controllers/header.client.controller.js | 7 ++-- .../core/client/views/header.client.view.html | 3 ++ .../client/config/messages.client.menus.js | 30 ++------------ .../users/client/config/users.client.menus.js | 39 +++++++++++++++++++ 4 files changed, 49 insertions(+), 30 deletions(-) create mode 100644 modules/users/client/config/users.client.menus.js diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js index f118f622..d3587fae 100644 --- a/modules/core/client/controllers/header.client.controller.js +++ b/modules/core/client/controllers/header.client.controller.js @@ -15,9 +15,10 @@ vm.signConfig = MeanTorrentConfig.meanTorrentConfig.sign; vm.accountMenu = menuService.getMenu('account').items[0]; - vm.messagesMenu = menuService.getMenu('mt').items[0]; - vm.statusMenu = menuService.getMenu('mt').items[1]; - vm.scoreMenu = menuService.getMenu('mt').items[2]; + vm.messagesMenu = menuService.getMenu('mt-message').items[0]; + vm.statusMenu = menuService.getMenu('mt-user').items[0]; + vm.scoreMenu = menuService.getMenu('mt-user').items[1]; + vm.inviteMenu = menuService.getMenu('mt-invite').items[0]; vm.authentication = Authentication; vm.isCollapsed = false; vm.menu = menuService.getMenu('topbar'); diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html index f237f6b8..71c8bd49 100644 --- a/modules/core/client/views/header.client.view.html +++ b/modules/core/client/views/header.client.view.html @@ -51,6 +51,9 @@ +
  • + +
  • diff --git a/modules/messages/client/config/messages.client.menus.js b/modules/messages/client/config/messages.client.menus.js index 942fcc71..fb1b8474 100644 --- a/modules/messages/client/config/messages.client.menus.js +++ b/modules/messages/client/config/messages.client.menus.js @@ -8,44 +8,20 @@ menuConfig.$inject = ['menuService']; function menuConfig(menuService) { - menuService.addMenu('mt', { + menuService.addMenu('mt-message', { roles: ['user'] }); - menuService.addMenuItem('mt', { + menuService.addMenuItem('mt-message', { title: '', state: 'messages', type: 'dropdown', roles: ['user'] }); - menuService.addMenuItem('mt', { - title: '', - state: 'status', - type: 'dropdown', - roles: ['user'] - }); - - menuService.addMenuItem('mt', { - title: '', - state: 'score', - type: 'dropdown', - roles: ['user'] - }); - - menuService.addSubMenuItem('mt', 'messages', { + menuService.addSubMenuItem('mt-message', 'messages', { title: 'MENU_MESSAGE_INBOX', state: 'messages.inbox' }); - - menuService.addSubMenuItem('mt', 'status', { - title: 'MENU_ACCOUNT_STATUS', - state: 'status.account' - }); - - menuService.addSubMenuItem('mt', 'score', { - title: 'MENU_SCORE_LEVEL', - state: 'score.detail' - }); } }()); diff --git a/modules/users/client/config/users.client.menus.js b/modules/users/client/config/users.client.menus.js new file mode 100644 index 00000000..82a507ff --- /dev/null +++ b/modules/users/client/config/users.client.menus.js @@ -0,0 +1,39 @@ +(function () { + 'use strict'; + + angular + .module('core') + .run(menuConfig); + + menuConfig.$inject = ['menuService']; + + function menuConfig(menuService) { + menuService.addMenu('mt-user', { + roles: ['user'] + }); + + menuService.addMenuItem('mt-user', { + title: '', + state: 'status', + type: 'dropdown', + roles: ['user'] + }); + + menuService.addMenuItem('mt-user', { + title: '', + state: 'score', + type: 'dropdown', + roles: ['user'] + }); + + menuService.addSubMenuItem('mt-user', 'status', { + title: 'MENU_ACCOUNT_STATUS', + state: 'status.account' + }); + + menuService.addSubMenuItem('mt-user', 'score', { + title: 'MENU_SCORE_LEVEL', + state: 'score.detail' + }); + } +}());