From 522847aa0aa1e80228bc4652f6771ba153b1a574 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Thu, 15 Mar 2018 12:39:26 +0800 Subject: [PATCH] feat(about): add many rule files route and menu item --- .../about/client/config/about.client.menus.js | 4 +- .../client/config/about.client.routes.js | 61 +++++++++++++++++-- .../client/views/manual.client.view.html | 25 ++++++++ .../about/client/views/rules.client.view.html | 8 --- modules/core/client/app/trans-string-en.js | 18 +++++- modules/core/client/app/trans-string-zh.js | 18 +++++- 6 files changed, 116 insertions(+), 18 deletions(-) create mode 100644 modules/about/client/views/manual.client.view.html delete mode 100644 modules/about/client/views/rules.client.view.html diff --git a/modules/about/client/config/about.client.menus.js b/modules/about/client/config/about.client.menus.js index d357f5ba..f264d47f 100644 --- a/modules/about/client/config/about.client.menus.js +++ b/modules/about/client/config/about.client.menus.js @@ -17,8 +17,8 @@ }); menuService.addSubMenuItem('topbar', 'about', { - title: 'MENU_ABOUT_RULES', - state: 'about.rules', + title: 'MENU_ABOUT_MANUAL', + state: 'about.manual.userRules', position: 1 }); // 2 is item of Users Ranking configure in module ranking diff --git a/modules/about/client/config/about.client.routes.js b/modules/about/client/config/about.client.routes.js index dcf0b4c9..6738e0a4 100644 --- a/modules/about/client/config/about.client.routes.js +++ b/modules/about/client/config/about.client.routes.js @@ -14,12 +14,65 @@ url: '/about', template: '' }) - .state('about.rules', { - url: '/rules', - templateUrl: '/modules/about/client/views/rules.client.view.html', + .state('about.manual', { + abstract: true, + url: '/manual', + templateUrl: '/modules/about/client/views/manual.client.view.html' + }) + .state('about.manual.userRules', { + url: '/usrRules', + templateUrl: '/modules/about/client/views/userRules.client.view.html', data: { roles: ['user', 'oper', 'admin'], - pageTitle: 'PAGETITLE.RULES' + pageTitle: 'PAGETITLE.USER_RULES' + } + }) + .state('about.manual.userLevelRules', { + url: '/userLevelRules', + templateUrl: '/modules/about/client/views/userLevelRules.client.view.html', + data: { + roles: ['user', 'oper', 'admin'], + pageTitle: 'PAGETITLE.USER_LEVEL_RULES' + } + }) + .state('about.manual.scoreRules', { + url: '/scoreRules', + templateUrl: '/modules/about/client/views/scoreRules.client.view.html', + data: { + roles: ['user', 'oper', 'admin'], + pageTitle: 'PAGETITLE.SCORE_RULES' + } + }) + .state('about.manual.uploaderRules', { + url: '/uploaderRules', + templateUrl: '/modules/about/client/views/uploaderRules.client.view.html', + data: { + roles: ['user', 'oper', 'admin'], + pageTitle: 'PAGETITLE.UPLOADER_RULES' + } + }) + .state('about.manual.invitationsRules', { + url: '/invitationsRules', + templateUrl: '/modules/about/client/views/invitationsRules.client.view.html', + data: { + roles: ['user', 'oper', 'admin'], + pageTitle: 'PAGETITLE.INVITATIONS_RULES' + } + }) + .state('about.manual.hnrRules', { + url: '/hnrRules', + templateUrl: '/modules/about/client/views/hnrRules.client.view.html', + data: { + roles: ['user', 'oper', 'admin'], + pageTitle: 'PAGETITLE.HNR_RULES' + } + }) + .state('about.manual.vipRules', { + url: '/vipRules', + templateUrl: '/modules/about/client/views/vipRules.client.view.html', + data: { + roles: ['user', 'oper', 'admin'], + pageTitle: 'PAGETITLE.VIP_DETAIL_RULES' } }) .state('about.black', { diff --git a/modules/about/client/views/manual.client.view.html b/modules/about/client/views/manual.client.view.html new file mode 100644 index 00000000..905218fd --- /dev/null +++ b/modules/about/client/views/manual.client.view.html @@ -0,0 +1,25 @@ +
+
+
+
+ {{'ABOUT.MENU_ABOUT_MANUAL_USER_RULES' | translate}} + {{'ABOUT.MENU_ABOUT_MANUAL_USER_LEVEL_RULES' | translate}} + {{'ABOUT.MENU_ABOUT_MANUAL_SCORE_RULES' | translate}} + {{'ABOUT.MENU_ABOUT_MANUAL_UPLOADER_RULES' | translate}} + {{'ABOUT.MENU_ABOUT_MANUAL_INVITATIONS_RULES' | translate}} + {{'ABOUT.MENU_ABOUT_MANUAL_HNR_RULES' | translate}} + {{'ABOUT.MENU_ABOUT_MANUAL_VIP_RULES' | translate}} +
+
+
+
+
+
+
diff --git a/modules/about/client/views/rules.client.view.html b/modules/about/client/views/rules.client.view.html deleted file mode 100644 index eeebe866..00000000 --- a/modules/about/client/views/rules.client.view.html +++ /dev/null @@ -1,8 +0,0 @@ -
-
-
-
-
-
-
-
\ 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 76d4b227..48adf1ed 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -40,7 +40,7 @@ MENU_FORUMS: 'Forums', MENU_REQUESTS: 'Requests', MENU_ABOUT: 'About', - MENU_ABOUT_RULES: 'User Rules', + MENU_ABOUT_MANUAL: 'Site Manual', MENU_ABOUT_BLACKLIST: 'Client Black List', MENU_ABOUT_MAKERGROUP: 'Torrents Maker Group', MENU_ABOUT_OPERLIST: 'Admin/Oper List', @@ -195,7 +195,13 @@ TORRENT_INFO: 'Torrent Info', TORRENT_SEARCH: 'Torrent Search', RANKING: 'Users Ranking', - RULES: 'User Rules', + USER_RULES: 'User Rules', + USER_LEVEL_RULES: 'User level Rules', + SCORE_RULES: 'Score Rules', + UPLOADER_RULES: 'Uploader Rules', + INVITATIONS_RULES: 'Invitations Rules', + HNR_RULES: 'H&R Rules', + VIP_DETAIL_RULES: 'VIP Rules', BLACK: 'Client Black List', MAKER: 'Torrents Maker Group', OPERLIST: 'Admin/Oper List', @@ -599,6 +605,14 @@ //about views ABOUT: { + USERS_MANUAL: 'Users Manual', + MENU_ABOUT_MANUAL_USER_RULES: 'User Detail Rules', + MENU_ABOUT_MANUAL_USER_LEVEL_RULES: 'User Level Rules', + MENU_ABOUT_MANUAL_SCORE_RULES: 'Score Detail Rules', + MENU_ABOUT_MANUAL_UPLOADER_RULES: 'Uploader Detail Rules', + MENU_ABOUT_MANUAL_INVITATIONS_RULES: 'Invitations Detail Rules', + MENU_ABOUT_MANUAL_HNR_RULES: 'H&R Detail Rules', + MENU_ABOUT_MANUAL_VIP_RULES: 'VIP Detail Rules', CLIENT_BLACK_LIST: 'Client Black List', MAKER_GROUP: 'Torrents Maker Group', BLACK_TOOLTIP: '

