Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-03-06 12:11:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(H&R): show H&R warning tooltip info in user account status page

Browse Source
This commit is contained in:
OldHawk
2017-09-12 18:02:28 +08:00
parent 7d0a2eaf9f
commit cd91ff774f
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -485,6 +485,8 @@
REMOVE_WARNING_SUCCESSFULLY: 'Remove warning successfully',
REMOVE_WARNING_ERROR: 'Remove warning failed',
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',
//user score
SCORE: {

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

@@ -485,6 +485,8 @@
REMOVE_WARNING_SUCCESSFULLY: '警告移除成功',
REMOVE_WARNING_ERROR: '警告移除失败',
REMOVE_WARNING_NO_ENOUGH_SCORE: '错误: 积分不足!',
WARNING_TOOLTIP: '您有 {{wnumber}} 个 H&R 警告, 请立即处理, ',
WARNING_DETAIL_LINK: '查看详情',
//user score
SCORE: {

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

@@ -1,6 +1,11 @@
<section ng-controller="StatusController as vm">
<div class="row margin-top-30 margin-bottom-30">
<div class="col-md-10 col-md-offset-1">
<div class="alert alert-warning text-center" role="alert" ng-if="vm.user.hnr_warning>0">
<span translate="WARNING_TOOLTIP" translate-values="{wnumber: vm.user.hnr_warning}"></span>
<a ui-sref="status.warning">{{'WARNING_DETAIL_LINK' | translate}}</a>
</div>
<dl class="dl-horizontal">
<dt class="h-line">{{ 'STATUS_FIELD.PICTURE' | translate}}：</dt>
<dd class="h-line">
@@ -107,7 +112,7 @@
<dt class="h-line">{{ 'STATUS_FIELD.UPTOTAL' | translate}}：</dt>
<dd class="h-line">{{ vm.user.uptotal }} <a ui-sref="status.uploaded"
ng-if="vm.user.uptotal>0">{{ 'STATUS_FIELD.DETAIL' | translate }}</a></dd>
ng-if="vm.user.uptotal>0">{{ '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"

8
modules/users/client/views/status/warning.client.view.html
View File

@@ -1,8 +1,8 @@
<section ng-controller="WarningController as vm" ng-init="vm.getWarningTorrent();">
<div class="row margin-top-20">
<div class="col-md-12 torrent-list" id="top_of_torrent_list" ng-show="vm.warningList">
<div class="row margin-top-10 bg-danger">
<div class="col-sm-10 col-sm-offset-1">
<div class="margin-top-10">
<div class="alert alert-warning" role="alert" style="padding: 10px 50px;">
<div marked src="'/modules/users/client/templates/status-hnr-warning-'+vm.lang+'.md'" compile="true">
</div>
</div>
@@ -121,7 +121,9 @@
</p>
</td>
<td class="col-md-1 td-v-middle text-center">
<button class="btn btn-default btn-sm" ng-click="vm.removeWarning(item); $event.stopPropagation();">{{'BTN_REMOVE_WARNING' | translate}}</button>
<button class="btn btn-default btn-sm"
ng-click="vm.removeWarning(item); $event.stopPropagation();">{{'BTN_REMOVE_WARNING' | translate}}
</button>
</td>
</tr>
</tbody>