diff --git a/modules/about/client/about.client.module.js b/modules/about/client/about.client.module.js index b697d753..69724944 100644 --- a/modules/about/client/about.client.module.js +++ b/modules/about/client/about.client.module.js @@ -2,6 +2,8 @@ 'use strict'; app.registerModule('about', ['core']);// The core module is required for special route handling; see /core/client/config/core.client.routes + app.registerModule('about.admin', ['core.admin']); + app.registerModule('about.admin.routes', ['core.admin.routes']); app.registerModule('about.services'); app.registerModule('about.routes', ['ui.router', 'core.routes', 'about.services']); }(ApplicationConfiguration)); diff --git a/modules/about/client/config/about.client.menus.js b/modules/about/client/config/about.client.menus.js index 87e6ece6..b19dc997 100644 --- a/modules/about/client/config/about.client.menus.js +++ b/modules/about/client/config/about.client.menus.js @@ -27,6 +27,11 @@ state: 'about.black', position: 2 }); + menuService.addSubMenuItem('topbar', 'about', { + title: 'MENU_ABOUT_MAKERGROUP', + state: 'about.maker', + position: 2 + }); } }()); diff --git a/modules/about/client/config/about.client.routes.js b/modules/about/client/config/about.client.routes.js index f155551c..8ac055fa 100644 --- a/modules/about/client/config/about.client.routes.js +++ b/modules/about/client/config/about.client.routes.js @@ -27,6 +27,14 @@ data: { pageTitle: 'PAGETITLE.BLACK' } + }) + .state('about.maker', { + url: '/maker', + templateUrl: '/modules/about/client/views/maker.client.view.html', + data: { + roles: ['user', 'oper', 'admin'], + pageTitle: 'PAGETITLE.MAKER' + } }); } }()); diff --git a/modules/about/client/config/admin/about-admin.client.menus.js b/modules/about/client/config/admin/about-admin.client.menus.js new file mode 100644 index 00000000..6f6afd4b --- /dev/null +++ b/modules/about/client/config/admin/about-admin.client.menus.js @@ -0,0 +1,19 @@ +(function () { + 'use strict'; + + angular + .module('about.admin') + .run(menuConfig); + + menuConfig.$inject = ['menuService']; + + function menuConfig(menuService) { + menuService.addSubMenuItem('topbar', 'admin', { + title: 'MENU_ADMIN_MAKERGROUP', + state: 'admin.maker', + position: 5, + divider: true + }); + + } +}()); diff --git a/modules/about/client/config/admin/about-admin.client.routes.js b/modules/about/client/config/admin/about-admin.client.routes.js new file mode 100644 index 00000000..e3008f13 --- /dev/null +++ b/modules/about/client/config/admin/about-admin.client.routes.js @@ -0,0 +1,20 @@ +(function () { + 'use strict'; + + angular + .module('about.admin.routes') + .config(routeConfig); + + routeConfig.$inject = ['$stateProvider']; + + function routeConfig($stateProvider) { + $stateProvider + .state('admin.maker', { + url: '/maker', + templateUrl: '/modules/about/client/views/admin/maker-admin.client.view.html', + data: { + pageTitle: 'PAGETITLE.MAKER' + } + }); + } +}()); diff --git a/modules/about/client/views/admin/maker-admin.client.view.html b/modules/about/client/views/admin/maker-admin.client.view.html new file mode 100644 index 00000000..3398ebe2 --- /dev/null +++ b/modules/about/client/views/admin/maker-admin.client.view.html @@ -0,0 +1,11 @@ +
+
+
+ +

+ {{'ABOUT.MAKER_GROUP_ADMIN' | translate}} +

+
+
+
+
\ No newline at end of file diff --git a/modules/about/client/views/maker.client.view.html b/modules/about/client/views/maker.client.view.html new file mode 100644 index 00000000..b9bec8c8 --- /dev/null +++ b/modules/about/client/views/maker.client.view.html @@ -0,0 +1,11 @@ +
+
+
+ +

+ {{'ABOUT.MAKER_GROUP' | translate}} +

