diff --git a/modules/chat/client/config/chat.client.menus.js b/modules/chat/client/config/chat.client.menus.js index c4e377c1..44077760 100644 --- a/modules/chat/client/config/chat.client.menus.js +++ b/modules/chat/client/config/chat.client.menus.js @@ -12,7 +12,8 @@ menuService.addMenuItem('topbar', { title: $translate.instant('MENU_CHAT'), state: 'chat', - position: 10 + roles: ['*'], + position: 2 }); } }()); diff --git a/modules/chat/client/config/chat.client.routes.js b/modules/chat/client/config/chat.client.routes.js index f69aff61..1a08d888 100644 --- a/modules/chat/client/config/chat.client.routes.js +++ b/modules/chat/client/config/chat.client.routes.js @@ -15,7 +15,7 @@ controller: 'ChatController', controllerAs: 'vm', data: { - roles: ['user', 'admin'], + //roles: ['user', 'admin'], pageTitle: 'Chat' } }); diff --git a/modules/core/client/app/trans-string-cn.js b/modules/core/client/app/trans-string-cn.js index 3189acd2..eb4c1835 100644 --- a/modules/core/client/app/trans-string-cn.js +++ b/modules/core/client/app/trans-string-cn.js @@ -15,10 +15,23 @@ var stringcn = { COMINGSOON: '开发中,请稍候...', - //topbar menu + //client topbar menu MENU_CHAT: '聊天室', MENU_TORRENTS: '种子', + MENU_UPLOAD: '发布', MENU_FORUMS: '论坛', + MENU_RANKING: '排行榜', + MENU_RULES: '规则', + MENU_VIP: 'VIP', + MENU_ADMIN: '管理中心', + + //sub menu of torrents + MENU_TORRENTS_SUB: { + SUB_MOVIE: '电影', + SUB_MTV: 'MTV', + SUB_MUSIC: '音乐', + SUB_OTHER: '其它' + }, //client account menu SIGNOUT: '退出登录', diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 515b8fa2..1b2b5a5e 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -15,10 +15,23 @@ var stringen = { COMINGSOON: 'coming soon...', - //client menu + //client topbar menu MENU_CHAT: 'Chat', MENU_TORRENTS: 'Torrents', + MENU_UPLOAD: 'Upload', MENU_FORUMS: 'Forums', + MENU_RANKING: 'Ranking', + MENU_RULES: 'Rules', + MENU_VIP: 'VIP', + MENU_ADMIN: 'Admin', + + //sub menu of torrents + MENU_TORRENTS_SUB: { + SUB_MOVIE: 'Movie', + SUB_MTV: 'MTV', + SUB_MUSIC: 'Music', + SUB_OTHER: 'Other' + }, //client menu SIGNOUT: 'Signout', diff --git a/modules/core/client/config/core-admin.client.menus.js b/modules/core/client/config/core-admin.client.menus.js index 8e0f6a23..9126cca9 100644 --- a/modules/core/client/config/core-admin.client.menus.js +++ b/modules/core/client/config/core-admin.client.menus.js @@ -5,15 +5,15 @@ .module('core.admin') .run(menuConfig); - menuConfig.$inject = ['menuService']; + menuConfig.$inject = ['menuService', '$translate']; - function menuConfig(menuService) { + function menuConfig(menuService, $translate) { menuService.addMenuItem('topbar', { - title: 'Admin', + title: $translate.instant('MENU_ADMIN'), state: 'admin', type: 'dropdown', roles: ['admin'], - position: 11 + position: 10 }); } }()); diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html index 8f242fd2..e3819707 100644 --- a/modules/core/client/views/header.client.view.html +++ b/modules/core/client/views/header.client.view.html @@ -6,7 +6,7 @@ - meanTorrent + meanTorrent