feat(invitations): show ok message when user has no any H&R warning

This commit is contained in:
OldHawk
2017-09-14 12:08:20 +08:00
parent fde647cd2b
commit a2be173405
9 changed files with 27 additions and 16 deletions

View File

@@ -458,7 +458,7 @@
SEEDED: 'Torrents seeded',
LEECHED: 'Torrents leeched',
FINISHED: 'Torrents finished',
HNY_WARNING: 'H&R Warning',
HNR_WARNING: 'H&R Warning',
FORUM_TOPICS: 'Forum topics',
FORUM_REPLIES: 'Forum replies',
DETAIL: 'Detail',
@@ -490,6 +490,7 @@
REMOVE_WARNING_NO_ENOUGH_SCORE: 'ERROR: no enough score!',
WARNING_TOOLTIP: 'You have <strong>{{wnumber}}</strong> H&R warnings, please deal with it immediately, ',
WARNING_DETAIL_LINK: 'detail is here',
HNR_HAVE_NO_WARNING: 'Very good, you have no any H&R warnings.',
//user score
SCORE: {

View File

@@ -458,7 +458,7 @@
SEEDED: '正在做种',
LEECHED: '正在下载',
FINISHED: '下载完成',
HNY_WARNING: 'H&R 警告',
HNR_WARNING: 'H&R 警告',
FORUM_TOPICS: '论坛主题数',
FORUM_REPLIES: '论坛回复数',
DETAIL: '详情',
@@ -490,6 +490,7 @@
REMOVE_WARNING_NO_ENOUGH_SCORE: '错误: 积分不足!',
WARNING_TOOLTIP: '您有 {{wnumber}} 个 H&R 警告, 请立即处理, ',
WARNING_DETAIL_LINK: '查看详情',
HNR_HAVE_NO_WARNING: '很好, 您目前还没有 H&R 警告.',
//user score
SCORE: {

View File

@@ -1,15 +1,16 @@
(function () {
'use strict';
// Focus the element on page load
// Unless the user is on a small device, because this could obscure the page with a keyboard
angular.module('core')
.filter('filename', filename);
function filename() {
return function (fname) {
return fname.substr(0, fname.lastIndexOf('.')) || fname;
if (fname) {
return fname.substr(0, fname.lastIndexOf('.')) || fname;
} else {
return '-';
}
};
}
}());

View File

@@ -75,8 +75,10 @@
popover-trigger="'mouseenter'"
popover-placement="top-right"
ng-mouseenter="vm.selectedUser=r.to_user">
<abbr title="user detail"><span user-info="r.to_user" info-uname></span><span message-to="r.to_user"
to-class="message-to-icon"></span></abbr>
<abbr title="user detail">
<span user-info="r.to_user" info-uname></span>
<span message-to="r.to_user" to-class="message-to-icon"></span>
</abbr>
</td>
<td class="text-center" ng-if="!r.to_user">
</td>
@@ -119,7 +121,7 @@
<li ng-if="vm.announce.privateTorrentCmsMode">{{ 'STATUS_FIELD.LEECHED' | translate}}{{ vm.selectedUser.leeched }}</li>
<li ng-if="vm.announce.privateTorrentCmsMode">{{ 'STATUS_FIELD.FINISHED' | translate}}{{ vm.selectedUser.finished }}</li>
<li ng-if="vm.announce.privateTorrentCmsMode && vm.selectedUser.hnr_warning>0">
{{ 'STATUS_FIELD.HNY_WARNING' | translate}}<span class="badge badge_danger">{{vm.selectedUser.hnr_warning}}</span>
{{ 'STATUS_FIELD.HNR_WARNING' | translate}}<span class="badge badge_danger">{{vm.selectedUser.hnr_warning}}</span>
</li>
<li class="status-divider" ng-if="vm.announce.privateTorrentCmsMode"></li>

View File

@@ -105,8 +105,10 @@
popover-trigger="'mouseenter'"
popover-placement="top-right"
ng-mouseenter="vm.selectedUser=r.to_user">
<abbr title="user detail"><span user-info="r.to_user" info-uname></span><span message-to="r.to_user"
to-class="message-to-icon"></span></abbr>
<abbr title="user detail">
<span user-info="r.to_user" info-uname></span>
<span message-to="r.to_user" to-class="message-to-icon"></span>
</abbr>
</td>
<td class="text-center" ng-if="!r.to_user">
</td>
@@ -154,7 +156,7 @@
<li ng-if="vm.announce.privateTorrentCmsMode">{{ 'STATUS_FIELD.LEECHED' | translate}}{{ vm.selectedUser.leeched }}</li>
<li ng-if="vm.announce.privateTorrentCmsMode">{{ 'STATUS_FIELD.FINISHED' | translate}}{{ vm.selectedUser.finished }}</li>
<li ng-if="vm.announce.privateTorrentCmsMode && vm.selectedUser.hnr_warning>0">
{{ 'STATUS_FIELD.HNY_WARNING' | translate}}<span class="badge badge_danger">{{vm.selectedUser.hnr_warning}}</span>
{{ 'STATUS_FIELD.HNR_WARNING' | translate}}<span class="badge badge_danger">{{vm.selectedUser.hnr_warning}}</span>
</li>
<li class="status-divider" ng-if="vm.announce.privateTorrentCmsMode"></li>

View File

@@ -200,7 +200,7 @@
<dd class="h-line">{{ vm.user.finished }}</dd>
<div ng-if="vm.user.hnr_warning>0">
<dt class="h-line">{{ 'STATUS_FIELD.HNY_WARNING' | translate}}</dt>
<dt class="h-line">{{ 'STATUS_FIELD.HNR_WARNING' | translate}}</dt>
<dd class="h-line">
<span class="badge badge_danger">{{vm.user.hnr_warning}}</span>
<a ui-sref="admin.user-warning({userId: vm.user._id})"

View File

@@ -134,7 +134,7 @@
<dd class="h-line">{{ vm.user.finished }}</dd>
<div ng-if="vm.user.hnr_warning>0">
<dt class="h-line">{{ 'STATUS_FIELD.HNY_WARNING' | translate}}</dt>
<dt class="h-line">{{ 'STATUS_FIELD.HNR_WARNING' | translate}}</dt>
<dd class="h-line">
<span class="badge badge_danger">{{vm.user.hnr_warning}}</span>
<a ui-sref="status.warning" ng-if="vm.user.hnr_warning>0">{{ 'STATUS_FIELD.DETAIL' | translate }}</a>

View File

@@ -8,7 +8,11 @@
</div>
</div>
<div class="table-responsive margin-top-50">
<div class="text-center margin-top-30 padding-top-30 text-muted" ng-if="vm.warningList.length==0">
<h3>{{'HNR_HAVE_NO_WARNING' | translate}}</h3>
</div>
<div class="table-responsive margin-top-50" ng-if="vm.warningList.length>0">
<table class="table table-hover tb-v-middle">
<thead>
<tr>

View File

@@ -137,7 +137,7 @@
<dd class="h-line">{{ vm.user.finished }}</span></dd>
<div ng-if="vm.user.hnr_warning>0">
<dt class="h-line">{{ 'STATUS_FIELD.HNY_WARNING' | translate}}</dt>
<dt class="h-line">{{ 'STATUS_FIELD.HNR_WARNING' | translate}}</dt>
<dd class="h-line"><span class="badge badge_danger">{{vm.user.hnr_warning}}</span></dd>
</div>
</div>