From 5fffbf5d910e5fa6ca1a59d9679ef543265218d9 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Fri, 27 Oct 2017 14:32:27 +0800 Subject: [PATCH] feat(vip): new vip menu struct --- modules/core/client/app/trans-string-en.js | 7 +- modules/core/client/app/trans-string-zh.js | 7 +- .../views/status/account.client.view.html | 2 +- modules/vip/client/config/vip.client.menus.js | 2 +- .../vip/client/config/vip.client.routes.js | 19 ++ .../controllers/vip.client.controller.js | 2 + modules/vip/client/less/vip.less | 10 + .../vip/client/views/donate.client.view.html | 21 ++ .../vip/client/views/rules.client.view.html | 26 ++ modules/vip/client/views/vip.client.view.html | 278 +++++++++--------- 10 files changed, 239 insertions(+), 135 deletions(-) create mode 100644 modules/vip/client/less/vip.less create mode 100644 modules/vip/client/views/donate.client.view.html create mode 100644 modules/vip/client/views/rules.client.view.html diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index df924353..16a6fef9 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -163,6 +163,8 @@ OPERLIST: 'Admin/Oper List', COLLECTIONS: 'Movie Collections', VIP: 'Vip', + VIP_DONATE: 'Vip Donate', + VIP_RULES: 'Vip Rules', FORUM: 'Forum', ADMIN_USER_LIST: 'User List', ADMIN_USER_VIEW: 'View User', @@ -462,12 +464,15 @@ //vip views VIP: { + VIP_TITLE: 'VIP Club', + VIP_SUB_TITLE: '- A symbol of rights and status', BUTTON_DONATE: 'Donate', DONATE_VIP: 'Donate a VIP', TORRENTS_LIST: 'Vip Torrents List', TORRENTS_LIST_ERROR: 'Vip torrents list error', VIP_TORRENTS_IS_LOADING: 'Vip torrents is loading...', - VIP_TORRENTS_IS_EMPTY: 'No Vip torrents of this type is founded!' + VIP_TORRENTS_IS_EMPTY: 'No Vip torrents of this type is founded!', + DONATE_TOOLTIP: '

Note:

Before donations, please carefully read the membership user license agreement of CHD.im, and clear the rights and obligations of members, if you continure donations, said you agree to these terms, if you need any other help, please contact our administrator.' }, //about views diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index df4de5d5..0acd6fbc 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -163,6 +163,8 @@ OPERLIST: 'Admin/Oper 列表', COLLECTIONS: '电影系列', VIP: 'Vip', + VIP_DONATE: '捐赠VIP', + VIP_RULES: 'Vip用户协议', FORUM: '论坛', ADMIN_USER_LIST: '用户管理', ADMIN_USER_VIEW: '查看用户', @@ -462,12 +464,15 @@ //vip views VIP: { + VIP_TITLE: 'VIP 会员', + VIP_SUB_TITLE: '- 一个身份、权利和地位的象征', BUTTON_DONATE: '捐赠Vip', DONATE_VIP: '捐赠Vip', TORRENTS_LIST: 'Vip 资源专区', TORRENTS_LIST_ERROR: 'Vip 资源获取失败', VIP_TORRENTS_IS_LOADING: 'Vip资源正在获取, 请稍候...', - VIP_TORRENTS_IS_EMPTY: '没有找到该类的VIP种子资源!' + VIP_TORRENTS_IS_EMPTY: '没有找到该类的VIP种子资源!', + DONATE_TOOLTIP: '

Note:

在捐赠前, 请认真阅读 {{site}} 的 会员用户许可协议 以明确会员用户的权利与义务, 如继续进行捐赠操作, 则表示您已完全同意这些条款, 如需其它帮助，请与我们的 系统管理员 联系.', }, //about views diff --git a/modules/users/client/views/status/account.client.view.html b/modules/users/client/views/status/account.client.view.html index ff44b725..7542d814 100644 --- a/modules/users/client/views/status/account.client.view.html +++ b/modules/users/client/views/status/account.client.view.html @@ -74,7 +74,7 @@
{{ 'EDIT_PROFILE' | translate }} - | {{ 'VIP.DONATE_VIP' | translate }} + | {{ 'VIP.DONATE_VIP' | translate }}
diff --git a/modules/vip/client/config/vip.client.menus.js b/modules/vip/client/config/vip.client.menus.js index d73afdbe..9909c2e9 100644 --- a/modules/vip/client/config/vip.client.menus.js +++ b/modules/vip/client/config/vip.client.menus.js @@ -10,7 +10,7 @@ function menuConfig(menuService) { menuService.addMenuItem('topbar', { title: 'MENU_VIP', - state: 'vip', + state: 'vip.list', roles: ['*'], position: 5 }); diff --git a/modules/vip/client/config/vip.client.routes.js b/modules/vip/client/config/vip.client.routes.js index 7bfc7acc..3e759991 100644 --- a/modules/vip/client/config/vip.client.routes.js +++ b/modules/vip/client/config/vip.client.routes.js @@ -11,10 +11,29 @@ $stateProvider .state('vip', { url: '/vip', + abstract: true, + template: '' + }) + .state('vip.list', { + url: '', templateUrl: '/modules/vip/client/views/vip.client.view.html', data: { pageTitle: 'PAGETITLE.VIP' } + }) + .state('vip.rules', { + url: '/rules', + templateUrl: '/modules/vip/client/views/rules.client.view.html', + data: { + pageTitle: 'PAGETITLE.VIP_RULES' + } + }) + .state('vip.donate', { + url: '/donate', + templateUrl: '/modules/vip/client/views/donate.client.view.html', + data: { + pageTitle: 'PAGETITLE.VIP_DONATE' + } }); } }()); diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js index 77012b39..4676402e 100644 --- a/modules/vip/client/controllers/vip.client.controller.js +++ b/modules/vip/client/controllers/vip.client.controller.js @@ -17,9 +17,11 @@ vm.RTS = ResourcesTagsServices; vm.lang = getStorageLangService.getLang(); vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage; + vm.announce = MeanTorrentConfig.meanTorrentConfig.announce; vm.torrentType = MeanTorrentConfig.meanTorrentConfig.torrentType; vm.vipTorrentType = 'movie'; + vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app; vm.searchTags = []; uibButtonConfig.activeClass = 'btn-success'; diff --git a/modules/vip/client/less/vip.less b/modules/vip/client/less/vip.less new file mode 100644 index 00000000..08ebe460 --- /dev/null +++ b/modules/vip/client/less/vip.less @@ -0,0 +1,10 @@ +@import (reference) "../../../core/client/less/mt-var.less"; + +.donate-button { + margin-top: 15px; + @media (max-width: @screen-xs-max) { + margin-top: 5px; + text-align: left !important; + } +} + diff --git a/modules/vip/client/views/donate.client.view.html b/modules/vip/client/views/donate.client.view.html new file mode 100644 index 00000000..f96b21df --- /dev/null +++ b/modules/vip/client/views/donate.client.view.html @@ -0,0 +1,21 @@ +
+
+
+
+
+