+
+
+
+
\ No newline at end of file diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 8e23be2f..36afc5b9 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -23,6 +23,7 @@ MENU_TORRENTS_ADMIN: 'Manage Torrents', MENU_TORRENTS_ADMIN_EDAU: 'Announce Editor', MENU_ADMIN_OFFICIAL_INVITATION: 'Send official invitation', + MENU_ADMIN_MAKERGROUP: 'Resources Maker Group Configure', MENU_ADMIN_MESSAGES: 'System Messages', MENU_ADMIN_TRACE: 'System Traces', MENU_ADMIN_FORUMS_CONFIGURE: 'Forums Configure', @@ -34,6 +35,7 @@ MENU_ABOUT: 'About', MENU_ABOUT_RULES: 'Rules', MENU_ABOUT_BLACKLIST: 'Client Black List', + MENU_ABOUT_MAKERGROUP: 'Resources Maker Group', MENU_VIP: 'VIP', MENU_ADMIN: 'Admin', @@ -152,6 +154,7 @@ RANKING: 'Ranking', RULES: 'Rules', BLACK: 'Client Black List', + MAKER: 'Resources Maker Group', VIP: 'Vip', FORUM: 'Forum', ADMIN_USER_LIST: 'User List', @@ -378,7 +381,7 @@ TORRENTS_SUBMIT_UPLOAD: '7. Agree the rules and submit your resources', SUBMIT_BUTTON: 'OK, SUBMIT NOW', CANCEL_BUTTON: 'NO, CANCEL IT', - AGREE_RULES: 'I agree and already read all the rules, read here', + AGREE_RULES: 'I agree and already read all the rules, read here', DOWNLOAD_TORRENT: 'Download Torrent', ENTER_MUSIC_TITLE: '3. Please enter the artist name and music/album title', @@ -455,7 +458,9 @@ //about views ABOUT: { - CLIENT_BLACK_LIST: 'Client Black List' + CLIENT_BLACK_LIST: 'Client Black List', + MAKER_GROUP: 'Resources Maker Group', + MAKER_GROUP_ADMIN: 'Resources Maker Group Configure' }, //user settings diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index b21b60ea..a8fb4a66 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -23,9 +23,10 @@ MENU_TORRENTS_ADMIN: '种子管理', MENU_TORRENTS_ADMIN_EDAU: '种子修改器', MENU_ADMIN_OFFICIAL_INVITATION: '发送官方邀请', + MENU_ADMIN_MAKERGROUP: '资源压制小组管理', MENU_ADMIN_MESSAGES: '系统消息', MENU_ADMIN_TRACE: '系统日志', - MENU_ADMIN_FORUMS_CONFIGURE: '论坛配置', + MENU_ADMIN_FORUMS_CONFIGURE: '论坛配置管理', MENU_ADMIN_FORUMS_MANAGEMENT: '论坛管理', MENU_USERS_ADMIN: '用户管理', MENU_UPLOAD: '发布', @@ -34,6 +35,7 @@ MENU_ABOUT: '关于', MENU_ABOUT_RULES: '站内规则', MENU_ABOUT_BLACKLIST: '禁止客户端列表', + MENU_ABOUT_MAKERGROUP: '资源压制小组', MENU_VIP: 'VIP', MENU_ADMIN: '管理中心', @@ -152,6 +154,7 @@ RANKING: '排行榜', RULES: '规则', BLACK: '禁止客户端列表', + MAKER: '资源压制小组', VIP: 'Vip', FORUM: '论坛', ADMIN_USER_LIST: '用户管理', @@ -378,7 +381,7 @@ TORRENTS_SUBMIT_UPLOAD: '7. 同意上传协议,并提交', SUBMIT_BUTTON: '已备妥,现在提交', CANCEL_BUTTON: '算了,以后再说', - AGREE_RULES: '我已阅读并同意站内所有协议条款,协议条款', + AGREE_RULES: '我已阅读并同意站内所有协议条款,协议条款', DOWNLOAD_TORRENT: '下载种子', ENTER_MUSIC_TITLE: '3. 请输入艺人名称和音乐/专辑标题', @@ -455,7 +458,9 @@ //about views ABOUT: { - CLIENT_BLACK_LIST: '禁止客户端列表' + CLIENT_BLACK_LIST: '禁止客户端列表', + MAKER_GROUP: '资源压制小组', + MAKER_GROUP_ADMIN: '资源压制小组配置管理' }, //user settings