diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index 7e969aa0..09f25447 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -580,8 +580,8 @@ body { .torrent-list-info { .media-object { - max-height: 100px; - //opacity: 0.8; + height: 100px; + width: 66.66px; opacity: 1; } .media-body { diff --git a/modules/torrents/client/controllers/admin/admin-list.client.controller.js b/modules/torrents/client/controllers/admin/admin-list.client.controller.js index 36a84c3e..24fb371b 100644 --- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js +++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js @@ -19,6 +19,7 @@ vm.torrentSalesType = MeanTorrentConfig.meanTorrentConfig.torrentSalesType; vm.torrentRLevels = MeanTorrentConfig.meanTorrentConfig.torrentRecommendLevel; vm.torrentType = MeanTorrentConfig.meanTorrentConfig.torrentType; + vm.voteTitleConfig = MeanTorrentConfig.meanTorrentConfig.voteTitle; vm.selectedType = 'movie'; vm.searchTags = []; @@ -493,5 +494,79 @@ }); }); }; + + /** + * getTorrentListImage + * @param item + * @returns {string} + */ + vm.getTorrentListImage = function (item) { + var result = null; + + switch (vm.selectedType) { + case 'movie': + case 'tvserial': + result = vm.tmdbConfig.posterListBaseUrl + item.resource_detail_info.poster_path; + break; + case 'music': + result = '/modules/torrents/client/uploads/cover/' + item.resource_detail_info.cover; + break; + } + return result; + }; + + /** + * getTorrentTitle + * @param item + * @returns {string} + */ + vm.getTorrentTitle = function (item) { + var result = null; + + switch (vm.selectedType) { + case 'movie': + result = item.resource_detail_info.original_title; + break; + case 'tvserial': + result = item.resource_detail_info.original_name; + break; + case 'music': + result = item.resource_detail_info.title; + break; + } + return result; + }; + + /** + * getTorrentOriginalTitle + * @param item + * @returns {string} + */ + vm.getTorrentOriginalTitle = function (item) { + var result = null; + + switch (vm.selectedType) { + case 'movie': + if (item.resource_detail_info.original_title != item.resource_detail_info.title) { + result = item.resource_detail_info.title; + } + break; + case 'tvserial': + if (item.resource_detail_info.original_name != item.resource_detail_info.name) { + result = item.resource_detail_info.name; + } + break; + } + return result; + }; + + /** + * getVoteTitle + * @param item + * @returns {string} + */ + vm.getVoteTitle = function(item){ + return item.resource_detail_info.vote_average? vm.voteTitleConfig.imdb : vm.voteTitleConfig.mt; + } } }()); diff --git a/modules/torrents/client/views/admin/admin-list.client.view.html b/modules/torrents/client/views/admin/admin-list.client.view.html index 1114bae6..927ed211 100644 --- a/modules/torrents/client/views/admin/admin-list.client.view.html +++ b/modules/torrents/client/views/admin/admin-list.client.view.html @@ -11,7 +11,8 @@
@@ -142,7 +143,7 @@ {{ 'TABLE_FIELDS.INFO' | translate}} - {{ 'TABLE_FIELDS.VOTES' | translate}} + {{ 'TABLE_FIELDS.VOTES' | translate}} {{ 'TABLE_FIELDS.LIFETIME' | translate}} {{ 'TABLE_FIELDS.SIZE' | translate}} @@ -158,7 +159,7 @@
- ...
@@ -170,21 +171,17 @@
-
{{item.resource_detail_info.original_title}} - / {{item.resource_detail_info.title}} +
{{vm.getTorrentTitle(item)}} + / {{vm.getTorrentOriginalTitle(item)}} (By: - - ) -
-
{{item.resource_detail_info.original_name}} - / {{item.resource_detail_info.name}} - (By: {{item.user.displayName}}) + )
{{t.name}}
+
{{item.resource_detail_info.subtitle}}
{{item.torrent_filename | filename}}
@@ -225,7 +222,7 @@ IMDB {{item.resource_detail_info.vote_average | number : 1}} + class="torrent-votes">{{vm.getVoteTitle(item)}} {{item.resource_detail_info.vote_average | number : 1}} {{item.createdat | life}} {{item.torrent_size | bytes:2}}