diff --git a/modules/forums/client/views/topic.client.view.html b/modules/forums/client/views/topic.client.view.html index e9ba3cc8..fb8e1afe 100644 --- a/modules/forums/client/views/topic.client.view.html +++ b/modules/forums/client/views/topic.client.view.html @@ -70,7 +70,8 @@
- + + ({{vm.topic.user.uploaded | bytes}} @@ -133,8 +134,11 @@ translate-values="{number: vm.topic._thumbs.length}">
+ ng-repeat="sl in vm.topic._thumbs track by $index"> + + + +
@@ -152,7 +156,8 @@
- + + ({{rep.user.uploaded | bytes}} @@ -204,8 +209,11 @@ translate-values="{number: rep._thumbs.length}">
+ ng-repeat="sl in rep._thumbs track by $index"> + + + +
diff --git a/modules/forums/server/controllers/forums.server.controller.js b/modules/forums/server/controllers/forums.server.controller.js index fb3c4419..c35b593f 100644 --- a/modules/forums/server/controllers/forums.server.controller.js +++ b/modules/forums/server/controllers/forums.server.controller.js @@ -36,10 +36,10 @@ exports.list = function (req, res) { path: 'lastTopic', populate: { path: 'user lastUser', - select: 'username displayName profileImageURL uploaded downloaded' + select: 'username displayName profileImageURL isVip uploaded downloaded' } }) - .populate('moderators', 'username displayName profileImageURL uploaded downloaded') + .populate('moderators', 'username displayName profileImageURL isVip uploaded downloaded') .exec(function (err, forums) { if (err) { callback(err, null); @@ -196,8 +196,8 @@ exports.forumsSearch = function (req, res) { var findQuery = function (callback) { Topic.find(condition) .sort('-lastReplyAt -createdAt') - .populate('user', 'username displayName profileImageURL uploaded downloaded') - .populate('lastUser', 'username displayName profileImageURL uploaded downloaded') + .populate('user', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('lastUser', 'username displayName profileImageURL isVip uploaded downloaded') .populate('forum', 'name category') .skip(skip) .limit(limit) @@ -252,8 +252,8 @@ exports.listTopics = function (req, res) { forum: req.params.forumId }) .sort('-isTop -lastReplyAt -createdAt') - .populate('user', 'username displayName profileImageURL uploaded downloaded') - .populate('lastUser', 'username displayName profileImageURL uploaded downloaded') + .populate('user', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('lastUser', 'username displayName profileImageURL isVip uploaded downloaded') .skip(skip) .limit(limit) .exec(function (err, topics) { @@ -285,8 +285,8 @@ exports.globalTopics = function (req, res) { }) .sort('-createdAt') .populate('forum', 'name') - .populate('user', 'username displayName profileImageURL uploaded downloaded') - .populate('lastUser', 'username displayName profileImageURL uploaded downloaded') + .populate('user', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('lastUser', 'username displayName profileImageURL isVip uploaded downloaded') .exec(function (err, topics) { if (err) { return res.status(422).send({ @@ -950,13 +950,13 @@ exports.topicById = function (req, res, next, id) { } Topic.findById(id) - .populate('user', 'username displayName profileImageURL uploaded downloaded score') - .populate('lastUser', 'username displayName profileImageURL uploaded downloaded') - .populate('updatedBy', 'username displayName profileImageURL uploaded downloaded') - .populate('_thumbs.user', 'username displayName profileImageURL uploaded downloaded') - .populate('_replies.user', 'username displayName profileImageURL uploaded downloaded') - .populate('_replies.updatedBy', 'username displayName profileImageURL uploaded downloaded') - .populate('_replies._thumbs.user', 'username displayName profileImageURL uploaded downloaded') + .populate('user', 'username displayName profileImageURL isVip uploaded downloaded score') + .populate('lastUser', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('updatedBy', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('_thumbs.user', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('_replies.user', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('_replies.updatedBy', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('_replies._thumbs.user', 'username displayName profileImageURL isVip uploaded downloaded') .exec(function (err, topic) { if (err) { return next(err); diff --git a/modules/invitations/client/views/admin/official.client.view.html b/modules/invitations/client/views/admin/official.client.view.html index 49d04ef7..b064940b 100644 --- a/modules/invitations/client/views/admin/official.client.view.html +++ b/modules/invitations/client/views/admin/official.client.view.html @@ -78,6 +78,7 @@ ng-mouseenter="vm.selectedUser=r.to_user"> + diff --git a/modules/messages/client/views/box.client.view.html b/modules/messages/client/views/box.client.view.html index 62f8d869..88b55160 100644 --- a/modules/messages/client/views/box.client.view.html +++ b/modules/messages/client/views/box.client.view.html @@ -52,12 +52,16 @@

- {{m.from_user.displayName}} {{'MESSAGES_FIELD.INFO_SEND_TO' | translate}} {{m.to_user.displayName}} {{'MESSAGES_FIELD.INFO_SEND_AT' | translate}} {{m.createdat | date: 'yyyy-MM-dd HH:mm:ss' }} + {{'MESSAGES_FIELD.INFO_SEND_TO' | translate}} + {{'MESSAGES_FIELD.INFO_SEND_AT' | translate}} {{m.createdat | date: 'yyyy-MM-dd HH:mm:ss' }} , {{'MESSAGES_FIELD.LAST_REPLY_AT' | translate}} {{m.updatedat | date: 'yyyy-MM-dd HH:mm:ss' }}

- {{m.from_user.displayName}} {{'MESSAGES_FIELD.INFO_SEND_AT' | translate}} {{m.createdat | date: 'yyyy-MM-dd HH:mm:ss' }} + {{'MESSAGES_FIELD.INFO_SEND_AT' | translate}} {{m.createdat | date: 'yyyy-MM-dd HH:mm:ss' }}

@@ -100,14 +104,19 @@
- +

- {{vm.selectedMessage.from_user.displayName}} {{'MESSAGES_FIELD.INFO_SEND_TO' | translate}} {{vm.selectedMessage.to_user.displayName}} {{'MESSAGES_FIELD.INFO_SEND_AT' | translate}} {{vm.selectedMessage.createdat | date: 'yyyy-MM-dd HH:mm:ss' }} + {{'MESSAGES_FIELD.INFO_SEND_TO' | translate}} + {{'MESSAGES_FIELD.INFO_SEND_AT' | translate}} {{vm.selectedMessage.createdat | date: 'yyyy-MM-dd HH:mm:ss' }}

- {{vm.selectedMessage.from_user.displayName}} {{'MESSAGES_FIELD.INFO_SEND_AT' | translate}} {{vm.selectedMessage.createdat | date: 'yyyy-MM-dd HH:mm:ss' }} + {{'MESSAGES_FIELD.INFO_SEND_AT' | translate}} {{vm.selectedMessage.createdat | date: 'yyyy-MM-dd HH:mm:ss' }}

@@ -125,7 +134,7 @@

- {{r.from_user.displayName}} | {{r.createdat | date: 'yyyy-MM-dd HH:mm:ss' }} + | {{r.createdat | date: 'yyyy-MM-dd HH:mm:ss' }}

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 16980048..fd7b6217 100644 --- a/modules/torrents/client/views/admin/admin-list.client.view.html +++ b/modules/torrents/client/views/admin/admin-list.client.view.html @@ -155,8 +155,9 @@
{{item.resource_detail_info.original_title}} / {{item.resource_detail_info.title}} - (By: {{item.user.displayName}} ) + (By: + + ) diff --git a/modules/torrents/client/views/movie-list.client.view.html b/modules/torrents/client/views/movie-list.client.view.html index bce0d967..24abb472 100644 --- a/modules/torrents/client/views/movie-list.client.view.html +++ b/modules/torrents/client/views/movie-list.client.view.html @@ -241,7 +241,7 @@ - + diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html index 1e46afa9..ece826ce 100644 --- a/modules/torrents/client/views/view-torrent.client.view.html +++ b/modules/torrents/client/views/view-torrent.client.view.html @@ -211,6 +211,7 @@
+ ({{item.user.uploaded | bytes}} @@ -331,6 +332,7 @@
{{ 'TABLE_FIELDS.PUBLISHER' | translate}}:
+
@@ -506,6 +508,7 @@ ng-if="item.peer_status == 'seeder'"> + {{item.peer_uploaded | bytes:2}} | {{item.peer_uspeed | bytes:2}}/s @@ -546,6 +549,7 @@ ng-if="item.peer_status == 'leecher'"> + {{item.peer_uploaded | bytes:2}} | {{item.peer_uspeed | bytes:2}}/s @@ -658,8 +662,11 @@ translate-values="{number: vm.torrentLocalInfo._thumbs.length}">
+ ng-repeat="sl in vm.torrentLocalInfo._thumbs track by $index"> + + + +
@@ -694,8 +701,12 @@ {{ 'ADMIN_BASIC_UPDATE' | translate}} - - + +
diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js index db578cc9..dee9d2b5 100644 --- a/modules/torrents/server/controllers/torrents.server.controller.js +++ b/modules/torrents/server/controllers/torrents.server.controller.js @@ -912,7 +912,7 @@ exports.list = function (req, res) { var findQuery = function (callback) { Torrent.find(condition) .sort(sort) - .populate('user', 'username displayName') + .populate('user', 'username displayName isVip') .skip(skip) .limit(limit) .exec(function (err, torrents) { @@ -1049,30 +1049,30 @@ exports.torrentByID = function (req, res, next, id) { var findTorrents = function (callback) { Torrent.findById(id) - .populate('user', 'username displayName profileImageURL') - .populate('_thumbs.user', 'username displayName profileImageURL uploaded downloaded') + .populate('user', 'username displayName profileImageURL isVip') + .populate('_thumbs.user', 'username displayName profileImageURL isVip uploaded downloaded') .populate({ path: '_replies.user', - select: 'username displayName profileImageURL uploaded downloaded', + select: 'username displayName profileImageURL isVip uploaded downloaded', model: 'User' }) .populate({ path: '_replies._replies.user', - select: 'username displayName profileImageURL uploaded downloaded', + select: 'username displayName profileImageURL isVip uploaded downloaded', model: 'User' }) .populate({ path: '_subtitles', populate: { path: 'user', - select: 'username displayName profileImageURL' + select: 'username displayName profileImageURL isVip' } }) .populate({ path: '_peers', populate: { path: 'user', - select: 'username displayName profileImageURL' + select: 'username displayName profileImageURL isVip' } }) .exec(function (err, torrent) { @@ -1097,7 +1097,7 @@ exports.torrentByID = function (req, res, next, id) { Torrent.find(condition, fields) .sort('-createdat') - .populate('user', 'username displayName') + .populate('user', 'username displayName isVip') .exec(function (err, torrents) { if (err) { callback(err); diff --git a/modules/traces/client/views/admin/list.client.view.html b/modules/traces/client/views/admin/list.client.view.html index 2a047ab2..da4d2d0d 100644 --- a/modules/traces/client/views/admin/list.client.view.html +++ b/modules/traces/client/views/admin/list.client.view.html @@ -40,7 +40,11 @@ - {{m.user.displayName}} + + + + + diff --git a/modules/traces/server/controllers/traces.server.controller.js b/modules/traces/server/controllers/traces.server.controller.js index 07154f25..16b3e406 100644 --- a/modules/traces/server/controllers/traces.server.controller.js +++ b/modules/traces/server/controllers/traces.server.controller.js @@ -40,7 +40,7 @@ exports.list = function (req, res) { var findQuery = function (callback) { Trace.find({}) .sort('-createdat') - .populate('user', 'username displayName') + .populate('user', 'username displayName isVip') .populate({ path: 'content.user', select: 'username displayName', @@ -109,7 +109,7 @@ exports.traceByID = function (req, res, next, id) { } Trace.findById(id) - .populate('user', 'displayName profileImageURL uploaded downloaded') + .populate('user', 'displayName profileImageURL isVip uploaded downloaded') .exec(function (err, trace) { if (err) { return next(err); diff --git a/modules/users/client/directives/vip-flag.client.directive.js b/modules/users/client/directives/vip-flag.client.directive.js index 0cb5abe2..9439e7bf 100644 --- a/modules/users/client/directives/vip-flag.client.directive.js +++ b/modules/users/client/directives/vip-flag.client.directive.js @@ -21,14 +21,18 @@ var title = $translate.instant('USER_IS_VIP', {name: user.displayName}); var cls = attrs.vipClass; - var e = angular.element('VIP'); + var e = angular.element('VIP'); if (e) { - e.addClass(cls ? cls : ''); - e.attr('title', title); + if (user.isVip) { + e.addClass(cls ? cls : ''); + e.attr('title', title); - element.html(e); - $compile(element.contents())(scope); + element.html(e); + $compile(element.contents())(scope); + } else { + element.html(''); + } } } }); diff --git a/modules/users/client/views/admin/list-users.client.view.html b/modules/users/client/views/admin/list-users.client.view.html index 5b141ee7..00ca4dbe 100644 --- a/modules/users/client/views/admin/list-users.client.view.html +++ b/modules/users/client/views/admin/list-users.client.view.html @@ -14,7 +14,7 @@ ng-class="{'span-banned': user.status == 'banned'}"> -

{{user.displayName}} - {{user.username}}

+

{{user.displayName}} - {{user.username}}

diff --git a/modules/users/client/views/admin/user-uplist.client.view.html b/modules/users/client/views/admin/user-uplist.client.view.html index b4fbb6f2..f8ff86d2 100644 --- a/modules/users/client/views/admin/user-uplist.client.view.html +++ b/modules/users/client/views/admin/user-uplist.client.view.html @@ -117,7 +117,11 @@ {{item.torrent_finished}}

- {{item.user.displayName}} + + + + + diff --git a/modules/users/client/views/admin/view-user.client.view.html b/modules/users/client/views/admin/view-user.client.view.html index 1ee3649d..e72ad27b 100644 --- a/modules/users/client/views/admin/view-user.client.view.html +++ b/modules/users/client/views/admin/view-user.client.view.html @@ -37,7 +37,10 @@
{{ 'STATUS_FIELD.DISPLAY_NAME' | translate}}:
-
{{ vm.user.displayName }}
+
+ {{ vm.user.displayName }} + +
{{ 'STATUS_FIELD.INVITED_BY' | translate}}:
diff --git a/modules/users/client/views/status/uploaded.client.view.html b/modules/users/client/views/status/uploaded.client.view.html index 8c040869..2719f1fe 100644 --- a/modules/users/client/views/status/uploaded.client.view.html +++ b/modules/users/client/views/status/uploaded.client.view.html @@ -128,7 +128,11 @@ {{item.torrent_finished}}

- {{item.user.displayName}} + + + + + diff --git a/modules/users/client/views/userinfo/userinfo.client.view.html b/modules/users/client/views/userinfo/userinfo.client.view.html index 754087db..50b2aa77 100644 --- a/modules/users/client/views/userinfo/userinfo.client.view.html +++ b/modules/users/client/views/userinfo/userinfo.client.view.html @@ -33,7 +33,10 @@
{{ 'STATUS_FIELD.DISPLAY_NAME' | translate}}:
-
{{ vm.user.displayName }}
+
+ {{ vm.user.displayName }} + +
{{ 'STATUS_FIELD.INVITED_BY' | translate}}: