diff --git a/config/env/torrents.js b/config/env/torrents.js index 9ea242b8..c8aff824 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -1,95 +1,129 @@ 'use strict'; module.exports = { - //announce config - announce: { - url: 'http://127.0.0.1:3000/announce', - announce_prefix: '[CHD.im].', - admin: 'admin@imean.io', - open_tracker: true - }, - tmdbConfig: { - //please change it to your api key from themoviedb.org - key: '7888f0042a366f63289ff571b68b7ce0', - backdrop_img_base_url: 'http://image.tmdb.org/t/p/w1280', - poster_img_base_url: 'http://image.tmdb.org/t/p/w500', - poster_list_base_url: 'http://image.tmdb.org/t/p/w92', - cast_img_base_url: 'http://image.tmdb.org/t/p/w132_and_h132_bestv2' - }, - resourcesTags: { - movie: { - radio: [ - { - name: 'TYPE', - value: [ - {name: 'BLU_RAY', icon: ''}, - {name: 'REMUX', icon: ''}, - {name: 'ENCODE', icon: ''} - ] - }, - { - name: 'RESOLUTION', - value: [ - {name: 'S4K', icon: ''}, - {name: 'S1080P', icon: ''}, - {name: 'S720P', icon: ''} - ] - }, - { - name: 'VIDEO', - value: [ - {name: 'AVC', icon: ''}, - {name: 'X265', icon: ''}, - {name: 'X264', icon: ''} - ] - }, - { - name: 'AUDIO', - value: [ - {name: 'AAC', icon: ''}, - {name: 'DTS', icon: ''}, - {name: 'DTS_HD', icon: ''}, - {name: 'ATMOS_TRUEHD', icon: ''} - ] - }, - { - name: 'THREED', - value: [ - {name: 'T3D', icon: ''}, - {name: 'T2D', icon: ''}, - {name: 'T2D_3D', icon: ''} - ] - }, - { - name: 'REGION', - value: [ - {name: 'CHINA', icon: ''}, - {name: 'JAPAN', icon: ''}, - {name: 'KOREA', icon: ''}, - {name: 'INDIA', icon: ''}, - {name: 'ARAB', icon: ''} - ] - } - ], - checkbox: [ - { - name: 'RANKING', - value: [ - {name: 'IMDB_TOP100', icon: ''}, - {name: 'IMDB_TOP250', icon: ''}, - {name: 'DOUBAN_TOP100', icon: ''}, - {name: 'DOUBAN_TOP250', icon: ''} - ] - }, - { - name: 'MODIFY', - value: [ - {name: 'DIY', icon: ''}, - {name: 'GUOPEI', icon: ''}, - {name: 'ZHONGZI', icon: ''} - ] - } + meanTorrentConfig: { + announce: { + url: 'http://127.0.0.1:3000/announce', + announce_prefix: '[CHD.im].', + admin: 'admin@imean.io', + open_tracker: true + }, + torrentType: { + name: 'TYPE', + value: [ + {name: 'MOVIE', value: 'movie'}, + {name: 'MTV', value: 'MTV'}, + {name: 'MUSIC', value: 'music'}, + {name: 'OTHER', value: 'other'} ] + }, + torrentStatus: { + name: 'STATUS', + value: [ + {name: 'NEW', value: 'new'}, + {name: 'REVIEWED', value: 'reviewed'}, + {name: 'DELETED', value: 'deleted'} + ] + }, + torrentSalesType: { + name: 'SALESTYPE', + value: [ + {name: 'U1/FREE'}, + {name: 'U1/D.3'}, + {name: 'U1/D.5'}, + {name: 'U1/D1'}, + {name: 'U2/FREE'}, + {name: 'U2/D.3'}, + {name: 'U2/D.5'}, + {name: 'U2/D1'}, + {name: 'U3/FREE'}, + {name: 'U3/D.5'}, + {name: 'U3/D1'} + ] + }, + tmdbConfig: { + //please change it to your api key from themoviedb.org + key: '7888f0042a366f63289ff571b68b7ce0', + backdrop_img_base_url: 'http://image.tmdb.org/t/p/w1280', + poster_img_base_url: 'http://image.tmdb.org/t/p/w500', + poster_list_base_url: 'http://image.tmdb.org/t/p/w92', + cast_img_base_url: 'http://image.tmdb.org/t/p/w132_and_h132_bestv2' + }, + resourcesTags: { + movie: { + radio: [ + { + name: 'TYPE', + value: [ + {name: 'BLU_RAY', icon: ''}, + {name: 'REMUX', icon: ''}, + {name: 'ENCODE', icon: ''} + ] + }, + { + name: 'RESOLUTION', + value: [ + {name: 'S4K', icon: ''}, + {name: 'S1080P', icon: ''}, + {name: 'S720P', icon: ''} + ] + }, + { + name: 'VIDEO', + value: [ + {name: 'AVC', icon: ''}, + {name: 'X265', icon: ''}, + {name: 'X264', icon: ''} + ] + }, + { + name: 'AUDIO', + value: [ + {name: 'AAC', icon: ''}, + {name: 'DTS', icon: ''}, + {name: 'DTS_HD', icon: ''}, + {name: 'ATMOS_TRUEHD', icon: ''} + ] + }, + { + name: 'THREED', + value: [ + {name: 'T3D', icon: ''}, + {name: 'T2D', icon: ''}, + {name: 'T2D_3D', icon: ''} + ] + }, + { + name: 'REGION', + value: [ + {name: 'CHINA', icon: ''}, + {name: 'JAPAN', icon: ''}, + {name: 'KOREA', icon: ''}, + {name: 'INDIA', icon: ''}, + {name: 'ARAB', icon: ''} + ] + } + ], + checkbox: [ + { + name: 'RANKING', + value: [ + {name: 'IMDB_TOP100', icon: ''}, + {name: 'IMDB_TOP250', icon: ''}, + {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-cn.js b/modules/core/client/app/trans-string-cn.js index dbb621e4..03e9ec5c 100644 --- a/modules/core/client/app/trans-string-cn.js +++ b/modules/core/client/app/trans-string-cn.js @@ -66,7 +66,8 @@ FINISHED: '完成下载数', IMDB_VOTES: 'IMDB 评分', MORE_TAGS: '显示更多检索标签', - RESET_TAGS: '重置检索条件与标签' + RESET_TAGS: '重置检索条件与标签', + DOWNLOAD_TORRENT: 'Doanload the torrent' }, //table fields @@ -88,6 +89,7 @@ CLEAR_ALL_CONDITION: '清空所有条件', MORE_TAGS: '显示更多标签', CA_RESET: '重置条件', + CA_DOWNLOAD: '下载种子', //TorrentsUploadsController TORRENTS_UPLOAD_SUCCESSFULLY: '文件上传成功', diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 8f5e6da8..50d2549c 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -66,7 +66,8 @@ FINISHED: 'Finished users', IMDB_VOTES: 'IMDB Votes', MORE_TAGS: 'Show More Search Tags', - RESET_TAGS: 'Reset All Search Tags' + RESET_TAGS: 'Reset All Search Tags', + DOWNLOAD_TORRENT: 'Doanload the torrent' }, //table fields @@ -88,6 +89,7 @@ CLEAR_ALL_CONDITION: 'Clear All Condition', MORE_TAGS: 'More Tags', CA_RESET: 'Reset', + CA_DOWNLOAD: 'Download', //TorrentsUploadsController & views TORRENTS_UPLOAD_SUCCESSFULLY: 'Successfully uploads file', diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js index ecbbad4e..a665a2cf 100644 --- a/modules/core/client/controllers/home.client.controller.js +++ b/modules/core/client/controllers/home.client.controller.js @@ -5,11 +5,11 @@ .module('core') .controller('HomeController', HomeController); - HomeController.$inject = ['$scope', '$translate', 'TorrentsService', 'Notification', 'TMDBConfig']; + HomeController.$inject = ['$scope', '$translate', 'TorrentsService', 'Notification', 'MeanTorrentConfig']; - function HomeController($scope, $translate, TorrentsService, Notification, TMDBConfig) { + function HomeController($scope, $translate, TorrentsService, Notification, MeanTorrentConfig) { var vm = this; - vm.tmdbConfig = TMDBConfig.tmdbConfig; + vm.tmdbConfig = MeanTorrentConfig.meanTorrentConfig.tmdbConfig; vm.movieTopList = undefined; vm.info_is_ready = false; diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index 81806408..09853014 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -1,5 +1,15 @@ @import (reference) "../../../../public/lib/bootstrap/less/variables.less"; +.brand-title { + font-size: 25px; + font-weight: bold; + line-height: 18px; + color: #FF6600; + &:hover { + color: #fff; + } +} + .bodysize { background-color: #fff; min-height: 600px; @@ -177,11 +187,18 @@ .tb-v-middle { > tbody { > tr { + .label-download { + display: none; + } cursor: pointer; &:hover { .media-object { opacity: 1; } + .label-download { + padding: 2px 4px; + display: inline; + } } > .td-v-middle { vertical-align: middle; @@ -246,6 +263,18 @@ } } +.label-download { + color: #fff; + font-size: 12px; + background-color: #FF6600; + //border-bottom:2px solid darken(#f1f8ff, 10%); + //border-color: darken(#f1f8ff, 10%);; + &:hover { + cursor: pointer; + background-color: darken(#FF6600, 10%); + } +} + .incline-block-valign { display: inline-block; vertical-align: middle; diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html index 3bd318d1..3331995a 100644 --- a/modules/core/client/views/header.client.view.html +++ b/modules/core/client/views/header.client.view.html @@ -6,7 +6,7 @@ - CHD.im + CHD.im