diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index f060eebf..597c3ffc 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -444,6 +444,7 @@ SEEDED: 'Torrents seeded', LEECHED: 'Torrents leeched', FINISHED: 'Torrents finished', + HNY_WARNING: 'H&R Warning', FORUM_TOPICS: 'Forum topics', FORUM_REPLIES: 'Forum replies', DETAIL: 'Detail', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 4e045614..3e8a3b37 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -444,6 +444,7 @@ SEEDED: '正在做种', LEECHED: '正在下载', FINISHED: '下载完成', + HNY_WARNING: 'H&R 警告', FORUM_TOPICS: '论坛主题数', FORUM_REPLIES: '论坛回复数', DETAIL: '详情', diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js index 23daa196..bfb38cba 100644 --- a/modules/core/client/controllers/header.client.controller.js +++ b/modules/core/client/controllers/header.client.controller.js @@ -6,10 +6,10 @@ .controller('HeaderController', HeaderController); HeaderController.$inject = ['$scope', '$state', '$stateParams', '$translate', 'Authentication', 'menuService', 'MeanTorrentConfig', 'localStorageService', - 'ScoreLevelService', 'InvitationsService', '$interval', 'MessagesService', 'TorrentsService']; + 'ScoreLevelService', 'InvitationsService', '$interval', 'MessagesService', 'TorrentsService', 'UsersService']; function HeaderController($scope, $state, $stateParams, $translate, Authentication, menuService, MeanTorrentConfig, localStorageService, ScoreLevelService, - InvitationsService, $interval, MessagesService, TorrentsService) { + InvitationsService, $interval, MessagesService, TorrentsService, UsersService) { var vm = this; vm.user = Authentication.user; vm.language = MeanTorrentConfig.meanTorrentConfig.language; @@ -68,6 +68,7 @@ * checkMessageUnread */ vm.checkMessageUnread = function () { + vm.getCountUnread(); $interval(vm.getCountUnread, 120000); }; @@ -79,6 +80,23 @@ } }; + /** + * checkHnRWarning + */ + vm.checkHnRWarning = function () { + vm.getWarning(); + $interval(vm.getWarning, 120000); + }; + + vm.getWarning = function () { + if (Authentication.user) { + UsersService.getUserWarningNumber() + .then(function (data) { + vm.user.hnr_warning = Authentication.user.hnr_warning = data.hnr_warning; + }); + } + }; + /** * stateChangeSuccess */ diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index 27635888..cc433bf6 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -188,7 +188,7 @@ body { .menu-badge { position: absolute; right: 10px; - top: 3px; + top: 4px; } .menu-parent { diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html index ddd50190..f8cccb9b 100644 --- a/modules/core/client/views/header.client.view.html +++ b/modules/core/client/views/header.client.view.html @@ -1,4 +1,4 @@ -