diff --git a/modules/articles/client/config/articles.client.menus.js b/modules/articles/client/config/articles.client.menus.js
index c0f5ee94..1d5d4548 100644
--- a/modules/articles/client/config/articles.client.menus.js
+++ b/modules/articles/client/config/articles.client.menus.js
@@ -12,7 +12,9 @@
title: 'Articles',
state: 'articles',
type: 'dropdown',
- roles: ['*']
+ roles: ['*'],
+ position: 20
+
});
// Add the dropdown list item
diff --git a/modules/chat/client/config/chat.client.menus.js b/modules/chat/client/config/chat.client.menus.js
index 2226c9af..c4e377c1 100644
--- a/modules/chat/client/config/chat.client.menus.js
+++ b/modules/chat/client/config/chat.client.menus.js
@@ -5,13 +5,14 @@
.module('chat')
.run(menuConfig);
- menuConfig.$inject = ['menuService'];
+ menuConfig.$inject = ['menuService', '$translate'];
- function menuConfig(menuService) {
+ function menuConfig(menuService, $translate) {
// Set top bar menu items
menuService.addMenuItem('topbar', {
- title: 'Chat',
- state: 'chat'
+ title: $translate.instant('MENU_CHAT'),
+ state: 'chat',
+ position: 10
});
}
}());
diff --git a/modules/core/client/app/trans-string-cn.js b/modules/core/client/app/trans-string-cn.js
index 373c8a5c..3189acd2 100644
--- a/modules/core/client/app/trans-string-cn.js
+++ b/modules/core/client/app/trans-string-cn.js
@@ -15,7 +15,12 @@
var stringcn = {
COMINGSOON: '开发中,请稍候...',
- //client menu
+ //topbar menu
+ MENU_CHAT: '聊天室',
+ MENU_TORRENTS: '种子',
+ MENU_FORUMS: '论坛',
+
+ //client account menu
SIGNOUT: '退出登录',
SIGNIN: '登录',
SIGNUP: '注册',
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 969e6767..515b8fa2 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -15,6 +15,11 @@
var stringen = {
COMINGSOON: 'coming soon...',
+ //client menu
+ MENU_CHAT: 'Chat',
+ MENU_TORRENTS: 'Torrents',
+ MENU_FORUMS: 'Forums',
+
//client menu
SIGNOUT: 'Signout',
SIGNIN: 'Sign In',
diff --git a/modules/core/client/config/core-admin.client.menus.js b/modules/core/client/config/core-admin.client.menus.js
index f1472d6c..8e0f6a23 100644
--- a/modules/core/client/config/core-admin.client.menus.js
+++ b/modules/core/client/config/core-admin.client.menus.js
@@ -12,7 +12,8 @@
title: 'Admin',
state: 'admin',
type: 'dropdown',
- roles: ['admin']
+ roles: ['admin'],
+ position: 11
});
}
}());
diff --git a/modules/core/client/config/core.client.menus.js b/modules/core/client/config/core.client.menus.js
index 8fa3dd7a..cd8a702d 100644
--- a/modules/core/client/config/core.client.menus.js
+++ b/modules/core/client/config/core.client.menus.js
@@ -5,7 +5,7 @@
.module('core')
.run(menuConfig);
- menuConfig.$inject = ['menuService', '$translate', '$filter'];
+ menuConfig.$inject = ['menuService', '$translate'];
function menuConfig(menuService, $translate) {
menuService.addMenu('account', {
diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js
index f4330668..7b303653 100644
--- a/modules/core/client/controllers/home.client.controller.js
+++ b/modules/core/client/controllers/home.client.controller.js
@@ -5,7 +5,13 @@
.module('core')
.controller('HomeController', HomeController);
- function HomeController() {
+ HomeController.$inject = ['$scope', '$translate'];
+
+ function HomeController($scope, $translate) {
var vm = this;
+
+ //$translate.use('en');
+
+ vm.COMING = 'coming soon...';
}
}());
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index b3ac5afe..8f242fd2 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