{{'VIP.VIP_TITLE' | translate}} + {{'VIP.VIP_SUB_TITLE' | translate}} +

+
+
+
+
+ +
+
+ +
+
+
\ No newline at end of file diff --git a/modules/vip/client/views/rules.client.view.html b/modules/vip/client/views/rules.client.view.html new file mode 100644 index 00000000..6de6b7e9 --- /dev/null +++ b/modules/vip/client/views/rules.client.view.html @@ -0,0 +1,26 @@ +
+
+
+
+
+

{{'VIP.VIP_TITLE' | translate}} + {{'VIP.VIP_SUB_TITLE' | translate}} +

+
+ +
+
+
+ +
+
+
+
+
+
+
\ No newline at end of file diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html index 2fb3704e..94aa1181 100644 --- a/modules/vip/client/views/vip.client.view.html +++ b/modules/vip/client/views/vip.client.view.html @@ -1,114 +1,128 @@ -
-
-
- +
+
+
+
+
+

{{'VIP.VIP_TITLE' | translate}} + {{'VIP.VIP_SUB_TITLE' | translate}} +

+
+ +
+
+ +
-
- -
-
-
-

- {{'VIP.TORRENTS_LIST' | translate}} -

+
+
+
+

+ {{'VIP.TORRENTS_LIST' | translate}} +

-
-
- -
-
- -
-
-
-
    -
-
-
- +
+
+
-
-
- - - - - - - - - - - - - - - - - + + + +
{{ 'TABLE_FIELDS.INFO' | translate}} - {{ 'TABLE_FIELDS.VOTES' | translate}} - - - {{ 'TABLE_FIELDS.LIFETIME' | translate}}{{ 'TABLE_FIELDS.SIZE' | translate}} - - {{ 'TABLE_FIELDS.PUBLISHER' | translate}}
-
-

{{vm.tooltipMsg | translate}}

-
-
-
-
- {{vm.TGI.getTorrentTitle(item)}} +
+
+
+
    +
+
+
+ +
+
+
-
- -
+
+ + + + + + + + + + + + + + + + + - + - - - + + + - - - -
{{ 'TABLE_FIELDS.INFO' | translate}} + {{ 'TABLE_FIELDS.VOTES' | translate}} + + + {{ 'TABLE_FIELDS.LIFETIME' | translate}}{{ 'TABLE_FIELDS.SIZE' | translate}} + + {{ 'TABLE_FIELDS.PUBLISHER' | translate}}
+
+

{{vm.tooltipMsg | translate}}

-
-
- {{vm.TGI.getTorrentDoubleTitle(item)}} +
+
+
+ {{vm.TGI.getTorrentTitle(item)}} + +
+ +
+
+
+
+ {{vm.TGI.getTorrentDoubleTitle(item)}} (By: ) -
+ -
- {{t.name}} -
+
+ {{t.name}} +
-
{{item.resource_detail_info.subtitle}}
-
{{item.torrent_filename | filename}}
+
{{item.resource_detail_info.subtitle}}
+
{{item.torrent_filename | filename}}
-
+
{{ item.resource_detail_info.release_date}} @@ -139,51 +153,53 @@ {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}} +
-
- 		+ {{vm.TGI.getVoteTitle(item)}} {{item.resource_detail_info.vote_average | number : 1}} - {{item.createdat | life}}{{item.torrent_size | bytes:2}}{{item.createdat | life}}{{item.torrent_size | bytes:2}} - -
- - -
-
+

+ + {{item.torrent_finished}} +

+
+ -
-
    -
+
+ + +
+
+ +
+
    +
+
-
\ No newline at end of file + \ No newline at end of file