diff --git a/config/env/torrents.js b/config/env/torrents.js index 94b9cab6..284c2286 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -234,6 +234,48 @@ module.exports = { } }, + /** + * @home + * + * settings for home page + * + * @showVipBanner: setting whether show vip AD banner + * @showForumNewTopicsAndNewestTorrents: setting whether show forum new topics and newest torrents in home page + * @showTopLevelTorrents: setting whether show top level torrents list + * @buttonList: a function list area of home page + */ + home: { + showVipBanner: false, + showForumNewTopicsAndNewestTorrents: false, + showTopLevelTorrents: false, + buttonList: [ + { + icon: 'fa-bars', + state: 'forums.list', + title: 'HOME.BUTTON_LIST.FUN_FORUM_TITLE', + desc: 'HOME.BUTTON_LIST.FUN_FORUM_DESC' + }, + { + icon: 'fa-commenting-o', + state: 'vip.list', + title: 'HOME.BUTTON_LIST.FUN_VIP_TITLE', + desc: 'HOME.BUTTON_LIST.FUN_VIP_DESC' + }, + { + icon: 'fa-question-circle-o', + state: 'about.manual.userRules', + title: 'HOME.BUTTON_LIST.FUN_HELP_TITLE', + desc: 'HOME.BUTTON_LIST.FUN_HELP_DESC' + }, + { + icon: 'fa-headphones', + state: '', + title: 'HOME.BUTTON_LIST.FUN_SUPPORT_TITLE', + desc: 'HOME.BUTTON_LIST.FUN_SUPPORT_DESC' + } + ] + }, + /** * @sign * @@ -1202,10 +1244,10 @@ module.exports = { homeOrderTorrentListPerType: 9, homeNewestTorrentListPerType: 14, - homeHelpListLimit: 10, - homeNoticeListLimit: 10, - homeNewTopicListLimit: 10, - homeNewestTorrentsListLimit: 10, + homeHelpListLimit: 8, + homeNoticeListLimit: 8, + homeNewTopicListLimit: 8, + homeNewestTorrentsListLimit: 8, examinationUserListPerPage: 20, messageTicketsListPerPage: 15, diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 4050e363..a4b234fa 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -108,7 +108,7 @@ TITLE_NOTICE: 'System broadcast', TITLE_NEW_TOPIC: 'Forum new topics', TITLE_NEWEST_TORRENTS: 'The newest torrents', - TITLE_SEARCH: 'Torrents and forum global search', + TITLE_SEARCH: 'Global Search', SEARCH_SUB_TITLE: 'Type keywords and press enter.', MORE_HELP_RULES: 'More rules and help contents', MORE_GO_FORUM: 'Go to forum home', @@ -116,7 +116,17 @@ SEARCH_TYPE_TORRENTS: 'Torrents', SEARCH_TYPE_FORUM: 'Forum', BTN_JOIN_VIP: 'Join as vip »', - VIP_TOOLTIP: ' - Full free download, higher upload size addition. \n - Higher upload download and timed seeding score addition. \n - Exempt from regular system examine tasks. \n - Exclusive resource download area. \n - Exclusive forum discussion area. \n - H&R download warning immunity.' + VIP_TOOLTIP: ' - Full free download, higher upload size addition. \n - Higher upload download and timed seeding score addition. \n - Exempt from regular system examine tasks. \n - Exclusive resource download area. \n - Exclusive forum discussion area. \n - H&R download warning immunity.', + BUTTON_LIST: { + FUN_FORUM_TITLE: 'Forums', + FUN_FORUM_DESC: 'Station management, bulletin release, user exchange, business cooperation etc. become a compliance with the law of PTer, the current moderator recruitment...', + FUN_VIP_TITLE: 'VIP Center', + FUN_VIP_DESC: 'A symbol of rights and status, exclusive resource area, exclusive forum discussion area, higher upload download and timed seeding score addition, and more ...', + FUN_HELP_TITLE: 'User Manual', + FUN_HELP_DESC: 'The helper center, include user account rules, upload and download rules, users score and level rules, forbid And punish Rules, invite rules, and more ...', + FUN_SUPPORT_TITLE: 'Support Center', + FUN_SUPPORT_DESC: 'If you need any help, you can contact our {{sNameDesc | translate}} by Message at here, And you can track their progress and communicate more with service staff.' + } }, //element title/alt @@ -493,6 +503,7 @@ SEARCH_FROM_TMDB_TITLE: 'Search {{type}} From TMDB', BTN_SELECT: 'Select', BTN_SEARCH: 'Search', + BTN_GLOBAL_SEARCH: 'Global Search', LOAD_SEARCH_RESULT: 'loading search result, please wait ...', LOAD_SEARCH_RESULT_ERROR: 'loading search result ERROR!', SEARCH_RESULT_EMPTY: 'result is empty, please change keywords and try again', @@ -1086,6 +1097,7 @@ //footer view MIT_PROTOCOL: 'The source of this project is protected by MIT open source protocol', GIT_REPO: 'Power by ©meanTorrent，view on GitHub', + SITE_STATEMENT: '

Disclaimer

This site serves as a platform for users to share and discuss Internet resources. The site itself does not provide any resources for download, nor does it store any resource files on the server. The users behavior is not related to this site. If you feel that some users share has infringed your legal rights, please immediately contact to our {{sNameDesc | translate}} by mail, we will verify and process it as soon as possible.', TOTAL_USERS: 'Total Users', TOTAL_VIP_USERS: 'Total VIP Users', TOTAL_TORRENTS: 'Total Torrents', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 005ec84d..f3c1d4a8 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -108,15 +108,25 @@ TITLE_NOTICE: '系统动态与通知', TITLE_NEW_TOPIC: '论坛最新话题', TITLE_NEWEST_TORRENTS: '最近上传的种子', - TITLE_SEARCH: '种子以及论坛关键字搜索', - SEARCH_SUB_TITLE: '请输入关键字并回车.', + TITLE_SEARCH: '全局搜索', + SEARCH_SUB_TITLE: '通过关键字快速找到您想要的种子或', MORE_HELP_RULES: '更多规则以及帮助内容', MORE_GO_FORUM: '去论坛逛一下', MORE_VIP_RULES_AND_RIGHT: '更多 vip 规则及权益请看这里', SEARCH_TYPE_TORRENTS: '搜索种子', SEARCH_TYPE_FORUM: '搜索论坛', BTN_JOIN_VIP: '加入 vip 会员 »', - VIP_TOOLTIP: ' - 全免费下载以及更高的上传加成. \n - 更高的上传下载以及做种积分加成. \n - 免于定期的系统考评任务. \n - 专属的资源下载区域. \n - 专属的论坛讨论区. \n - 对 H&R 下载警告免疫.' + VIP_TOOLTIP: ' - 全免费下载以及更高的上传加成. \n - 更高的上传下载以及做种积分加成. \n - 免于定期的系统考评任务. \n - 专属的资源下载区域. \n - 专属的论坛讨论区. \n - 对 H&R 下载警告免疫.', + BUTTON_LIST: { + FUN_FORUM_TITLE: '官方论坛', + FUN_FORUM_DESC: '集站务管理、公告发布、用户交流、商业合作于一体，请遵守相关版块的版规，做个遵纪守法的 PTer，当前版主招募中 ...', + FUN_VIP_TITLE: 'VIP 专区', + FUN_VIP_DESC: '一个身份、权利和地位的象征，专属的资源下载区及论坛讨论版块，同时享有更高的上传下载数据加成以及积分加成，我们的持续发展离不开您的支持 ...', + FUN_HELP_TITLE: '用户手册', + FUN_HELP_DESC: '用户帮助中心, 强烈建议新用户仔细阅读，包括用户帐户细则，上传与下载细则，积分与用户级别细则，封禁与处罚细则，邀请细则，及其它更多内容 ...', + FUN_SUPPORT_TITLE: '客户服务中心', + FUN_SUPPORT_DESC: '如果您需要任何帮助，您都可以在此通过客服中心向我们发送站内消息, 而且您还可以跟踪它们的处理进度并且跟相关的工作人员有更多的交流 ...' + } }, //element title/alt @@ -493,6 +503,7 @@ SEARCH_FROM_TMDB_TITLE: '在 TMDB 上检索 {{type}} 资源', BTN_SELECT: '确认选择', BTN_SEARCH: '检索', + BTN_GLOBAL_SEARCH: '搜一下', LOAD_SEARCH_RESULT: '正在检索，请稍候 ...', LOAD_SEARCH_RESULT_ERROR: '检索出现错误, 请重试 ...', SEARCH_RESULT_EMPTY: '检索结果为空, 请更换关键字然后重试', @@ -1086,6 +1097,7 @@ //footer view MIT_PROTOCOL: '本项目源码受 MIT 开源协议保护', GIT_REPO: 'Power by ©meanTorrent，GitHub 源码仓库', + SITE_STATEMENT: '

免责声明

本站仅作为用户对互联网资源的分享讨论交流平台，站内本身不提供任何资源下载，也不在服务器存储任何资源文件，用户自行分享的行为与本站无关，如果您觉得某些用户的分享侵犯了您的合法权益，请立即向我们的 {{sNameDesc | translate}} 发送 邮件，我们将会尽快核实并处理。', TOTAL_USERS: '注册会员', TOTAL_VIP_USERS: 'VIP会员', TOTAL_TORRENTS: '种子数', diff --git a/modules/core/client/config/core.client.route-filter.js b/modules/core/client/config/core.client.route-filter.js index a979c5ee..e175b561 100644 --- a/modules/core/client/config/core.client.route-filter.js +++ b/modules/core/client/config/core.client.route-filter.js @@ -66,6 +66,12 @@ function stateChangeSuccess(event, toState, toParams, fromState, fromParams) { // Record previous state storePreviousState(fromState, fromParams); + + if(toState.name === 'home'){ + $('.page-content').css('background-color', 'transparent'); + }else{ + $('.page-content').css('background-color', '#fff'); + } } // Store previous state diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js index 1fe8e005..f519a558 100644 --- a/modules/core/client/controllers/header.client.controller.js +++ b/modules/core/client/controllers/header.client.controller.js @@ -17,6 +17,7 @@ vm.announceConfig = MeanTorrentConfig.meanTorrentConfig.announce; vm.messageConfig = MeanTorrentConfig.meanTorrentConfig.messages; vm.hnrConfig = MeanTorrentConfig.meanTorrentConfig.hitAndRun; + vm.supportConfig = MeanTorrentConfig.meanTorrentConfig.support; vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app; vm.signConfig = MeanTorrentConfig.meanTorrentConfig.sign; vm.accountMenu = menuService.getMenu('account').items[0]; diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js index f007f7c3..e65030d4 100644 --- a/modules/core/client/controllers/home.client.controller.js +++ b/modules/core/client/controllers/home.client.controller.js @@ -21,6 +21,8 @@ vm.forumsConfig = MeanTorrentConfig.meanTorrentConfig.forumsConfig; vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage; vm.announceConfig = MeanTorrentConfig.meanTorrentConfig.announce; + vm.homeConfig = MeanTorrentConfig.meanTorrentConfig.home; + vm.supportConfig = MeanTorrentConfig.meanTorrentConfig.support; vm.searchType = 'torrents'; diff --git a/modules/core/client/css/core.css b/modules/core/client/css/core.css index 4f9754b8..2574bbfc 100644 --- a/modules/core/client/css/core.css +++ b/modules/core/client/css/core.css @@ -18,6 +18,11 @@ body { display: none !important; } +.page-content { + min-height: 600px; + background-color: #fff; +} + .header-profile-image { border-radius: 50%; height: 28px; @@ -86,22 +91,3 @@ a:hover .header-profile-image { .dl-horizontal .h-line .checkbox-inline { min-width: 150px; } - -.view-footer { - color: #aaa; - font-size: 12px; -} - -.view-footer .icon { - font-size: 20px; - margin-right: 15px; -} - -.site-info { - border-bottom: solid 1px #222; - margin-bottom: 20px; - padding-bottom: 20px; - padding-top: 10px; - padding-left: 60px; -} - diff --git a/modules/core/client/less/home.less b/modules/core/client/less/home.less index 54a653f8..741b9b67 100644 --- a/modules/core/client/less/home.less +++ b/modules/core/client/less/home.less @@ -66,14 +66,15 @@ } .home-help, .home-notice, .home-new-topic, .home-new-torrents { - margin: 20px 0; - color: #4d4e53; + margin: 50px 20px; + //color: #fff; + //text-shadow: 0 0 0.1em #000,-0 -0 0.1em #000; .list-items { //background-color: #fafbfc; //box-shadow: 2px 2px 2px rgba(0, 0, 0, .075); - margin-top: -25px; - padding: 20px 10px; - border-top: solid 2px @mt-base-color; + //margin-top: -25px; + //padding: 20px 10px; + //border-top: solid 2px @mt-base-color; p { margin: 0 0 5px; //&:before { @@ -112,6 +113,43 @@ } } +.home-button-list { + padding: 50px 0; + @media (max-width: @screen-xs-max) { + padding-top: 20px; + .fun-item { + .fa-stack { + margin-top: 30px; + } + } + } + .fun-item { + .fa-stack { + cursor: pointer; + font-size: 50px; + color: #fff; + .fun-icon { + color: @mt-base-color; + } + } + .fun-desc { + font-size: 14px; + color: #8a8a8a; + } + &:hover { + .fa-stack { + color: @mt-base-color; + .fun-icon { + color: #fff; + } + } + .fun-desc { + color: #000; + } + } + } +} + .home_vip_info { background-color: #f7f7f7; background-image: url("https://image.tmdb.org/t/p/w1280/wwPWKRteE3vxTMta2IxdRgEhYsq.jpg"); @@ -212,8 +250,75 @@ } } +.body-backdrop { + background-image: url("https://image.tmdb.org/t/p/w1280/cnKAGbX1rDkAquF2V1wVkptHDJO.jpg"); + background-position: center; + background-attachment: fixed; + background-repeat: no-repeat; + background-size: cover; + height: 100%; + width: 100%; +} + +.filter-search { + position: relative; + background-color: #2a2a2a; + background-color: rgba(42, 42, 42, .9); +} + +.filter-notice { + position: relative; + margin-top: 2px; + background-color: @mt-body-background-color; + background-color: rgba(255, 255, 255, .9); +} + +.filter-vip { + position: relative; + margin-top: 2px; + background-color: @mt-body-background-color; + background-color: rgba(255, 255, 255, .9); +} + +.filter-button-list { + position: relative; + margin-top: 2px; + background-color: @mt-body-background-color; + background-color: rgba(255, 255, 255, .9); +} + +.filter-copy { + position: relative; + line-height: 2; + margin-top: 2px; + padding: 30px 0; + background-color: #2a2a2a; + background-color: rgba(42, 42, 42, .9); +} + +.filter-footer { + position: relative; + margin-top: 2px; + padding: 30px 0; + color: #aaa; + background-color: #2a2a2a; + background-color: rgba(42, 42, 42, .9); +} + +.filter-disclaimer { + position: relative; + margin-top: 2px; + padding: 30px 0 60px 0; + background-color: @progress-bar-danger-bg; + background-color: rgba(217, 83, 79, .9); +} + +.home-torrents { + margin-top: 2px; + background-color: #fff; +} + .home_global_search { - background-color: #f7f7f7; @media (min-width: @screen-sm-min) { .search-row { display: table; @@ -228,15 +333,21 @@ } .search-panel { min-height: 120px; - padding: 20px; + padding: 20px 0; text-shadow: 0 0 0.1em #000,-0 -0 0.1em #000; .search-title { + color: #fff; font-size: 2em; font-weight: 400; margin-bottom: 0 !important; } + .search-sub-title { + margin-top: 10px; + color: #aaa; + text-shadow: 0 0 0.1em #000, 0 0 0.1em #000; + } .search-group { - max-width: 40em; + max-width: 50em; margin-right: auto; margin-left: auto; display: block; @@ -269,7 +380,8 @@ } } .search-type { - text-shadow: 1px 1px 3px rgba(0, 1, 0, 0.5), 0 0 9px rgba(0, 1, 0, 0.2); + color: #aaa; + text-shadow: 0 0 0.1em #000, 0 0 0.1em #000; input { opacity: 0.6; &:hover, @@ -278,6 +390,49 @@ opacity: 1; } } + .radio-inline + .radio-inline, + .checkbox-inline + .checkbox-inline { + margin-top: 0; + margin-left: 50px; // space out consecutive inline controls + } + } } } + +.view-footer { + color: #aaa; + font-size: 12px; + .icon-list { + color: #fff; + } +} + +.disclaimer { + font-size: 16px; + line-height: 1.5; + color: #fff; +} + +.view-footer .icon { + font-size: 20px; + margin-right: 15px; +} + +.site-info { + line-height: 2em; + .info-item { + position: relative; + border-bottom: dotted 1px #000; + .item-data { + position: absolute; + left: 150px; + } + } +} + +.copy-info { + margin-top: 30px; + padding-top: 30px; + border-top: solid 1px #1a1a1a; +} diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index 2a260311..acace7a9 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -14,11 +14,6 @@ body { background-color: @mt-body-background-color; } -.bodysize { - background-color: @mt-content-background-color; - min-height: 600px; -} - .social-list { img { border-radius: 12px; diff --git a/modules/core/client/views/footer.client.view.html b/modules/core/client/views/footer.client.view.html index 995afc6e..2a33c8d5 100644 --- a/modules/core/client/views/footer.client.view.html +++ b/modules/core/client/views/footer.client.view.html @@ -1,38 +1,59 @@ -
-
-
-
-
-
{{'TOTAL_USERS' | translate}}:　{{vm.siteInfo.totalUsers}}
-
{{'TOTAL_VIP_USERS' | translate}}:　{{vm.siteInfo.totalVipUsers}}
-
{{'TOTAL_TORRENTS' | translate}}:　{{vm.siteInfo.totalTorrents}}
-
{{'TOTAL_TORRENTSSIZE' | translate}}:　{{vm.siteInfo.totalTorrentsSize | bytes}}
-
{{'TOTAL_SEEDERS' | translate}}:　{{vm.siteInfo.totalSeeders}}
-
{{'TOTAL_LEECHERS' | translate}}:　{{vm.siteInfo.totalLeechers}}
-
{{'TOTAL_UPLOADED' | translate}}:　{{vm.siteInfo.totalUploaded | bytes}}
-
{{'TOTAL_DOWNLOADED' | translate}}:　{{vm.siteInfo.totalDownloaded | bytes}}
-
{{'TOTAL_FORUMTOPICS' | translate}}:　{{vm.siteInfo.totalForumTopics}}
-
{{'TOTAL_FORUMREPLIES' | translate}}:　{{vm.siteInfo.totalForumReplies}}
+
+
+
+
+
+
+
{{'TOTAL_USERS' | translate}}:　{{vm.siteInfo.totalUsers}}
+
{{'TOTAL_VIP_USERS' | translate}}:　{{vm.siteInfo.totalVipUsers}}
+
{{'TOTAL_TORRENTS' | translate}}:　{{vm.siteInfo.totalTorrents}}
+
{{'TOTAL_TORRENTSSIZE' | translate}}:　{{vm.siteInfo.totalTorrentsSize | bytes}}
+
{{'TOTAL_SEEDERS' | translate}}:　{{vm.siteInfo.totalSeeders}}
+
{{'TOTAL_LEECHERS' | translate}}:　{{vm.siteInfo.totalLeechers}}
+
{{'TOTAL_UPLOADED' | translate}}:　{{vm.siteInfo.totalUploaded | bytes}}
+
{{'TOTAL_DOWNLOADED' | translate}}:　{{vm.siteInfo.totalDownloaded | bytes}}
+
{{'TOTAL_FORUMTOPICS' | translate}}:　{{vm.siteInfo.totalForumTopics}}
+
{{'TOTAL_FORUMREPLIES' | translate}}:　{{vm.siteInfo.totalForumReplies}}
+
+
+
+
+
-
-
-
    +
+
+ +
+
+
+
+
  • - - - + + +
-
-
- - - - +
+ + + + +
diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html index 41043afe..7e9a3694 100644 --- a/modules/core/client/views/home.client.view.html +++ b/modules/core/client/views/home.client.view.html @@ -35,156 +35,158 @@
-
-
+
+
+
+
+
+
+
+

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

-

+
+
+ + + +
+

+ {{t.pushHomeAt | date: 'MM-dd HH:mm:ss'}} - + {{t.title}} +

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

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

-
- - +
+
+ {{'HOME.MORE_VIP_RULES_AND_RIGHT' | translate}}
+ + {{'HOME.BTN_JOIN_VIP' | translate}} +
-
-
-
-
-
-
- - - - - - - - -
-
-

- {{t.pushHomeAt | date: 'MM-dd HH:mm'}} - - {{t.title}} -

-
-
-
-
-
-
- - - - - -
-
-

- {{t.pushHomeAt | date: 'MM-dd HH:mm'}} - - {{t.title}} -

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

+ +
+
-
-
-

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

+
+
+
+ +
+
+
+
+
+
+ +
+
+

+ {{t.createdAt | date: 'MM-dd HH:mm'}} - + {{t.title}} +

+
-
-
- {{'HOME.MORE_VIP_RULES_AND_RIGHT' | translate}} +
+
+
+
+ +
+
+

+ {{t.createdat | date: 'MM-dd HH:mm'}} - + {{t.torrent_filename}} +

+
- - {{'HOME.BTN_JOIN_VIP' | translate}} -
-
-
-
-
-
- - - - - - - - -
-
-

- {{t.createdAt | date: 'MM-dd HH:mm'}} - - {{t.title}} -

-
-
-
-
-
-
- - - - - -
-
-

- {{t.createdat | date: 'MM-dd HH:mm'}} - - {{t.torrent_filename}} -

-
+
+ +
+
+
+
+
- -
\ No newline at end of file diff --git a/modules/core/server/views/layout.server.view.html b/modules/core/server/views/layout.server.view.html index cbd1a554..b8e9ac53 100644 --- a/modules/core/server/views/layout.server.view.html +++ b/modules/core/server/views/layout.server.view.html @@ -41,9 +41,9 @@ {{#each cssFiles}}{{/each}} - +
-
+
{{{block "content"}}}
diff --git a/modules/forums/client/views/search-result.client.view.html b/modules/forums/client/views/search-result.client.view.html index 007b126b..efc23795 100644 --- a/modules/forums/client/views/search-result.client.view.html +++ b/modules/forums/client/views/search-result.client.view.html @@ -3,7 +3,7 @@
-
+
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html index 3263e965..80d92861 100644 --- a/modules/torrents/client/views/view-torrent.client.view.html +++ b/modules/torrents/client/views/view-torrent.client.view.html @@ -190,7 +190,7 @@
-