From 09e239fa2a9b59b47a53922f6b44cace9990df6a Mon Sep 17 00:00:00 2001 From: OldHawk Date: Wed, 24 May 2017 12:04:56 +0800 Subject: [PATCH] feat(TVseries): load TVSeries data in list page/detail page --- modules/core/client/app/trans-string-en.js | 11 +- modules/core/client/app/trans-string-zh.js | 13 +- modules/core/client/less/mt.less | 18 ++- .../core/client/views/home.client.view.html | 36 +++--- .../client/config/torrents.client.routes.js | 27 +++- .../torrent-info.client.controller.js | 44 ++++--- .../controllers/torrents.client.controller.js | 47 +++++-- .../client/views/movie-list.client.view.html | 120 ++++++++++++------ .../views/view-torrent.client.view.html | 110 +++++++++++----- .../controllers/torrents.server.controller.js | 1 - 10 files changed, 305 insertions(+), 122 deletions(-) diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index e19e382e..85cacda5 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -52,6 +52,7 @@ LOADING_TOP: 'Loading recommended info, please waiting...', TOP_MOVIE_INFO_ERROR: 'Get movie top info failed', NEWEST_MOVIE_LIST: 'Newest Movie Torrents', + NEWEST_TV_LIST: 'Newest TV Series Torrents', //element title/alt TITLE_ALT: { @@ -99,6 +100,9 @@ PAGETITLE: { UPLOAD: 'Upload', MOVIE_LIST: 'Movie List', + TV_LIST: 'TV List', + MUSIC_LIST: 'Music List', + OTHER_LIST: 'Other List', TORRENT_INFO: 'Torrent Info', RANKING: 'Ranking', RULES: 'Rules', @@ -113,8 +117,9 @@ }, //TorrentsController & views - MOVIE_PAGE_INFO_ERROR: 'Get movie page info failed', - MOVIE_PAGE_INFO_EMPTY: 'No movie founded, please change some new tags to research', + TOP_LIST_INFO_ERROR: 'Get top list info failed', + LIST_PAGE_INFO_ERROR: 'Get resources page info failed', + LIST_PAGE_INFO_EMPTY: 'No resources founded, please change some new tags to research', TAGS_SEARCH: 'Tags Search', CA_KEYWORD: 'Keyword', CA_TORRENT_STATUS: 'Torrent status', @@ -233,7 +238,7 @@ SELECT_TORRENT_FILE: '2. Please select the torrent file', SELECT_FILE: 'Select file', DO_UPLOAD: 'Upload', - ENTER_TMDB_ID: '3. Please enter theMovieDB id', + ENTER_TMDB_ID: '3. Please enter theMovieDB id', LOAD_TMDB_INFO: 'Load info', TMDB_ID: 'TMDB ID', TMDB_ID_OK: 'TMDB ID is ok! Get info successfully', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index e0833516..484b1c2d 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -51,7 +51,8 @@ //HomeController & home views LOADING_TOP: '正在推荐资源，请稍候...', TOP_MOVIE_INFO_ERROR: '获取电影Top列表失败', - NEWEST_MOVIE_LIST: '最新电影种子文件', + NEWEST_MOVIE_LIST: '最新电影种子', + NEWEST_TV_LIST: '最新电视剧种子', //element title/alt TITLE_ALT: { @@ -99,6 +100,9 @@ PAGETITLE: { UPLOAD: '上传', MOVIE_LIST: '电影列表', + TV_LIST: '电视剧列表', + MUSIC_LIST: '音乐列表', + OTHER_LIST: '其它列表', TORRENT_INFO: '种子信息', RANKING: '排行榜', RULES: '规则', @@ -113,8 +117,9 @@ }, //TorrentsController & views - MOVIE_PAGE_INFO_ERROR: '获取电影分页列表失败', - MOVIE_PAGE_INFO_EMPTY: '没有找到信息，请更换标签重新检索', + TOP_LIST_INFO_ERROR: '获取推荐列表失败', + LIST_PAGE_INFO_ERROR: '获取资源分页列表失败', + LIST_PAGE_INFO_EMPTY: '没有找到信息，请更换标签重新检索', TAGS_SEARCH: '标签检索', CA_KEYWORD: '关键字', CA_TORRENT_STATUS: '种子状态', @@ -233,7 +238,7 @@ SELECT_TORRENT_FILE: '2. 请选择种子文件', SELECT_FILE: '选择文件', DO_UPLOAD: '上传', - ENTER_TMDB_ID: '3. 请输入TMDB_ID', + ENTER_TMDB_ID: '3. 请输入TMDB_ID', LOAD_TMDB_INFO: '检索信息', TMDB_ID: 'TMDB ID', TMDB_ID_OK: 'MDB ID 正确，检索信息成功!', diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index a47d00c2..c269f46a 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -32,11 +32,21 @@ body { //opacity: 0.5; padding-top: 30px; padding-bottom: 20px; + position: relative; } .loading { color: #ccc; margin: 150px 0; } + .type-flag { + position: absolute; + right: 10px; + top: -20px; + font-size: 100px; + font-weight: bold; + text-shadow: 2px 0 0 #222, -2px 0 0 #222, 0 2px 0 #222, 0 -2px 0 #222; + filter: Glow(color=#f00, strength=100); + } .topone { color: #ccc; dt { @@ -456,7 +466,13 @@ body { .list-all-companies { .company-item { - margin: 0 0 0; + //margin: 20px 0 20px; + &:not(:first-child) { + &::before { + content: ' '; + display: block; + } + } } } diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html index c25c125c..901754f5 100644 --- a/modules/core/client/views/home.client.view.html +++ b/modules/core/client/views/home.client.view.html @@ -1,6 +1,7 @@
+
{{'MENU_TORRENTS_SUB.MOVIE' | translate}}
@@ -32,12 +33,12 @@ {{item.name}} -
{{ 'TMDB_FIELDS.PRODUCTION_COUNTRIES' | translate}}：
-
- {{item.name}} - - -
+ + + + + +
{{ 'TMDB_FIELDS.RELEASE_DATE' | translate}}：
{{vm.movieTopOne.resource_detail_info.release_date}}
@@ -98,7 +99,8 @@
- {{item.resource_detail_info.title}}