From fd3f7e19879b247b6944614af3d87dd4facd7409 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Thu, 20 Apr 2017 12:13:25 +0800 Subject: [PATCH] add movie detail info subtitles/users badge number --- .../announces.server.controller.js | 47 --------------- modules/core/client/less/badge.less | 36 ++++++++++++ .../controllers/torrents.client.controller.js | 58 ++++++++++++++++--- .../views/view-torrent.client.view.html | 5 +- 4 files changed, 90 insertions(+), 56 deletions(-) create mode 100644 modules/core/client/less/badge.less diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js index 3d2aa0d4..6e3e9dc8 100644 --- a/modules/announce/server/controllers/announces.server.controller.js +++ b/modules/announce/server/controllers/announces.server.controller.js @@ -378,53 +378,6 @@ exports.announce = function (req, res) { done(null); }, - /*--------------------------------------------------------------- - mongodb write - ---------------------------------------------------------------*/ - - //function (done) { - // if (req.currentPeer !== undefined) { - // req.currentPeer.save(function (err) { - // if (err) { - // console.error('************ SAVE ERROR: 182'); - // console.error(err); - // done(182); - // return; - // } else { - // done(null); - // } - // }); - // } else { - // done(null); - // } - //}, - // - //function (done) { - // req.torrent.save(function (err) { - // if (err) { - // console.error('************ SAVE ERROR: 183'); - // console.error(err); - // done(183); - // return; - // } else { - // done(null); - // } - // }); - //}, - // - //function (done) { - // req.passkeyuser.save(function (err) { - // if (err) { - // console.error('************ SAVE ERROR: 184'); - // console.error(err); - // done(184); - // return; - // } else { - // done(null); - // } - // }); - //}, - /*--------------------------------------------------------------- sendPeers compact mode diff --git a/modules/core/client/less/badge.less b/modules/core/client/less/badge.less new file mode 100644 index 00000000..2ed2fcd5 --- /dev/null +++ b/modules/core/client/less/badge.less @@ -0,0 +1,36 @@ +@import (reference) "../../../../public/lib/bootstrap/less/variables.less"; + +@badge-margin: 2px; + +.badge_info { + margin: 0 @badge-margin; + background-color: @brand-info; +} +.badge_primary { + margin: 0 @badge-margin; + background-color: @brand-primary; +} +.badge_success { + margin: 0 @badge-margin; + background-color: @brand-success; +} +.badge_warning { + margin: 0 @badge-margin; + background-color: @brand-warning; +} +.badge_danger { + margin: 0 @badge-margin; + background-color: @brand-danger; +} +.badge_seeder { + margin: 0 @badge-margin; + background-color: #33CC00; +} +.badge_leecher { + margin: 0 @badge-margin; + background-color: #FF3300; +} +.badge_finished { + margin: 0 @badge-margin; + background-color: #0366d6; +} diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js index cbe5e08d..dc2bd047 100644 --- a/modules/torrents/client/controllers/torrents.client.controller.js +++ b/modules/torrents/client/controllers/torrents.client.controller.js @@ -24,14 +24,7 @@ vm.pageNumber = 50; vm.releaseYear = undefined; - vm.torrentTabs = [ - {title: $translate.instant('TAB_VIDEO_INFO'), templateUrl: 'videoInfo.html'}, - {title: $translate.instant('TAB_USER_SUBTITLE'), templateUrl: 'subtitleInfo.html'}, - {title: $translate.instant('TAB_USER_INFO'), templateUrl: 'userInfo.html'}, - {title: $translate.instant('TAB_OTHER_TORRENTS'), templateUrl: 'otherTorrents.html'}, - {title: $translate.instant('TAB_MY_PANEL'), templateUrl: 'myPanel.html'}, - {title: $translate.instant('TAB_ADMIN_PANEL'), templateUrl: 'adminPanel.html'} - ]; + vm.torrentTabs = []; // If user is not signed in then redirect back home if (!Authentication.user) { @@ -252,6 +245,55 @@ $('.backdrop').css('backgroundImage', 'url(' + vm.tmdbConfig.backdrop_img_base_url + res.torrent_backdrop_img + ')'); } vm.initInfo(res.torrent_tmdb_id); + + vm.torrentTabs.push( + { + title: $translate.instant('TAB_VIDEO_INFO'), + templateUrl: 'videoInfo.html', + ng_show: true, + badges: [] + }, + { + title: $translate.instant('TAB_USER_SUBTITLE'), + templateUrl: 'subtitleInfo.html', + ng_show: true, + badges: [ + { + value: vm.torrentLocalInfo._subtitles.length, + class: 'badge_info' + } + ] + }, + { + title: $translate.instant('TAB_USER_INFO'), + templateUrl: 'userInfo.html', + ng_show: true, + badges: [ + { + value: '↑ ' + vm.torrentLocalInfo.torrent_seeds + ' ↓ ' + vm.torrentLocalInfo.torrent_leechers + ' √ ' + vm.torrentLocalInfo.torrent_finished, + class: 'badge_info' + } + ] + }, + { + title: $translate.instant('TAB_OTHER_TORRENTS'), + templateUrl: 'otherTorrents.html', + ng_show: true, + badges: [] + }, + { + title: $translate.instant('TAB_MY_PANEL'), + templateUrl: 'myPanel.html', + ng_show: vm.torrentLocalInfo.isCurrentUserOwner, + badges: [] + }, + { + title: $translate.instant('TAB_ADMIN_PANEL'), + templateUrl: 'adminPanel.html', + ng_show: vm.user.roles.indexOf('admin') >= 0, + badges: [] + } + ); }); console.log(vm.torrentLocalInfo); diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html index 878c8aa2..10af6355 100644 --- a/modules/torrents/client/views/view-torrent.client.view.html +++ b/modules/torrents/client/views/view-torrent.client.view.html @@ -135,7 +135,10 @@
- + + + {{tab.title}} {{b.value}} +