Note:

All the clients in the list was forbidden by server and can not announce or get any torrent data, For more help, please contact our administrator.', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 28665027..c9eb7385 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -40,7 +40,7 @@ MENU_FORUMS: '论坛', MENU_REQUESTS: '求种', MENU_ABOUT: '关于', - MENU_ABOUT_RULES: '站内用户规则', + MENU_ABOUT_MANUAL: '站点手册', MENU_ABOUT_BLACKLIST: '禁止客户端列表', MENU_ABOUT_MAKERGROUP: '资源压制小组', MENU_ABOUT_OPERLIST: 'Admin/Oper 列表', @@ -195,7 +195,13 @@ TORRENT_INFO: '种子信息', TORRENT_SEARCH: '种子搜索', RANKING: '用户排行榜', - RULES: '用户规则', + USER_RULES: '用户守则', + USER_LEVEL_RULES: '用户等级细节', + SCORE_RULES: '积分细则', + UPLOADER_RULES: '发种细则', + INVITATIONS_RULES: '邀请函细则', + HNR_RULES: 'H&R 细则', + VIP_DETAIL_RULES: 'VIP 细则', BLACK: '禁止客户端列表', MAKER: '资源压制小组', OPERLIST: 'Admin/Oper 列表', @@ -599,6 +605,14 @@ //about views ABOUT: { + USERS_MANUAL: '站内用户手册', + MENU_ABOUT_MANUAL_USER_RULES: '用户守则', + MENU_ABOUT_MANUAL_USER_LEVEL_RULES: '用户等级细则', + MENU_ABOUT_MANUAL_SCORE_RULES: '积分细则', + MENU_ABOUT_MANUAL_UPLOADER_RULES: '发种细则', + MENU_ABOUT_MANUAL_INVITATIONS_RULES: '邀请函细则', + MENU_ABOUT_MANUAL_HNR_RULES: 'H&R 细则', + MENU_ABOUT_MANUAL_VIP_RULES: 'VIP 细则', CLIENT_BLACK_LIST: '禁止客户端列表', MAKER_GROUP: '资源压制小组', BLACK_TOOLTIP: '

提示:

下面列出的所有客户端都已被服务器禁止，使用它们将不能下载到任何数据, 如需其它帮助，请与我们的 系统管理员 联系.',