From 111ab49b06bd49bfa8b31e5329f7c8cc1f6797d5 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 26 Mar 2017 00:52:31 +0800
Subject: [PATCH] add many multilingual fields add torrents and forum topbar
 menu

---
 .../client/config/articles.client.menus.js    |  4 ++-
 .../chat/client/config/chat.client.menus.js   |  9 ++++---
 modules/core/client/app/trans-string-cn.js    |  7 ++++-
 modules/core/client/app/trans-string-en.js    |  5 ++++
 .../client/config/core-admin.client.menus.js  |  3 ++-
 .../core/client/config/core.client.menus.js   |  2 +-
 .../controllers/home.client.controller.js     |  8 +++++-
 .../core/client/views/header.client.view.html |  2 +-
 .../core/client/views/home.client.view.html   |  2 +-
 .../client/config/forums.client.menus.js      | 18 +++++++++++++
 .../client/config/forums.client.routes.js     | 23 ++++++++++++++++
 modules/forums/client/forums.client.module.js |  7 +++++
 .../client/config/torrents.client.menus.js    | 26 +++++++++++++++++++
 .../torrents/client/torrents.client.module.js |  7 +++++
 14 files changed, 112 insertions(+), 11 deletions(-)
 create mode 100644 modules/forums/client/config/forums.client.menus.js
 create mode 100644 modules/forums/client/config/forums.client.routes.js
 create mode 100644 modules/forums/client/forums.client.module.js
 create mode 100644 modules/torrents/client/config/torrents.client.menus.js
 create mode 100644 modules/torrents/client/torrents.client.module.js

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 @@
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
     </button>
-    <a ui-sref="home" class="navbar-brand">meanTorrent</a>
+    <a ui-sref="home" class="navbar-brand"><span style="font-size: 25px; font-weight: bold; line-height: 16px;">meanTorrent</span></a>
   </div>
   <nav class="navbar-collapse" uib-collapse="!vm.isCollapsed" role="navigation">
     <ul class="nav navbar-nav" ng-if="vm.menu.shouldRender(vm.authentication.user);">
diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html
index f24ab30f..2016b9ac 100644
--- a/modules/core/client/views/home.client.view.html
+++ b/modules/core/client/views/home.client.view.html
@@ -2,7 +2,7 @@
   <div class="jumbotron text-center">
     <div class="row">
       <div class="col-md-6 col-md-offset-3 col-sm-6 col-sm-offset-3 col-xs-12">
-        <h1>Coming soon ...</h1>
+        <h1 translate="COMINGSOON"></h1>
       </div>
     </div>
   </div>
diff --git a/modules/forums/client/config/forums.client.menus.js b/modules/forums/client/config/forums.client.menus.js
new file mode 100644
index 00000000..6476a08e
--- /dev/null
+++ b/modules/forums/client/config/forums.client.menus.js
@@ -0,0 +1,18 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('forums')
+    .run(menuConfig);
+
+  menuConfig.$inject = ['menuService', '$translate'];
+
+  function menuConfig(menuService, $translate) {
+    // Set top bar menu items
+    menuService.addMenuItem('topbar', {
+      title: $translate.instant('MENU_FORUMS'),
+      state: 'forums',
+      position: 1
+    });
+  }
+}());
diff --git a/modules/forums/client/config/forums.client.routes.js b/modules/forums/client/config/forums.client.routes.js
new file mode 100644
index 00000000..b66e39c0
--- /dev/null
+++ b/modules/forums/client/config/forums.client.routes.js
@@ -0,0 +1,23 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('forums.routes')
+    .config(routeConfig);
+
+  routeConfig.$inject = ['$stateProvider'];
+
+  function routeConfig($stateProvider) {
+    $stateProvider
+      .state('forums', {
+        url: '/forums',
+        templateUrl: '',
+        controller: '',
+        controllerAs: '',
+        data: {
+          //roles: ['user', 'admin'],
+          pageTitle: 'Forums'
+        }
+      });
+  }
+}());
diff --git a/modules/forums/client/forums.client.module.js b/modules/forums/client/forums.client.module.js
new file mode 100644
index 00000000..bb77498b
--- /dev/null
+++ b/modules/forums/client/forums.client.module.js
@@ -0,0 +1,7 @@
+(function (app) {
+  'use strict';
+
+  app.registerModule('forums', ['core']);// The core module is required for special route handling; see /core/client/config/core.client.routes
+  app.registerModule('forums.services');
+  app.registerModule('forums.routes', ['ui.router', 'core.routes', 'forums.services']);
+}(ApplicationConfiguration));
diff --git a/modules/torrents/client/config/torrents.client.menus.js b/modules/torrents/client/config/torrents.client.menus.js
new file mode 100644
index 00000000..cfc9e552
--- /dev/null
+++ b/modules/torrents/client/config/torrents.client.menus.js
@@ -0,0 +1,26 @@
+(function () {
+  'use strict';
+
+  angular
+    .module('torrents')
+    .run(menuConfig);
+
+  menuConfig.$inject = ['menuService', '$translate'];
+
+  function menuConfig(menuService, $translate) {
+    menuService.addMenuItem('topbar', {
+      title: $translate.instant('MENU_TORRENTS'),
+      state: 'torrents',
+      type: 'dropdown',
+      roles: ['*'],
+      position: 0
+    });
+
+    // Add the dropdown list item
+    menuService.addSubMenuItem('topbar', 'torrents', {
+      title: 'List torrents',
+      state: 'torrents.list',
+      roles: ['*']
+    });
+  }
+}());
diff --git a/modules/torrents/client/torrents.client.module.js b/modules/torrents/client/torrents.client.module.js
new file mode 100644
index 00000000..7c2910c3
--- /dev/null
+++ b/modules/torrents/client/torrents.client.module.js
@@ -0,0 +1,7 @@
+(function (app) {
+  'use strict';
+
+  app.registerModule('torrents', ['core']);// The core module is required for special route handling; see /core/client/config/core.client.routes
+  app.registerModule('torrents.services');
+  app.registerModule('torrents.routes', ['ui.router', 'core.routes', 'torrents.services']);
+}(ApplicationConfiguration));