diff --git a/modules/about/client/config/about.client.routes.js b/modules/about/client/config/about.client.routes.js index b153a239..fe4add79 100644 --- a/modules/about/client/config/about.client.routes.js +++ b/modules/about/client/config/about.client.routes.js @@ -123,6 +123,14 @@ pageTitle: 'PAGETITLE.REPORT_RULES' } }) + .state('about.manual.faq', { + url: '/faq', + templateUrl: '/modules/about/client/views/faq.client.view.html', + data: { + roles: ['user', 'oper', 'admin'], + pageTitle: 'PAGETITLE.MANUAL_FAQ' + } + }) .state('about.black', { url: '/black', templateUrl: '/modules/about/client/views/black.client.view.html', diff --git a/modules/about/client/templates/manual-faq-en.md b/modules/about/client/templates/manual-faq-en.md new file mode 100644 index 00000000..2d8fe3ff --- /dev/null +++ b/modules/about/client/templates/manual-faq-en.md @@ -0,0 +1 @@ +## MANUAL FAQ \ No newline at end of file diff --git a/modules/about/client/templates/manual-faq-zh.md b/modules/about/client/templates/manual-faq-zh.md new file mode 100644 index 00000000..d6b63020 --- /dev/null +++ b/modules/about/client/templates/manual-faq-zh.md @@ -0,0 +1 @@ +## 问题解答 \ No newline at end of file diff --git a/modules/about/client/templates/user-level-rules-en.md b/modules/about/client/templates/user-level-rules-en.md index 221f4314..bd0051a5 100644 --- a/modules/about/client/templates/user-level-rules-en.md +++ b/modules/about/client/templates/user-level-rules-en.md @@ -4,7 +4,7 @@   -#### How to calculate the level? +#### :white_small_square: How to calculate the level? 1. User score level calculation formula is: `sqrt(score number / %(scoreConfig.levelStep)s)`. 1. Level`1` score is: `1 * 1 * %(scoreConfig.levelStep)s`. 1. Level`2` score is: `2 * 2 * %(scoreConfig.levelStep)s`. @@ -14,5 +14,5 @@   -#### How to use the level? +#### :white_small_square: How to use the level? _The management group is making relevant level rights and interests, please keep the attention, thank you!_ diff --git a/modules/about/client/templates/user-level-rules-zh.md b/modules/about/client/templates/user-level-rules-zh.md index dbfc557a..f0401d21 100644 --- a/modules/about/client/templates/user-level-rules-zh.md +++ b/modules/about/client/templates/user-level-rules-zh.md @@ -4,7 +4,7 @@   -#### 如何计算用户等级? +#### :white_small_square: 如何计算用户等级? 1. 用户积分级别数学计算公式为: `sqrt(score number / %(scoreConfig.levelStep)s)`. 1. 级别`1` 需要积分累计: `1 * 1 * %(scoreConfig.levelStep)s`. 1. 级别`2` 需要积分累计: `2 * 2 * %(scoreConfig.levelStep)s`. @@ -14,5 +14,5 @@   -#### 如何使用用户等级? +#### :white_small_square: 如何使用用户等级? _管理组正在制定相关的级别权益,请保持关注,谢谢!_ diff --git a/modules/about/client/views/faq.client.view.html b/modules/about/client/views/faq.client.view.html new file mode 100644 index 00000000..889e0e76 --- /dev/null +++ b/modules/about/client/views/faq.client.view.html @@ -0,0 +1,4 @@ +
+ +
\ No newline at end of file diff --git a/modules/about/client/views/manual.client.view.html b/modules/about/client/views/manual.client.view.html index 17a2ebe6..22cfe5a6 100644 --- a/modules/about/client/views/manual.client.view.html +++ b/modules/about/client/views/manual.client.view.html @@ -28,6 +28,8 @@ ui-sref-active="active">{{'ABOUT.MENU_ABOUT_MANUAL_REQUEST_RULES' | translate}} {{'ABOUT.MENU_ABOUT_MANUAL_REPORT_RULES' | translate}} + {{'ABOUT.MENU_ABOUT_MANUAL_FAQ' | translate}}
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 998f49d5..b68831c1 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -208,6 +208,7 @@ FORBID_RULES: 'Forbid And Punish Rules', REQUEST_RULES: 'Requests Rules', REPORT_RULES: 'Report Rules', + MANUAL_FAQ: 'FAQ', BLACK: 'Client Black List', MAKER: 'Torrents Maker Group', OPERLIST: 'Admin/Oper List', @@ -624,6 +625,7 @@ MENU_ABOUT_MANUAL_FORBID_PUNISH_RULES: 'Forbid And Punish Rules Detail', MENU_ABOUT_MANUAL_REQUEST_RULES: 'Requests Rules Detail', MENU_ABOUT_MANUAL_REPORT_RULES: 'Report Rules Detail', + MENU_ABOUT_MANUAL_FAQ: 'FAQ', 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 719715ea..adb80cce 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -208,6 +208,7 @@ FORBID_RULES: '禁令与处罚细则', REQUEST_RULES: '求种细则', REPORT_RULES: '投诉与举报细则', + MANUAL_FAQ: '问题解答', BLACK: '禁止客户端列表', MAKER: '资源压制小组', OPERLIST: 'Admin/Oper 列表', @@ -624,6 +625,7 @@ MENU_ABOUT_MANUAL_FORBID_PUNISH_RULES: '禁令与处罚细则', MENU_ABOUT_MANUAL_REQUEST_RULES: '求种细则', MENU_ABOUT_MANUAL_REPORT_RULES: '投诉与举报细则', + MENU_ABOUT_MANUAL_FAQ: '问题解答', CLIENT_BLACK_LIST: '禁止客户端列表', MAKER_GROUP: '资源压制小组', BLACK_TOOLTIP: '

提示:

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