Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-07-07 08:43:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): hide all info in app public tracker mode

Browse Source 
user uploaded
user download
user ratio
user seeded
user leeched
user finished
This commit is contained in:
OldHawk
2017-08-14 12:46:55 +08:00
parent 71989d3285
commit 23168f2cb3
21 changed files with 253 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/client/app/trans-string-en.js
View File

@@ -79,6 +79,7 @@
INFO: 'Torrent info',
SIZE: 'Size',
SEEDS_LEECHERS_FINISHED: 'S/L/F',
SEEDS_LEECHERS: 'S/L',
PUBLISHER: 'Uploader',
ADMIN_TOOLS: 'Admin Tools',
LIFETIME: 'Life',

1
modules/core/client/app/trans-string-zh.js
View File

@@ -79,6 +79,7 @@
INFO: '种子信息',
SIZE: '大小',
SEEDS_LEECHERS_FINISHED: '上/下/完',
SEEDS_LEECHERS: '上/下',
PUBLISHER: '发布者',
ADMIN_TOOLS: '管理工具',
LIFETIME: '存活时间',

1
modules/core/client/controllers/home.client.controller.js
View File

@@ -13,6 +13,7 @@
var vm = this;
vm.tmdbConfig = MeanTorrentConfig.meanTorrentConfig.tmdbConfig;
vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app;
vm.announceConfig = MeanTorrentConfig.meanTorrentConfig.announce;
vm.movieTopOne = undefined;
vm.movieTopList = undefined;

16
modules/core/client/views/home.client.view.html
View File

@@ -110,11 +110,11 @@
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>
<span>{{item.torrent_seeds}}</span>
</td>
<td class="text-center">
<td ng-class="vm.announceConfig.private_torrent_cms ? 'text-center' : 'text-right'">
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>
<span>{{item.torrent_leechers}}</span>
</td>
<td class="text-right">
<td class="text-right" ng-if="vm.announceConfig.private_torrent_cms">
<span class="glyphicon glyphicon-ok torrent-finished"></span>
<span>{{item.torrent_finished}}</span>
</td>
@@ -165,11 +165,11 @@
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>
<span>{{nt.torrent_seeds}}</span>
</td>
<td class="text-center">
<td ng-class="vm.announceConfig.private_torrent_cms ? 'text-center' : 'text-right'">
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>
<span>{{nt.torrent_leechers}}</span>
</td>
<td class="text-right">
<td class="text-right" ng-if="vm.announceConfig.private_torrent_cms">
<span class="glyphicon glyphicon-ok torrent-finished"></span>
<span>{{nt.torrent_finished}}</span>
</td>
@@ -318,11 +318,11 @@
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>
<span>{{item.torrent_seeds}}</span>
</td>
<td class="text-center">
<td ng-class="vm.announceConfig.private_torrent_cms ? 'text-center' : 'text-right'">
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>
<span>{{item.torrent_leechers}}</span>
</td>
<td class="text-right">
<td class="text-right" ng-if="vm.announceConfig.private_torrent_cms">
<span class="glyphicon glyphicon-ok torrent-finished"></span>
<span>{{item.torrent_finished}}</span>
</td>
@@ -373,11 +373,11 @@
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>
<span>{{nt.torrent_seeds}}</span>
</td>
<td class="text-center">
<td ng-class="vm.announceConfig.private_torrent_cms ? 'text-center' : 'text-right'">
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>
<span>{{nt.torrent_leechers}}</span>
</td>
<td class="text-right">
<td class="text-right" ng-if="vm.announceConfig.private_torrent_cms">
<span class="glyphicon glyphicon-ok torrent-finished"></span>
<span>{{nt.torrent_finished}}</span>
</td>

1
modules/forums/client/controllers/forums-topic.client.controller.js
View File

