diff --git a/modules/about/client/config/about.client.routes.js b/modules/about/client/config/about.client.routes.js index 6738e0a4..748219c4 100644 --- a/modules/about/client/config/about.client.routes.js +++ b/modules/about/client/config/about.client.routes.js @@ -75,6 +75,22 @@ pageTitle: 'PAGETITLE.VIP_DETAIL_RULES' } }) + .state('about.manual.chatRules', { + url: '/chatRules', + templateUrl: '/modules/about/client/views/chatRules.client.view.html', + data: { + roles: ['user', 'oper', 'admin'], + pageTitle: 'PAGETITLE.CHAT_RULES' + } + }) + .state('about.manual.requestRules', { + url: '/requestRules', + templateUrl: '/modules/about/client/views/requestRules.client.view.html', + data: { + roles: ['user', 'oper', 'admin'], + pageTitle: 'PAGETITLE.REQUEST_RULES' + } + }) .state('about.black', { url: '/black', templateUrl: '/modules/about/client/views/black.client.view.html', diff --git a/modules/about/client/templates/request-rules-en.md b/modules/about/client/templates/request-rules-en.md new file mode 100644 index 00000000..3ea57d13 --- /dev/null +++ b/modules/about/client/templates/request-rules-en.md @@ -0,0 +1,7 @@ +## This is the `REQUESTS RULES` of {{vm.appConfig.name}} + +The rules content is read from template file, it is support `markdown` style. + +If you want to change these rules, please modify the .md file at `modules/about/client/templates/request-rules-xx.md`. + +The `xx` is the language flag, like `zh`,`en` etc. \ No newline at end of file diff --git a/modules/about/client/templates/request-rules-zh.md b/modules/about/client/templates/request-rules-zh.md new file mode 100644 index 00000000..2bc08fbf --- /dev/null +++ b/modules/about/client/templates/request-rules-zh.md @@ -0,0 +1,7 @@ +## 这是 `REQUESTS RULES` 求种细则文档 + +这些规则内容是从模板文件读取, 它完全支持 `markdown` 语法风格. + +如果你想修改规则内容, 请编辑 .md 文件, 它存放于 `modules/about/client/templates/request-rules-xx.md`. + +`xx` 代表语言标识符, 如 `zh`,`en` 等. \ 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 905218fd..95ad67ff 100644 --- a/modules/about/client/views/manual.client.view.html +++ b/modules/about/client/views/manual.client.view.html @@ -4,6 +4,8 @@
{{'ABOUT.MENU_ABOUT_MANUAL_USER_RULES' | translate}} + {{'ABOUT.MENU_ABOUT_MANUAL_CHAT_RULES' | translate}} {{'ABOUT.MENU_ABOUT_MANUAL_USER_LEVEL_RULES' | translate}} {{'ABOUT.MENU_ABOUT_MANUAL_HNR_RULES' | translate}} {{'ABOUT.MENU_ABOUT_MANUAL_VIP_RULES' | translate}} + {{'ABOUT.MENU_ABOUT_MANUAL_REQUEST_RULES' | translate}}
diff --git a/modules/about/client/views/requestRules.client.view.html b/modules/about/client/views/requestRules.client.view.html new file mode 100644 index 00000000..b92acf2c --- /dev/null +++ b/modules/about/client/views/requestRules.client.view.html @@ -0,0 +1,4 @@ +
+
+
+
\ 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 2504ebfd..3dbe185a 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -202,6 +202,8 @@ INVITATIONS_RULES: 'Invitations Rules', HNR_RULES: 'H&R Rules', VIP_DETAIL_RULES: 'VIP Rules', + CHAT_RULES: 'Global Speech Rules', + REQUEST_RULES: 'Requests Rules', BLACK: 'Client Black List', MAKER: 'Torrents Maker Group', OPERLIST: 'Admin/Oper List', @@ -613,6 +615,8 @@ 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', + MENU_ABOUT_MANUAL_CHAT_RULES: 'Global Speech Rules', + MENU_ABOUT_MANUAL_REQUEST_RULES: 'Requests 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 f7f0dedb..910bc211 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -202,6 +202,8 @@ INVITATIONS_RULES: '邀请函细则', HNR_RULES: 'H&R 细则', VIP_DETAIL_RULES: 'VIP 细则', + CHAT_RULES: '公共言论行为准则', + REQUEST_RULES: '求种细则', BLACK: '禁止客户端列表', MAKER: '资源压制小组', OPERLIST: 'Admin/Oper 列表', @@ -613,6 +615,8 @@ MENU_ABOUT_MANUAL_INVITATIONS_RULES: '邀请函细则', MENU_ABOUT_MANUAL_HNR_RULES: 'H&R 细则', MENU_ABOUT_MANUAL_VIP_RULES: 'VIP 细则', + MENU_ABOUT_MANUAL_CHAT_RULES: '公共言论行为准则', + MENU_ABOUT_MANUAL_REQUEST_RULES: '求种细则', CLIENT_BLACK_LIST: '禁止客户端列表', MAKER_GROUP: '资源压制小组', BLACK_TOOLTIP: '

提示:

下面列出的所有客户端都已被服务器禁止,使用它们将不能下载到任何数据, 如需其它帮助,请与我们的 系统管理员 联系.', @@ -1192,7 +1196,7 @@ READ_ONLY_REPLY: '*** 只读话题,不能发表回复!', TITLE_READONLY: '只读', TITLE_VIPONLY: 'vip 专区', - TITLE_OPERONLY: 'oper 专区', + TITLE_OPERONLY: '管理员专区', TODAY_NEW_COUNT_ALL: '(今日: {{topic}} 话题, {{reply}} 回复)', TODAY_NEW_COUNT_TOPIC: '(今日: {{topic}} 话题)', TODAY_NEW_COUNT_REPLY: '(今日: {{reply}} 回复)',