diff --git a/config/env/torrents.js b/config/env/torrents.js index 0a9ce462..109c140e 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -295,7 +295,7 @@ module.exports = { home: { showVipBanner: false, showForumNewTopicsAndNewestTorrents: false, - showTopLevelTorrents: true, + showTopLevelTorrents: false, showAlbumsList: true, bodyBackgroundImage: 'https://image.tmdb.org/t/p/w1280/cnKAGbX1rDkAquF2V1wVkptHDJO.jpg', buttonList: [ @@ -908,7 +908,7 @@ module.exports = { pageTitle: 'PICTURE_LIST', uploadTemplateID: 'default', showSubtitleTabInDetailPage: false, - showTopListInHome: true + showTopListInHome: false }, { enable: true, @@ -1419,8 +1419,8 @@ module.exports = { requestListPerPage: 15, requestCommentsPerPage: 20, - homeOrderTorrentListPerType: 9, - homeNewestTorrentListPerType: 14, + homeOrderTorrentListPerType: 9, //do net change this + homeNewestTorrentListPerType: 14, //do net change this homeHelpListLimit: 8, homeNoticeListLimit: 8, homeNewTopicListLimit: 8, diff --git a/config/lib/populateStrings.js b/config/lib/populateStrings.js index fc04ae77..2dcf0d5c 100644 --- a/config/lib/populateStrings.js +++ b/config/lib/populateStrings.js @@ -105,7 +105,6 @@ module.exports.populate_torrent_object_is_home = { 'torrent_announce': 0, 'torrent_nfo': 0, 'torrent_media_info': 0, - 'screenshots_image': 0, '_other_torrents': 0, '_ratings': 0, '_replies': 0, diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index f377704b..7c12eaab 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -99,6 +99,7 @@ NEWEST_TV_LIST: 'Newest TV Serial Torrents', NEWEST_MUSIC_LIST: 'Newest Music Torrents', NEWEST_SPORTS_LIST: 'Newest Sports Torrents', + NEWEST_DOCUMENTARY_LIST: 'Newest Documentary Torrents', NEWEST_VARIETY_LIST: 'Newest Variety Torrents', NEWEST_PICTURE_LIST: 'Newest Picture Torrents', NEWEST_GAME_LIST: 'Newest Game Torrents', diff --git a/modules/core/client/app/trans-string-zh-tw.js b/modules/core/client/app/trans-string-zh-tw.js index 450cb1d5..344463df 100644 --- a/modules/core/client/app/trans-string-zh-tw.js +++ b/modules/core/client/app/trans-string-zh-tw.js @@ -99,6 +99,7 @@ NEWEST_TV_LIST: '最新電視劇資源', NEWEST_MUSIC_LIST: '最新音樂資源', NEWEST_SPORTS_LIST: '最新體育資源', + NEWEST_DOCUMENTARY_LIST: '最新記錄片資源', NEWEST_VARIETY_LIST: '最新綜藝資源', NEWEST_PICTURE_LIST: '最新圖片資源', NEWEST_GAME_LIST: '最新遊戲資源', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index b161637e..d7944426 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -99,6 +99,7 @@ NEWEST_TV_LIST: '最新电视剧资源', NEWEST_MUSIC_LIST: '最新音乐资源', NEWEST_SPORTS_LIST: '最新体育资源', + NEWEST_DOCUMENTARY_LIST: '最新记录片资源', NEWEST_VARIETY_LIST: '最新综艺资源', NEWEST_PICTURE_LIST: '最新图片资源', NEWEST_GAME_LIST: '最新游戏资源', diff --git a/modules/core/client/controllers/home_torrents.client.controller.js b/modules/core/client/controllers/home_torrents.client.controller.js index 7569abbd..0b1aae28 100644 --- a/modules/core/client/controllers/home_torrents.client.controller.js +++ b/modules/core/client/controllers/home_torrents.client.controller.js @@ -73,6 +73,17 @@ }, 10); }; + /** + * initTopOneDocumentaryInfo + */ + vm.initTopOneDocumentaryInfo = function () { + $timeout(function () { + if (vm.documentaryTopOne.resource_detail_info.cover) { + $('.documentary-backdrop').css('backgroundImage', 'url("/modules/torrents/client/uploads/cover/' + vm.documentaryTopOne.resource_detail_info.cover + '")'); + } + }, 10); + }; + /** * initTopOneVarietyInfo */ @@ -149,7 +160,7 @@ torrent_status: 'reviewed', torrent_type: 'movie', torrent_vip: false, - limit: 9, + limit: vm.itemsPerPageConfig.homeOrderTorrentListPerType, isHome: true }, function (items) { if (items.rows.length > 0) { @@ -190,7 +201,7 @@ torrent_status: 'reviewed', torrent_type: 'tvserial', torrent_vip: false, - limit: 9, + limit: vm.itemsPerPageConfig.homeOrderTorrentListPerType, isHome: true }, function (items) { if (items.rows.length > 0) { @@ -223,7 +234,7 @@ torrent_status: 'reviewed', torrent_type: 'music', torrent_vip: false, - limit: 9, + limit: vm.itemsPerPageConfig.homeOrderTorrentListPerType, isHome: true }, function (items) { if (items.rows.length > 0) { @@ -256,7 +267,7 @@ torrent_status: 'reviewed', torrent_type: 'sports', torrent_vip: false, - limit: 9, + limit: vm.itemsPerPageConfig.homeOrderTorrentListPerType, isHome: true }, function (items) { if (items.rows.length > 0) { @@ -281,6 +292,39 @@ }); }; + /** + * getDocumentaryTopInfo + */ + vm.getDocumentaryTopInfo = function () { + vm.documentaryInfo = TorrentsService.get({ + torrent_status: 'reviewed', + torrent_type: 'documentary', + torrent_vip: false, + limit: vm.itemsPerPageConfig.homeOrderTorrentListPerType, + isHome: true + }, function (items) { + if (items.rows.length > 0) { + vm.documentaryTopOne = items.rows[0]; + items.rows.splice(0, 1); + vm.documentaryTopList = items.rows; + + vm.initTopOneDocumentaryInfo(); + } + }); + + vm.documentaryInfo = TorrentsService.get({ + torrent_status: 'reviewed', + torrent_type: 'documentary', + torrent_vip: false, + newest: true, + limit: vm.itemsPerPageConfig.homeNewestTorrentListPerType + }, function (items) { + if (items.rows.length > 0) { + vm.documentaryNewList = items.rows; + } + }); + }; + /** * getVarietyTopInfo */ @@ -289,7 +333,7 @@ torrent_status: 'reviewed', torrent_type: 'variety', torrent_vip: false, - limit: 9, + limit: vm.itemsPerPageConfig.homeOrderTorrentListPerType, isHome: true }, function (items) { if (items.rows.length > 0) { @@ -322,7 +366,7 @@ torrent_status: 'reviewed', torrent_type: 'picture', torrent_vip: false, - limit: 9, + limit: vm.itemsPerPageConfig.homeOrderTorrentListPerType, isHome: true }, function (items) { if (items.rows.length > 0) { @@ -356,7 +400,7 @@ torrent_status: 'reviewed', torrent_type: 'game', torrent_vip: false, - limit: 9, + limit: vm.itemsPerPageConfig.homeOrderTorrentListPerType, isHome: true }, function (items) { if (items.rows.length > 0) { @@ -389,7 +433,7 @@ torrent_status: 'reviewed', torrent_type: 'software', torrent_vip: false, - limit: 9, + limit: vm.itemsPerPageConfig.homeOrderTorrentListPerType, isHome: true }, function (items) { if (items.rows.length > 0) { @@ -422,7 +466,7 @@ torrent_status: 'reviewed', torrent_type: 'ebook', torrent_vip: false, - limit: 9, + limit: vm.itemsPerPageConfig.homeOrderTorrentListPerType, isHome: true }, function (items) { if (items.rows.length > 0) { diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index 7afeec75..abb23dd0 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -266,7 +266,7 @@ body { } } .torrent-overview { - max-height: 400px; + max-height: 250px; overflow: auto; padding-right: 5px; &::-webkit-scrollbar { diff --git a/modules/core/client/views/home_torrents.client.view.html b/modules/core/client/views/home_torrents.client.view.html index 479b485f..9990e4aa 100644 --- a/modules/core/client/views/home_torrents.client.view.html +++ b/modules/core/client/views/home_torrents.client.view.html @@ -467,6 +467,193 @@ + +
+
+
+
{{'MENU_TORRENTS_SUB.DOCUMENTARY' | translate}}
+
+
+
+ + + + +
+ +
+
+
+
+
{{ 'TMDB_FIELDS.TITLE' | translate}}：
+
{{vm.TGI.getTorrentTitle(vm.documentaryTopOne)}}
+ +
{{ 'TMDB_FIELDS.SUB_TITLE' | translate}}：
+
{{vm.documentaryTopOne.resource_detail_info.subtitle}}
+ +
{{ 'TMDB_FIELDS.VOTE_AVERAGE' | translate}}：
+
+ + + {{vm.TGI.getVoteTitle(vm.documentaryTopOne)}} + {{vm.documentaryTopOne.resource_detail_info.vote_average | number : 1}} / {{vm.documentaryTopOne.resource_detail_info.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}} + +
+ +
{{ 'TMDB_FIELDS.OVERVIEW' | translate}}：
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+ + + + +
+
+
    +
  • + {{item.resource_detail_info.artist}} + {{'BTN_DOWNLOAD' | translate}} + {{vm.TGI.getVoteTitle(item)}} {{item.resource_detail_info.vote_average | number : 1}} +
    • +
+
+ +
+ +
+
+
+
+
+ +
+
+
+
+
+
{{'NEWEST_DOCUMENTARY_LIST' | translate}}
+ {{'NEWEST_MORE' | translate}} +
+ + + + +
+ + {{vm.TGI.getTorrentTitle(nm)}} + + + +
{{'BTN_DOWNLOAD' | translate}}
+ +
+
+
+ {{$index + 1}}. {{vm.TGI.getTorrentTitle(nm)}} +
+
+ + +
+ {{$index + 1}}. {{vm.TGI.getTorrentTitle(nm)}} +
+
+
+
+
+
+
+
+
+
+ @@ -517,6 +704,13 @@ ng-bind-html="vm.getOverviewMarkedContent(vm.TGI.getTorrentOverview(vm.musicTopOne))"> + +
+
+ +
+
@@ -702,6 +896,13 @@ ng-bind-html="vm.getOverviewMarkedContent(vm.TGI.getTorrentOverview(vm.sportsTopOne))"> + +
+
+ +
+
@@ -882,6 +1083,13 @@ ng-bind-html="vm.getOverviewMarkedContent(vm.TGI.getTorrentOverview(vm.varietyTopOne))"> + +
+
+ +
+
@@ -1062,6 +1270,12 @@ ng-bind-html="vm.getOverviewMarkedContent(vm.TGI.getTorrentOverview(vm.pictureTopOne))"> +
+
+ +
+
@@ -1242,6 +1456,13 @@ ng-bind-html="vm.getOverviewMarkedContent(vm.TGI.getTorrentOverview(vm.gameTopOne))"> + +
+
+ +
+
@@ -1422,6 +1643,13 @@ ng-bind-html="vm.getOverviewMarkedContent(vm.TGI.getTorrentOverview(vm.softwareTopOne))"> + +
+
+ +
+
@@ -1602,6 +1830,13 @@ ng-bind-html="vm.getOverviewMarkedContent(vm.TGI.getTorrentOverview(vm.ebookTopOne))"> + +
+
+ +
+