From 2049f45c302e38055bbc77d3a2fd32121dbaf368 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Mon, 19 Jun 2017 15:44:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(torrents)=EF=BC=9Aadd=20many=20tags=20conf?= =?UTF-8?q?ig=20item?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/env/torrents.js | 56 +++++++++++++++------- modules/core/client/app/trans-string-en.js | 13 ++++- modules/core/client/app/trans-string-zh.js | 15 +++++- modules/core/client/less/mt.less | 2 +- 4 files changed, 66 insertions(+), 20 deletions(-) diff --git a/config/env/torrents.js b/config/env/torrents.js index cbbe8555..274b6b72 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -135,6 +135,7 @@ module.exports = { value: [ {name: 'BLU_RAY', icon: ''}, {name: 'REMUX', icon: ''}, + {name: 'WEB_DL', icon: ''}, {name: 'ENCODE', icon: ''} ] }, @@ -143,6 +144,7 @@ module.exports = { value: [ {name: 'S4K', icon: ''}, {name: 'S1080P', icon: ''}, + {name: 'S1080I', icon: ''}, {name: 'S720P', icon: ''} ] }, @@ -158,11 +160,21 @@ module.exports = { name: 'AUDIO', value: [ {name: 'AAC', icon: ''}, + {name: 'AC3', icon: ''}, + {name: 'LPCM', icon: ''}, {name: 'DTS', icon: ''}, {name: 'DTS_HD', icon: ''}, {name: 'ATMOS_TRUEHD', icon: ''} ] }, + { + name: 'CHANNEL', + value: [ + {name: 'C20', icon: ''}, + {name: 'C51', icon: ''}, + {name: 'C71', icon: ''} + ] + }, { name: 'THREED', value: [ @@ -183,6 +195,14 @@ module.exports = { } ], checkbox: [ + { + name: 'MODIFY', + value: [ + {name: 'DIY', icon: ''}, + {name: 'GUOPEI', icon: ''}, + {name: 'ZHONGZI', icon: ''} + ] + }, { name: 'RANKING', value: [ @@ -191,14 +211,6 @@ module.exports = { {name: 'DOUBAN_TOP100', icon: ''}, {name: 'DOUBAN_TOP250', icon: ''} ] - }, - { - name: 'MODIFY', - value: [ - {name: 'DIY', icon: ''}, - {name: 'GUOPEI', icon: ''}, - {name: 'ZHONGZI', icon: ''} - ] } ] }, @@ -209,6 +221,7 @@ module.exports = { value: [ {name: 'BLU_RAY', icon: ''}, {name: 'REMUX', icon: ''}, + {name: 'WEB_DL', icon: ''}, {name: 'ENCODE', icon: ''} ] }, @@ -217,6 +230,7 @@ module.exports = { value: [ {name: 'S4K', icon: ''}, {name: 'S1080P', icon: ''}, + {name: 'S1080I', icon: ''}, {name: 'S720P', icon: ''} ] }, @@ -232,11 +246,21 @@ module.exports = { name: 'AUDIO', value: [ {name: 'AAC', icon: ''}, + {name: 'AC3', icon: ''}, + {name: 'LPCM', icon: ''}, {name: 'DTS', icon: ''}, {name: 'DTS_HD', icon: ''}, {name: 'ATMOS_TRUEHD', icon: ''} ] }, + { + name: 'CHANNEL', + value: [ + {name: 'C20', icon: ''}, + {name: 'C51', icon: ''}, + {name: 'C71', icon: ''} + ] + }, { name: 'REGION', value: [ @@ -250,6 +274,14 @@ module.exports = { } ], checkbox: [ + { + name: 'MODIFY', + value: [ + {name: 'DIY', icon: ''}, + {name: 'GUOPEI', icon: ''}, + {name: 'ZHONGZI', icon: ''} + ] + }, { name: 'RANKING', value: [ @@ -258,14 +290,6 @@ module.exports = { {name: 'DOUBAN_TOP100', icon: ''}, {name: 'DOUBAN_TOP250', icon: ''} ] - }, - { - name: 'MODIFY', - value: [ - {name: 'DIY', icon: ''}, - {name: 'GUOPEI', icon: ''}, - {name: 'ZHONGZI', icon: ''} - ] } ] }, diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 085d16f9..2b237b65 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -590,6 +590,7 @@ TYPE: { SELF: 'Type', BLU_RAY: 'BLU_RAY', + WEB_DL: 'WEB_DL', REMUX: 'REMUX', ENCODE: 'ENCODE' }, @@ -597,7 +598,8 @@ RESOLUTION: { SELF: 'Resolution', S4K: '4K', - S1080P: '1080P', + S1080P: '1080p', + S1080I: '1080i', S720P: '720P' }, @@ -611,11 +613,20 @@ AUDIO: { SELF: 'Audio Codec', AAC: 'AAC', + AC3: 'AC3', + LPCM: 'LPCM', DTS: 'DTS', DTS_HD: 'DTS HD', ATMOS_TRUEHD: 'Atmos TrueHD' }, + CHANNEL: { + SELF: 'Audio Channel', + C20: '2.0 chnnel', + C51: '5.1 channel', + C71: '7.1 channel' + }, + THREED: { SELF: '2D/3D', T2D: '2D', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index e98fc27f..5dcfa3cb 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -590,6 +590,7 @@ TYPE: { SELF: '类型', BLU_RAY: 'BLU_RAY', + WEB_DL: 'WEB_DL', REMUX: 'REMUX', ENCODE: 'ENCODE' }, @@ -597,8 +598,9 @@ RESOLUTION: { SELF: '解析度', S4K: '4K', - S1080P: '1080P', - S720P: '720P' + S1080P: '1080p', + S1080I: '1080i', + S720P: '720p' }, VIDEO: { @@ -611,11 +613,20 @@ AUDIO: { SELF: '音频编码', AAC: 'AAC', + AC3: 'AC3', + LPCM: 'LPCM', DTS: 'DTS', DTS_HD: 'DTS HD', ATMOS_TRUEHD: 'Atmos TrueHD' }, + CHANNEL: { + SELF: '声道', + C20: '2.0 声道', + C51: '5.1 声道', + C71: '7.1 声道' + }, + THREED: { SELF: '2D/3D', T2D: '2D', diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index cfaaff05..cf5d13df 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -404,7 +404,7 @@ body { } .btn-tag { - width: 100px; + min-width: 80px; &, &:active, &:focus {