From 77d123b726d79456b54ce0d2b6becc69acd720e9 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Thu, 7 Sep 2017 13:32:44 +0800 Subject: [PATCH] feat(torrent): add H&R to torrent list page as filter tag --- modules/core/client/app/trans-string-en.js | 1 + modules/core/client/app/trans-string-zh.js | 1 + modules/core/client/less/mt.less | 8 ++++++++ .../controllers/admin/admin-list.client.controller.js | 5 ++++- .../client/controllers/torrents.client.controller.js | 3 +++ .../client/views/admin/admin-list.client.view.html | 9 +++++++++ .../torrents/client/views/movie-list.client.view.html | 9 +++++++++ 7 files changed, 35 insertions(+), 1 deletion(-) diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index cb26dc24..4fefa424 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -182,6 +182,7 @@ TAGS_SEARCH: 'Tags Search', CA_KEYWORD: 'Keyword', CA_TORRENT_STATUS: 'Torrent status', + CA_TORRENT_HNR: 'Hit and Run', CA_RESOURCE_TYPE: 'Resource type', PH_KEYWORD: 'Search keyword', CLEAR_ALL_CONDITION: 'Clear All Condition', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 096d341f..387d8a04 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -182,6 +182,7 @@ TAGS_SEARCH: '标签检索', CA_KEYWORD: '关键字', CA_TORRENT_STATUS: '种子状态', + CA_TORRENT_HNR: 'Hit and Run', CA_RESOURCE_TYPE: '资源类型', PH_KEYWORD: '搜索关键字', CLEAR_ALL_CONDITION: '清空所有条件', diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index 85fd734f..27635888 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -692,6 +692,14 @@ body { } } +.checkbox-hnr { + margin-top: 0; + margin-bottom: 0; + input[type="checkbox"] { + margin-top: 8px; + } +} + .incline-block-valign { display: inline-block; vertical-align: middle; diff --git a/modules/torrents/client/controllers/admin/admin-list.client.controller.js b/modules/torrents/client/controllers/admin/admin-list.client.controller.js index e2994762..d5fbf6b6 100644 --- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js +++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js @@ -269,12 +269,15 @@ }; /** - * onHnRClicked + * onHnRClicked, onHnRChanged */ vm.onHnRClicked = function () { vm.filterHnR = !vm.filterHnR; vm.torrentBuildPager(); }; + vm.onHnRChanged = function () { + vm.torrentBuildPager(); + }; /** * onRLevelClicked diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js index d32d9d2a..8034c3ca 100644 --- a/modules/torrents/client/controllers/torrents.client.controller.js +++ b/modules/torrents/client/controllers/torrents.client.controller.js @@ -260,6 +260,9 @@ vm.filterHnR = !vm.filterHnR; vm.torrentBuildPager(); }; + vm.onHnRChanged = function () { + vm.torrentBuildPager(); + }; /** * getSaleTypeDesc diff --git a/modules/torrents/client/views/admin/admin-list.client.view.html b/modules/torrents/client/views/admin/admin-list.client.view.html index d049171e..3c199bb2 100644 --- a/modules/torrents/client/views/admin/admin-list.client.view.html +++ b/modules/torrents/client/views/admin/admin-list.client.view.html @@ -42,6 +42,15 @@ +
{{ 'CA_TORRENT_HNR' | translate}}:
+
+
+ +
+
+
{{ 'CA_TORRENT_STATUS' | translate}}:
diff --git a/modules/torrents/client/views/movie-list.client.view.html b/modules/torrents/client/views/movie-list.client.view.html index 1cfee7bb..25ce8687 100644 --- a/modules/torrents/client/views/movie-list.client.view.html +++ b/modules/torrents/client/views/movie-list.client.view.html @@ -83,6 +83,15 @@
+
{{ 'CA_TORRENT_HNR' | translate}}:
+
+
+ +
+
+