From cd91ff774f36ceedb02b3d835b6205ac3068f131 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 12 Sep 2017 18:02:28 +0800
Subject: [PATCH] feat(H&R): show H&R warning tooltip info in user account
 status page

---
 modules/core/client/app/trans-string-en.js                | 2 ++
 modules/core/client/app/trans-string-zh.js                | 2 ++
 .../users/client/views/status/account.client.view.html    | 7 ++++++-
 .../users/client/views/status/warning.client.view.html    | 8 +++++---
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 067599f2..210dbdb3 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -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: {
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index 88c4fb13..c29d29d0 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -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: {
diff --git a/modules/users/client/views/status/account.client.view.html b/modules/users/client/views/status/account.client.view.html
index e34a465b..150efa87 100644
--- a/modules/users/client/views/status/account.client.view.html
+++ b/modules/users/client/views/status/account.client.view.html
@@ -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"
diff --git a/modules/users/client/views/status/warning.client.view.html b/modules/users/client/views/status/warning.client.view.html
index d1674df7..9c8ca93c 100644
--- a/modules/users/client/views/status/warning.client.view.html
+++ b/modules/users/client/views/status/warning.client.view.html
@@ -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>