@@ -12,6 +12,7 @@
marked, ModalConfirmService, $stateParams, TopicsService, localStorageService, $compile, RepliesService, $filter, Upload, DownloadService) {
var vm = this;
vm.forumsConfig = MeanTorrentConfig.meanTorrentConfig.forumsConfig;
vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
vm.scoreConfig = MeanTorrentConfig.meanTorrentConfig.score;
vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app;

4
modules/forums/client/views/topic.client.view.html
View File

@@ -72,7 +72,7 @@
<span user-info="vm.topic.user" info-name></span>
<span score-level="vm.getUserScoreLevel(vm.topic.user);"></span>
<span message-to="vm.topic.user" to-class="message-to-icon"></span>
<span class="user-ud-text">
<span class="user-ud-text" ng-if="vm.announce.private_torrent_cms">
(<span class="glyphicon glyphicon-arrow-up torrent-up"></span>{{vm.topic.user.uploaded | bytes}}
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>{{vm.topic.user.downloaded | bytes}}
)
@@ -154,7 +154,7 @@
<span user-info="rep.user" info-name></span>
<span score-level="vm.getUserScoreLevel(vm.topic.user);"></span>
<span message-to="vm.topic.user" to-class="message-to-icon"></span>
<span class="user-ud-text">
<span class="user-ud-text" ng-if="vm.announce.private_torrent_cms">
(<span class="glyphicon glyphicon-arrow-up torrent-up"></span>{{rep.user.uploaded | bytes}}
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>{{rep.user.downloaded | bytes}}
)

1
modules/invitations/client/controllers/invitations.client.controller.js
View File

@@ -13,6 +13,7 @@
var vm = this;
vm.inviteConfig = MeanTorrentConfig.meanTorrentConfig.invite;
vm.user = Authentication.user;
vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
vm.invitePopover = {
title: 'INVITATION.TITLE_SEND',

25
modules/invitations/client/views/detail.client.view.html
View File

@@ -105,7 +105,8 @@
popover-trigger="'mouseenter'"
popover-placement="top-right"
ng-mouseenter="vm.selectedUser=r.to_user">
<abbr title="user detail">{{r.to_user.username}}<span message-to="r.to_user" to-class="message-to-icon"></span></abbr>
<abbr title="user detail">{{r.to_user.username}}<span message-to="r.to_user"
to-class="message-to-icon"></span></abbr>
</td>
<td class="text-center" ng-if="!r.to_user">
</td>
@@ -136,17 +137,23 @@
<script type="text/ng-template" id="userinfo.html">
<div>
<ul class="list-unstyled margin-left-10 margin-right-10">
<li>{{ 'STATUS_FIELD.UPLOADED' | translate}}：<span class="glyphicon glyphicon-arrow-up torrent-up"></span>{{ vm.selectedUser.uploaded | bytes:2 }}</li>
<li>{{ 'STATUS_FIELD.DOWNLOADED' | translate}}：<span class="glyphicon glyphicon-arrow-down torrent-down"></span>{{ vm.selectedUser.downloaded | bytes:2 }}</li>
<li>{{ 'STATUS_FIELD.RATIO' | translate}}：<span ng-class="vm.selectedUser.ratio > 1 ? 'ratio-normal' : 'ratio-warning' ">{{ vm.selectedUser.ratio }}</span></li>
<li ng-if="vm.announce.private_torrent_cms">{{ 'STATUS_FIELD.UPLOADED' | translate}}：
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>{{ vm.selectedUser.uploaded | bytes:2 }}
</li>
<li ng-if="vm.announce.private_torrent_cms">{{ 'STATUS_FIELD.DOWNLOADED' | translate}}：
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>{{ vm.selectedUser.downloaded | bytes:2 }}
</li>
<li ng-if="vm.announce.private_torrent_cms">{{ 'STATUS_FIELD.RATIO' | translate}}：
<span ng-class="vm.selectedUser.ratio > 1 ? 'ratio-normal' : 'ratio-warning' ">{{ vm.selectedUser.ratio }}</span>
</li>
<li class="status-divider"></li>
<li class="status-divider" ng-if="vm.announce.private_torrent_cms"></li>
<li>{{ 'STATUS_FIELD.SEEDED' | translate}}：{{ vm.selectedUser.seeded }}</li>
<li>{{ 'STATUS_FIELD.LEECHED' | translate}}：{{ vm.selectedUser.leeched }}</li>
<li>{{ 'STATUS_FIELD.FINISHED' | translate}}：{{ vm.selectedUser.finished }}</li>
<li ng-if="vm.announce.private_torrent_cms">{{ 'STATUS_FIELD.SEEDED' | translate}}：{{ vm.selectedUser.seeded }}</li>
<li ng-if="vm.announce.private_torrent_cms">{{ 'STATUS_FIELD.LEECHED' | translate}}：{{ vm.selectedUser.leeched }}</li>
<li ng-if="vm.announce.private_torrent_cms">{{ 'STATUS_FIELD.FINISHED' | translate}}：{{ vm.selectedUser.finished }}</li>
<li class="status-divider"></li>
<li class="status-divider" ng-if="vm.announce.private_torrent_cms"></li>
<li>{{ 'STATUS_FIELD.FORUM_TOPICS' | translate}}：{{ vm.selectedUser.topics }}</li>
<li>{{ 'STATUS_FIELD.FORUM_REPLIES' | translate}}：{{ vm.selectedUser.replies }}</li>

29
modules/ranking/client/controllers/ranking.client.controller.js
View File

@@ -5,16 +5,33 @@
.module('users.admin')
.controller('RankingController', RankingController);
RankingController.$inject = ['$scope', 'RankingService', '$translate', 'localStorageService'];
RankingController.$inject = ['$scope', 'RankingService', '$translate', 'localStorageService', 'MeanTorrentConfig'];
function RankingController($scope, RankingService, $translate, localStorageService) {
function RankingController($scope, RankingService, $translate, localStorageService, MeanTorrentConfig) {
var vm = this;
vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
vm.rankingTabs = [
{title: $translate.instant('PAGE_HEADER_RANKING_UPLOAD'), templateUrl: 'upload_ranking.html'},
{title: $translate.instant('PAGE_HEADER_RANKING_DOWNLOAD'), templateUrl: 'download_ranking.html'},
{title: $translate.instant('PAGE_HEADER_RANKING_RATIO'), templateUrl: 'ratio_ranking.html'},
{title: $translate.instant('PAGE_HEADER_RANKING_SCORE'), templateUrl: 'score_ranking.html'}
{
title: $translate.instant('PAGE_HEADER_RANKING_SCORE'),
templateUrl: 'score_ranking.html',
ng_show: true
},
{
title: $translate.instant('PAGE_HEADER_RANKING_UPLOAD'),
templateUrl: 'upload_ranking.html',
ng_show: vm.announce.private_torrent_cms
},
{
title: $translate.instant('PAGE_HEADER_RANKING_DOWNLOAD'),
templateUrl: 'download_ranking.html',
ng_show: vm.announce.private_torrent_cms
},
{
title: $translate.instant('PAGE_HEADER_RANKING_RATIO'),
templateUrl: 'ratio_ranking.html',
ng_show: vm.announce.private_torrent_cms
}
];
vm.getRankingList = function () {

26
modules/ranking/client/views/ranking.client.view.html
View File

@@ -1,7 +1,7 @@
<section class="container padding-top-10" ng-controller="RankingController as vm" ng-init="vm.getRankingList();">
<div class="tab-ranking margin-top-30">
<uib-tabset>
<uib-tab index="$index" ng-repeat="tab in vm.rankingTabs">
<uib-tab index="$index" ng-repeat="tab in vm.rankingTabs" ng-show="tab.ng_show">
<uib-tab-heading>
{{tab.title}}
</uib-tab-heading>
@@ -157,12 +157,12 @@
<th class="text-center"></th>
<th>{{ 'TABLE_FIELDS.USERNAME' | translate}}</th>
<th class="text-center ranking-active-col">{{ 'TABLE_FIELDS.SCORE' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.UPLOAD' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.DOWNLOAD' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.RATIO' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.SEEDED' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.LEECHED' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.FINISHED' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.UPLOAD' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.DOWNLOAD' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.RATIO' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.SEEDED' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.LEECHED' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.FINISHED' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.JOINED' | translate}}</th>
</tr>
</thead>
@@ -178,12 +178,12 @@
<span message-to="user" to-class="message-to-icon"></span>
</td>
<td class="text-center ranking-active-col">{{user.score}}</td>
<td class="text-center">{{user.uploaded | bytes:2}}</td>
<td class="text-center">{{user.downloaded | bytes:2}}</td>
<td class="text-center"><span ng-class="user.ratio == 0 ? 'ratio-warning' : 'ratio-normal' ">{{ user.ratio | ratio}}</span></td>
<td class="text-center">{{user.seeded}}</td>
<td class="text-center">{{user.leeched}}</td>
<td class="text-center">{{user.finished}}</td>
<td class="text-center" ng-if="vm.announce.private_torrent_cms">{{user.uploaded | bytes:2}}</td>
<td class="text-center" ng-if="vm.announce.private_torrent_cms">{{user.downloaded | bytes:2}}</td>
<td class="text-center" ng-if="vm.announce.private_torrent_cms"><span ng-class="user.ratio == 0 ? 'ratio-warning' : 'ratio-normal' ">{{ user.ratio | ratio}}</span></td>
<td class="text-center" ng-if="vm.announce.private_torrent_cms">{{user.seeded}}</td>
<td class="text-center" ng-if="vm.announce.private_torrent_cms">{{user.leeched}}</td>
<td class="text-center" ng-if="vm.announce.private_torrent_cms">{{user.finished}}</td>
<td class="text-center">{{user.created | life}}</td>
</tr>
</tbody>

2
modules/torrents/client/controllers/torrent-info.client.controller.js
View File

@@ -158,7 +158,7 @@
{
title: $translate.instant('TAB_USER_INFO'),
templateUrl: 'userInfo.html',
ng_show: true,
ng_show: vm.announce.private_torrent_cms,
badges: [
{
value: '↑ ' + vm.torrentLocalInfo.torrent_seeds + '　↓ ' + vm.torrentLocalInfo.torrent_leechers + '　√ ' + vm.torrentLocalInfo.torrent_finished,

7
modules/torrents/client/views/admin/admin-list.client.view.html
View File

@@ -158,7 +158,8 @@
<th class="text-center">{{ 'TABLE_FIELDS.VOTES' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.SIZE' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.SEEDS_LEECHERS_FINISHED' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.SEEDS_LEECHERS_FINISHED' | translate}}</th>
<th class="text-center" ng-if="!vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.SEEDS_LEECHERS' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.ADMIN_TOOLS' | translate}}</th>
</tr>
</thead>
@@ -243,7 +244,7 @@
{{item.torrent_leechers}}
</p>
<p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}">
<p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}" ng-if="vm.announce.private_torrent_cms">
<span class="glyphicon glyphicon-ok torrent-finished"></span>
{{item.torrent_finished}}
</p>
@@ -261,7 +262,7 @@
{{ 'ADMIN_BASIC_DELETE' | translate}}
</button>
</div>
<div class="margin-top-2">
<div class="margin-top-2" ng-if="vm.announce.private_torrent_cms">
<div class="admin-tools-btn-list btn-group" uib-dropdown dropdown-append-to-body>
<button id="btn-append-to-body" type="button"
class="btn btn-xs btn-default btn-block"

9
modules/torrents/client/views/movie-list.client.view.html
View File

@@ -17,11 +17,11 @@
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>
<span>{{item.torrent_seeds}}</span>
</td>
<td class="text-center">
<td ng-class="vm.announce.private_torrent_cms ? 'text-center' : 'text-right'">
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>
<span>{{item.torrent_leechers}}</span>
</td>
<td class="text-right">
<td class="text-right" ng-if="vm.announce.private_torrent_cms">
<span class="glyphicon glyphicon-ok torrent-finished"></span>
<span>{{item.torrent_finished}}</span>
</td>
@@ -167,7 +167,8 @@
<th class="text-center">{{ 'TABLE_FIELDS.VOTES' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.SIZE' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.SEEDS_LEECHERS_FINISHED' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.SEEDS_LEECHERS_FINISHED' | translate}}</th>
<th class="text-center" ng-if="!vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.SEEDS_LEECHERS' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.PUBLISHER' | translate}}</th>
</tr>
</thead>
@@ -251,7 +252,7 @@
{{item.torrent_leechers}}
</p>
<p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}">
<p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}" ng-if="vm.announce.private_torrent_cms">
<span class="glyphicon glyphicon-ok torrent-finished"></span>
{{item.torrent_finished}}
</p>

28
modules/torrents/client/views/view-torrent.client.view.html
View File

@@ -212,7 +212,7 @@
<div class="timeline-comment-header-text">
<span user-info="item.user" info-name></span>
<span message-to="item.user" to-class="message-to-icon"></span>
<span class="user-ud-text">
<span class="user-ud-text" ng-if="vm.announce.private_torrent_cms">
(<span class="glyphicon glyphicon-arrow-up torrent-up"></span>{{item.user.uploaded | bytes}}
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>{{item.user.downloaded | bytes}}
)
@@ -359,17 +359,19 @@
</div>
</dd>
<dt class="h-line">{{ 'VIDEO_SALE_INFO' | translate}}：</dt>
<dd class="h-line">
<div ng-if="vm.announce.private_torrent_cms">
<dt class="h-line">{{ 'VIDEO_SALE_INFO' | translate}}：</dt>
<dd class="h-line">
<span class="label label-sale"
title="{{vm.getSaleTypeDesc();}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{vm.torrentLocalInfo.isSaling ? (vm.torrentLocalInfo.torrent_sale_expires | date: 'MM-dd HH:mm') : 'NO'}}"
ng-class="{'label-default': !vm.torrentLocalInfo.isSaling, 'label-success': vm.torrentLocalInfo.isSaling}">
{{vm.torrentLocalInfo.torrent_sale_status}} {{vm.torrentLocalInfo.isSaling ? (vm.torrentLocalInfo.torrent_sale_expires | unlife) : ''}}
</span>
<!--<span ng-if="vm.torrentLocalInfo.isSaling">-->
<!--[{{ 'SALE_EXPIRES_TIME' | translate}}: {{vm.torrentLocalInfo.torrent_sale_expires | unlife}}]-->
<!--</span>-->
</dd>
<!--<span ng-if="vm.torrentLocalInfo.isSaling">-->
<!--[{{ 'SALE_EXPIRES_TIME' | translate}}: {{vm.torrentLocalInfo.torrent_sale_expires | unlife}}]-->
<!--</span>-->
</dd>
</div>
<div ng-show="vm.torrentLocalInfo.torrent_recommended != 'none'">
<dt class="h-line">{{ 'ADMIN_BASIC_RLEVEL_SET' | translate}}：</dt>
@@ -619,7 +621,9 @@
<script type="text/ng-template" id="thumbsInfo.html">
<div class="padding-top-20">
<div class="text-center"><h4><a href="#" ng-click="vm.beginThumbsUp(vm.torrentLocalInfo);">{{'THUMBS_UP_TORRENT' | translate: ({number: vm.scoreConfig.thumbsUpScore.torrent}) }}</a></h4></div>
<div class="text-center"><h4><a href="#"
ng-click="vm.beginThumbsUp(vm.torrentLocalInfo);">{{'THUMBS_UP_TORRENT' | translate: ({number: vm.scoreConfig.thumbsUpScore.torrent}) }}</a>
</h4></div>
</div>
<div class="padding-top-20">
<div class="thumbs-up-list" ng-if="vm.torrentLocalInfo._thumbs.length">
@@ -665,14 +669,14 @@
<button class="btn btn-default btn-sm" ng-click="vm.deleteTorrent();">{{ 'ADMIN_BASIC_DELETE' | translate}}</button>
</dt>
<div class="margin-top-20"></div>
<div class="margin-top-20" ng-if="vm.announce.private_torrent_cms"></div>
<dt class="h-line">{{ 'ADMIN_SALE_TYPE_SET' | translate}}:</dt>
<dd class="h-line">
<dt class="h-line" ng-if="vm.announce.private_torrent_cms">{{ 'ADMIN_SALE_TYPE_SET' | translate}}:</dt>
<dd class="h-line" ng-if="vm.announce.private_torrent_cms">
<mark>{{vm.getSaleTypeDesc();}}</mark>
</dd>
<div class="padding-top-10 margin-left-50">
<div class="padding-top-10 margin-left-50" ng-if="vm.announce.private_torrent_cms">
<div class="btn-group sales-btn-group text-center">
<label ng-repeat="st in vm.torrentSalesType.value"
class="btn btn-sm" ng-model="vm.model_salestype" uib-btn-radio="'{{st.name}}'" uncheckable

1
modules/users/client/controllers/admin/user.client.controller.js
View File

@@ -16,6 +16,7 @@
vm.user = user;
vm.selectedRole = vm.user.roles[0];
vm.userRolesConfig = MeanTorrentConfig.meanTorrentConfig.userRoles;
vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
vm.remove = remove;
vm.update = update;
vm.messageTo = messageTo;

5
modules/users/client/controllers/status/status.client.controller.js
View File

@@ -5,12 +5,13 @@
.module('users')
.controller('StatusController', StatusController);
StatusController.$inject = ['$scope', '$state', '$translate', '$timeout', 'Authentication', '$window', 'ScoreLevelService'];
StatusController.$inject = ['$scope', '$state', '$translate', '$timeout', 'Authentication', '$window', 'ScoreLevelService', 'MeanTorrentConfig'];
function StatusController($scope, $state, $translate, $timeout, Authentication, $window, ScoreLevelService) {
function StatusController($scope, $state, $translate, $timeout, Authentication, $window, ScoreLevelService, MeanTorrentConfig) {
var vm = this;
vm.user = Authentication.user;
vm.scoreLevelData = ScoreLevelService.getScoreLevelJson(vm.user.score);
vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
/**
* If user is not signed in then redirect back home

5
modules/users/client/controllers/userinfo/userinfo.client.controller.js
View File

@@ -5,12 +5,13 @@
.module('users')
.controller('UserInfoController', UserInfoController);
UserInfoController.$inject = ['$scope', '$state', 'Authentication', 'userResolve', 'ScoreLevelService', '$timeout'];
UserInfoController.$inject = ['$scope', '$state', 'Authentication', 'userResolve', 'ScoreLevelService', '$timeout', 'MeanTorrentConfig'];
function UserInfoController($scope, $state, Authentication, user, ScoreLevelService, $timeout) {
function UserInfoController($scope, $state, Authentication, user, ScoreLevelService, $timeout, MeanTorrentConfig) {
var vm = this;
vm.authentication = Authentication;
vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
vm.user = user;
vm.messageTo = messageTo;
vm.isContextUserSelf = isContextUserSelf;

131
modules/users/client/views/admin/view-user.client.view.html
View File

@@ -5,7 +5,8 @@
<h3 ng-bind="vm.user.username"></h3>
</div>
<div class="col-md-5">
<a class="btn btn-primary pull-right margin-left-10" ng-if="vm.authentication.user.isAdmin" ui-sref="admin.user-edit({userId: vm.user._id})">
<a class="btn btn-primary pull-right margin-left-10" ng-if="vm.authentication.user.isAdmin"
ui-sref="admin.user-edit({userId: vm.user._id})">
<i class="glyphicon glyphicon-edit"></i>
</a>
<a class="btn btn-primary pull-right margin-left-10" ng-click="vm.messageTo()" ng-if="!vm.isContextUserSelf()">
@@ -61,7 +62,8 @@
<dd class="h-line">
<span ng-class="{'span-banned': vm.user.status == 'banned'}">{{ 'STATUS_FIELD.' + vm.user.status.toUpperCase() | translate }}</span>
<div class="pull-right" ng-if="vm.authentication.user.username != vm.user.username && vm.authentication.user.isOper && !vm.user.isAdmin">
<div class="pull-right"
ng-if="vm.authentication.user.username != vm.user.username && vm.authentication.user.isOper && !vm.user.isAdmin">
<button class="btn btn-default btn-xs" style="width: 64px;" ng-click="vm.setUserStatus();">
{{ vm.user.status == 'banned' ? ('STATUS_FIELD.UNBANNED' | translate) : ('STATUS_FIELD.BANNED' | translate)}}
</button>
@@ -93,62 +95,66 @@
</div>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED_IP' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-ips">
<span class="ip-item" ng-repeat="t in vm.user.leeched_ip">{{t}}</span>
</div>
</dd>
<div ng-if="vm.announce.private_torrent_cms">
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED_IP' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-ips">
<span class="ip-item" ng-repeat="t in vm.user.leeched_ip">{{t}}</span>
</div>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.BT_CLIENT' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-clients">
<span class="client-item" ng-repeat="t in vm.user.client_agent">{{t}}</span>
</div>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.BT_CLIENT' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-clients">
<span class="client-item" ng-repeat="t in vm.user.client_agent">{{t}}</span>
</div>
</dd>
</div>
<li class="status-divider"></li>
<dt class="h-line">{{ 'STATUS_FIELD.UPLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>
<span>{{ vm.user.uploaded | bytes:2 }}</span>
<div ng-if="vm.announce.private_torrent_cms">
<dt class="h-line">{{ 'STATUS_FIELD.UPLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>
<span>{{ vm.user.uploaded | bytes:2 }}</span>
<div class="pull-right" ng-if="vm.authentication.user.isAdmin">
<button class="btn btn-default btn-xs" style="width: 64px;"
uib-popover-template="vm.setUserUploadedPopover.templateUrl"
popover-title="{{vm.setUserUploadedPopover.title | translate}}"
popover-trigger="'outsideClick'"
popover-placement="top-right"
popover-is-open="vm.setUserUploadedPopover.isOpen"
popover-class="set-uploaded-popover"
ng-click="vm.setUserUploadedPopover.number = undefined;">
+/-
</button>
</div>
</dd>
<div class="pull-right" ng-if="vm.authentication.user.isAdmin">
<button class="btn btn-default btn-xs" style="width: 64px;"
uib-popover-template="vm.setUserUploadedPopover.templateUrl"
popover-title="{{vm.setUserUploadedPopover.title | translate}}"
popover-trigger="'outsideClick'"
popover-placement="top-right"
popover-is-open="vm.setUserUploadedPopover.isOpen"
popover-class="set-uploaded-popover"
ng-click="vm.setUserUploadedPopover.number = undefined;">
+/-
</button>
</div>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.DOWNLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>
<span>{{ vm.user.downloaded | bytes:2 }}</span>
<dt class="h-line">{{ 'STATUS_FIELD.DOWNLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>
<span>{{ vm.user.downloaded | bytes:2 }}</span>
<div class="pull-right" ng-if="vm.authentication.user.isAdmin">
<button class="btn btn-default btn-xs" style="width: 64px;"
uib-popover-template="vm.setUserDownloadedPopover.templateUrl"
popover-title="{{vm.setUserDownloadedPopover.title | translate}}"
popover-trigger="'outsideClick'"
popover-placement="top-right"
popover-is-open="vm.setUserDownloadedPopover.isOpen"
popover-class="set-downloaded-popover"
ng-click="vm.setUserDownloadedPopover.number = undefined;">
+/-
</button>
</div>
</dd>
<div class="pull-right" ng-if="vm.authentication.user.isAdmin">
<button class="btn btn-default btn-xs" style="width: 64px;"
uib-popover-template="vm.setUserDownloadedPopover.templateUrl"
popover-title="{{vm.setUserDownloadedPopover.title | translate}}"
popover-trigger="'outsideClick'"
popover-placement="top-right"
popover-is-open="vm.setUserDownloadedPopover.isOpen"
popover-class="set-downloaded-popover"
ng-click="vm.setUserDownloadedPopover.number = undefined;">
+/-
</button>
</div>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.RATIO' | translate}}：</dt>
<dd class="h-line"><span ng-class="vm.user.ratio == 0 ? 'ratio-warning' : 'ratio-normal' ">{{ vm.user.ratio | ratio}}</span></dd>
<dt class="h-line">{{ 'STATUS_FIELD.RATIO' | translate}}：</dt>
<dd class="h-line"><span ng-class="vm.user.ratio == 0 ? 'ratio-warning' : 'ratio-normal' ">{{ vm.user.ratio | ratio}}</span></dd>
</div>
<dt class="h-line">{{ 'STATUS_FIELD.SCORE' | translate}}：</dt>
<dd class="h-line">
@@ -170,16 +176,18 @@
<li class="status-divider"></li>
<dt class="h-line">{{ 'STATUS_FIELD.SEEDED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.seeded }}</dd>
<div ng-if="vm.announce.private_torrent_cms">
<dt class="h-line">{{ 'STATUS_FIELD.SEEDED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.seeded }}</dd>
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.leeched }}</dd>
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.leeched }}</dd>
<dt class="h-line">{{ 'STATUS_FIELD.FINISHED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.finished }}</span></dd>
<dt class="h-line">{{ 'STATUS_FIELD.FINISHED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.finished }}</span></dd>
<li class="status-divider"></li>
<li class="status-divider"></li>
</div>
<dt class="h-line">{{ 'STATUS_FIELD.FORUM_TOPICS' | translate}}：</dt>
<dd class="h-line">{{ vm.user.topics }}</dd>
@@ -193,7 +201,8 @@
<script type="text/ng-template" id="set-user-score.html">
<form class="form-inline set-score-popover-form text-center">
<div class="form-group">
<input type="number" ng-model="vm.setUserScorePopover.number" class="form-control" placeholder="{{ 'SCORE_NUMBER' | translate }}" autofocus>
<input type="number" ng-model="vm.setUserScorePopover.number" class="form-control" placeholder="{{ 'SCORE_NUMBER' | translate }}"
autofocus>
</div>
<button class="btn btn-default" ng-click="vm.setUserScore();">{{ 'BUTTON_SET' | translate }}</button>
</form>
@@ -202,7 +211,8 @@
<script type="text/ng-template" id="set-user-uploaded.html">
<form class="form-inline set-uploaded-popover-form text-center">
<div class="form-group">
<input type="number" ng-model="vm.setUserUploadedPopover.number" class="form-control" placeholder="{{ 'UPLOADED_NUMBER' | translate }}" autofocus>
<input type="number" ng-model="vm.setUserUploadedPopover.number" class="form-control"
placeholder="{{ 'UPLOADED_NUMBER' | translate }}" autofocus>
</div>
<button class="btn btn-default" ng-click="vm.setUserUploaded();">{{ 'BUTTON_SET' | translate }}</button>
</form>
@@ -211,7 +221,8 @@
<script type="text/ng-template" id="set-user-downloaded.html">
<form class="form-inline set-downloaded-popover-form text-center">
<div class="form-group">
<input type="number" ng-model="vm.setUserDownloadedPopover.number" class="form-control" placeholder="{{ 'DOWNLOADED_NUMBER' | translate }}" autofocus>
<input type="number" ng-model="vm.setUserDownloadedPopover.number" class="form-control"
placeholder="{{ 'DOWNLOADED_NUMBER' | translate }}" autofocus>
</div>
<button class="btn btn-default" ng-click="vm.setUserDownloaded();">{{ 'BUTTON_SET' | translate }}</button>
</form>

69
modules/users/client/views/status/account.client.view.html
View File

@@ -34,7 +34,8 @@
<dt class="h-line">{{ 'STATUS_FIELD.SCORE' | translate}}：</dt>
<dd class="h-line">
<span class="text-score">{{ vm.user.score }}</span> <span score-level="vm.scoreLevelData.currLevel"></span> <a ui-sref="score.detail">{{ 'STATUS_FIELD.DETAIL' | translate }}</a>
<span class="text-score">{{ vm.user.score }}</span> <span score-level="vm.scoreLevelData.currLevel"></span> <a
ui-sref="score.detail">{{ 'STATUS_FIELD.DETAIL' | translate }}</a>
</dd>
<div class="margin-top-10">
@@ -70,47 +71,49 @@
</div>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED_IP' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-ips">
<span class="ip-item" ng-repeat="t in vm.user.leeched_ip">{{t}}</span>
</div>
</dd>
<div ng-if="vm.announce.private_torrent_cms">
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED_IP' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-ips">
<span class="ip-item" ng-repeat="t in vm.user.leeched_ip">{{t}}</span>
</div>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.BT_CLIENT' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-clients">
<span class="client-item" ng-repeat="t in vm.user.client_agent">{{t}}</span>
</div>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.BT_CLIENT' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-clients">
<span class="client-item" ng-repeat="t in vm.user.client_agent">{{t}}</span>
</div>
</dd>
<li class="status-divider"></li>
<li class="status-divider"></li>
<dt class="h-line">{{ 'STATUS_FIELD.UPLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>
{{ vm.user.uploaded | bytes:2 }}
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.UPLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>
{{ vm.user.uploaded | bytes:2 }}
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.DOWNLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>
{{ vm.user.downloaded | bytes:2 }}
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.DOWNLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>
{{ vm.user.downloaded | bytes:2 }}
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.RATIO' | translate}}：</dt>
<dd class="h-line"><span ng-class="vm.user.ratio == 0 ? 'ratio-warning' : 'ratio-normal' ">{{ vm.user.ratio | ratio}}</span></dd>
<dt class="h-line">{{ 'STATUS_FIELD.RATIO' | translate}}：</dt>
<dd class="h-line"><span ng-class="vm.user.ratio == 0 ? 'ratio-warning' : 'ratio-normal' ">{{ vm.user.ratio | ratio}}</span></dd>
<li class="status-divider"></li>
<li class="status-divider"></li>
<dt class="h-line">{{ 'STATUS_FIELD.SEEDED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.seeded }} <a ui-sref="status.seeding">{{ 'STATUS_FIELD.DETAIL' | translate }}</a></dd>
<dt class="h-line">{{ 'STATUS_FIELD.SEEDED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.seeded }} <a ui-sref="status.seeding">{{ 'STATUS_FIELD.DETAIL' | translate }}</a></dd>
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.leeched }} <a ui-sref="status.downloading">{{ 'STATUS_FIELD.DETAIL' | translate }}</a></dd>
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.leeched }} <a ui-sref="status.downloading">{{ 'STATUS_FIELD.DETAIL' | translate }}</a></dd>
<dt class="h-line">{{ 'STATUS_FIELD.FINISHED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.finished }}</dd>
<dt class="h-line">{{ 'STATUS_FIELD.FINISHED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.finished }}</dd>
</div>
<li class="status-divider"></li>

6
modules/users/client/views/status/status.client.view.html
View File

@@ -2,9 +2,9 @@
<div class="tab-status margin-top-40">
<ul class="nav nav-tabs">
<li ui-sref="status.account" ui-sref-active="active"><a>{{'STATUS_ACCOUNT' | translate}}</a></li>
<li ui-sref="status.uploaded" ui-sref-active="active"><a>{{'STATUS_UPLOADED' | translate}}</a></li>
<li ui-sref="status.seeding" ui-sref-active="active"><a>{{'STATUS_SEEDING' | translate}}</a></li>
<li ui-sref="status.downloading" ui-sref-active="active"><a>{{'STATUS_DOWNLOADING' | translate}}</a></li>
<li ui-sref="status.uploaded" ui-sref-active="active" ng-if="vm.announce.private_torrent_cms"><a>{{'STATUS_UPLOADED' | translate}}</a></li>
<li ui-sref="status.seeding" ui-sref-active="active" ng-if="vm.announce.private_torrent_cms"><a>{{'STATUS_SEEDING' | translate}}</a></li>
<li ui-sref="status.downloading" ui-sref-active="active" ng-if="vm.announce.private_torrent_cms"><a>{{'STATUS_DOWNLOADING' | translate}}</a></li>
</ul>
</div>

80
modules/users/client/views/userinfo/userinfo.client.view.html
View File

@@ -63,59 +63,65 @@
<dt class="h-line">{{ 'STATUS_FIELD.LATEST_SIGNED_TIME' | translate}}：</dt>
<dd class="h-line">{{ vm.user.last_signed | date: 'yyyy-MM-dd HH:mm:ss' }}</dd>
<dt class="h-line">{{ 'STATUS_FIELD.SIGNED_IP' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-ips">
<span class="ip-item" ng-repeat="t in vm.user.signed_ip">{{t}}</span>
</div>
</dd>
<div ng-if="vm.announce.private_torrent_cms">
<dt class="h-line">{{ 'STATUS_FIELD.SIGNED_IP' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-ips">
<span class="ip-item" ng-repeat="t in vm.user.signed_ip">{{t}}</span>
</div>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED_IP' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-ips">
<span class="ip-item" ng-repeat="t in vm.user.leeched_ip">{{t}}</span>
</div>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED_IP' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-ips">
<span class="ip-item" ng-repeat="t in vm.user.leeched_ip">{{t}}</span>
</div>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.BT_CLIENT' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-clients">
<span class="client-item" ng-repeat="t in vm.user.client_agent">{{t}}</span>
</div>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.BT_CLIENT' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-clients">
<span class="client-item" ng-repeat="t in vm.user.client_agent">{{t}}</span>
</div>
</dd>
</div>
<li class="status-divider"></li>
<dt class="h-line">{{ 'STATUS_FIELD.UPLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>
<span>{{ vm.user.uploaded | bytes:2 }}</span>
</dd>
<div ng-if="vm.announce.private_torrent_cms">
<dt class="h-line">{{ 'STATUS_FIELD.UPLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>
<span>{{ vm.user.uploaded | bytes:2 }}</span>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.DOWNLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>
<span>{{ vm.user.downloaded | bytes:2 }}</span>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.DOWNLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>
<span>{{ vm.user.downloaded | bytes:2 }}</span>
</dd>
<dt class="h-line">{{ 'STATUS_FIELD.RATIO' | translate}}：</dt>
<dd class="h-line"><span ng-class="vm.user.ratio == 0 ? 'ratio-warning' : 'ratio-normal' ">{{ vm.user.ratio | ratio}}</span></dd>
<dt class="h-line">{{ 'STATUS_FIELD.RATIO' | translate}}：</dt>
<dd class="h-line"><span ng-class="vm.user.ratio == 0 ? 'ratio-warning' : 'ratio-normal' ">{{ vm.user.ratio | ratio}}</span></dd>
</div>
<dt class="h-line">{{ 'STATUS_FIELD.SCORE' | translate}}：</dt>
<dd class="h-line">
<span>{{ vm.user.score }}</span> <span score-level="vm.scoreLevelData.currLevel"></span>
</dd>
<li class="status-divider"></li>
<div ng-if="vm.announce.private_torrent_cms">
<li class="status-divider"></li>
<dt class="h-line">{{ 'STATUS_FIELD.SEEDED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.seeded }}</dd>
<dt class="h-line">{{ 'STATUS_FIELD.SEEDED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.seeded }}</dd>
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.leeched }}</dd>
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.leeched }}</dd>
<dt class="h-line">{{ 'STATUS_FIELD.FINISHED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.finished }}</span></dd>
<dt class="h-line">{{ 'STATUS_FIELD.FINISHED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.finished }}</span></dd>
</div>
<li class="status-divider"></li>