diff --git a/config/assets/production.js b/config/assets/production.js index ca8c4280..a9cc01aa 100644 --- a/config/assets/production.js +++ b/config/assets/production.js @@ -10,13 +10,11 @@ module.exports = { 'public/lib/angular-ui-notification/dist/angular-ui-notification.min.css', 'public/lib/bootstrap/dist/css/bootstrap.min.css', 'public/lib/bootstrap/dist/css/bootstrap-theme.min.css', - 'public/lib/Ionicons/css/ionicons.min.css' + 'public/lib/Ionicons/css/ionicons.min.css', // endbower ], js: [ // bower:js - 'public/lib/jquery/dist/jquery.min.js', - 'public/lib/bootstrap/dist/js/bootstrap.min.js', 'public/lib/angular/angular.min.js', 'public/lib/angular-animate/angular-animate.min.js', 'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js', @@ -28,7 +26,7 @@ module.exports = { 'public/lib/ng-file-upload/ng-file-upload.min.js', 'public/lib/owasp-password-strength-test/owasp-password-strength-test.js', 'public/lib/angular-translate/angular-translate.min.js', - 'public/lib/bootstrap-filestyle/src/bootstrap-filestyle.min.js' + 'public/lib/bootstrap-filestyle/src/bootstrap-filestyle.min.js', // endbower ] }, diff --git a/modules/core/client/app/trans-string-cn.js b/modules/core/client/app/trans-string-cn.js index 9314d701..b7a6c6a1 100644 --- a/modules/core/client/app/trans-string-cn.js +++ b/modules/core/client/app/trans-string-cn.js @@ -74,6 +74,7 @@ TORRENTS_SUBMIT_UPLOADS: '同意上传协议，并提交', SUBMIT_BUTTON: '已备妥，现在提交', AGREE_RULES: '我已阅读并同意站内所有协议条款，协议条款', + DOWNLOAD_TORRENT: '下载种子', //footer view MIT_PROTOCOL: '本项目源码受 MIT 开源协议保护', diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 7b299b2e..a61d41a2 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -74,6 +74,7 @@ TORRENTS_SUBMIT_UPLOADS: 'Agree the rules and submit your resources', SUBMIT_BUTTON: 'OK, SUBMIT NOW', AGREE_RULES: 'I agree and already read all the rules, read here', + DOWNLOAD_TORRENT: 'Download Torrent', //footer view MIT_PROTOCOL: 'The source of this project is protected by MIT open source protocol', diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js index 7b303653..a0e88ddd 100644 --- a/modules/core/client/controllers/home.client.controller.js +++ b/modules/core/client/controllers/home.client.controller.js @@ -5,13 +5,31 @@ .module('core') .controller('HomeController', HomeController); - HomeController.$inject = ['$scope', '$translate']; + HomeController.$inject = ['$scope', '$translate', 'TorrentsService', 'Notification']; - function HomeController($scope, $translate) { + function HomeController($scope, $translate, TorrentsService, Notification) { var vm = this; //$translate.use('en'); vm.COMING = 'coming soon...'; + + vm.initInfo = function () { + TorrentsService.getTMDBInfo({ + tmdbid: '329865', + language: 'en' + }, function (res) { + Notification.success({ + message: ' ' + $translate.instant('TMDB_ID_OK') + }); + + vm.movieinfo = res; + $('.backdrop').css('backgroundImage', 'url(http://image.tmdb.org/t/p/w500' + res.backdrop_path + ')'); + }, function (err) { + Notification.error({ + message: ' ' + $translate.instant('TMDB_ID_ERROR') + }); + }); + }; } }()); diff --git a/modules/core/client/css/core.css b/modules/core/client/css/core.css index 351baff0..a86a267f 100644 --- a/modules/core/client/css/core.css +++ b/modules/core/client/css/core.css @@ -95,4 +95,5 @@ a:hover .header-profile-image { .view-footer .icon { font-size: 20px; margin-right: 15px; -} \ No newline at end of file +} + diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less new file mode 100644 index 00000000..666be602 --- /dev/null +++ b/modules/core/client/less/mt.less @@ -0,0 +1,29 @@ +.backdrop { + background-image: url("http://image.tmdb.org/t/p/w1280/5pAGnkFYSsFJ99ZxDIYnhQbQFXs.jpg"); + background-position: center; + background-attachment: fixed; + background-size: cover; + margin-bottom: 20px; + //filter: blur(1px); + .filter { + background-color: #2a2730; + background-color: rgba(0, 0, 0, .55); + //opacity: 0.5; + padding-top: 30px; + padding-bottom: 30px; + } + .topone { + color: #ccc; + img { + max-height: 400px; + } + legend { + color: #ccc; + } + .down-torrent { + margin-top: 10px; + margin-left: 40px; + margin-right: 40px; + } + } +} diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html index 2016b9ac..1e9e9bbc 100644 --- a/modules/core/client/views/home.client.view.html +++ b/modules/core/client/views/home.client.view.html @@ -1,9 +1,116 @@ -
-
-
-
-

-
+
+
+
+
+
+
+ +
+ +
+
+
+
+
{{ 'TMDB_FIELDS.ORIGINAL_TITLE' | translate}}：
+
{{vm.movieinfo.original_title}}
+ +
{{ 'TMDB_FIELDS.TITLE' | translate}}：
+
{{vm.movieinfo.title}}
+ +
{{ 'TMDB_FIELDS.ORIGINAL_LANGUAGE' | translate}}：
+
{{vm.movieinfo.original_language}}
+ +
{{ 'TMDB_FIELDS.GENRES' | translate}}：
+
+ {{item.name}} | +
+ +
{{ 'TMDB_FIELDS.PRODUCTION_COUNTRIES' | translate}}：
+
+ {{item.iso_3166_1}} | +
+ + + + + + + + + + + + + +
{{ 'TMDB_FIELDS.VOTE_AVERAGE' | translate}}：
+
{{vm.movieinfo.vote_average}} / {{vm.movieinfo.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}
+ + + + + + + + + +
{{ 'TMDB_FIELDS.OVERVIEW' | translate}}：
+
{{vm.movieinfo.overview}}
+
+ +
+
+ + {{vm.movieinfo.credits.cast[0].name}} + + +
+
+ + {{vm.movieinfo.credits.cast[1].name}} + + +
+
+ + {{vm.movieinfo.credits.cast[2].name}} + + +
+
+
+ + {{vm.movieinfo.credits.cast[3].name}} + + +
+
+ + {{vm.movieinfo.credits.cast[4].name}} + + +
+
+ + {{vm.movieinfo.credits.cast[5].name}} + + +
+
+
+
+
+
+
+ +
+
-
diff --git a/modules/core/server/views/layout.server.view.html b/modules/core/server/views/layout.server.view.html index f1a6c6f3..acb7066d 100644 --- a/modules/core/server/views/layout.server.view.html +++ b/modules/core/server/views/layout.server.view.html @@ -38,7 +38,7 @@
-
+
{{{block "content"}}}
diff --git a/modules/torrents/client/views/uploads-torrents.client.view.html b/modules/torrents/client/views/uploads-torrents.client.view.html index f2af3cb4..2715172b 100644 --- a/modules/torrents/client/views/uploads-torrents.client.view.html +++ b/modules/torrents/client/views/uploads-torrents.client.view.html @@ -131,21 +131,21 @@
+ class="img-circle img-responsive center-block"> {{vm.movieinfo.credits.cast[0].name}}

{{vm.movieinfo.credits.cast[0].character}}

+ class="img-circle img-responsive center-block"> {{vm.movieinfo.credits.cast[1].name}}

{{vm.movieinfo.credits.cast[1].character}}

+ class="img-circle img-responsive center-block"> {{vm.movieinfo.credits.cast[2].name}}

{{vm.movieinfo.credits.cast[2].character}}

@@ -153,21 +153,21 @@
+ class="img-circle img-responsive center-block"> {{vm.movieinfo.credits.cast[3].name}}

{{vm.movieinfo.credits.cast[3].character}}

+ class="img-circle img-responsive center-block"> {{vm.movieinfo.credits.cast[4].name}}

{{vm.movieinfo.credits.cast[4].character}}

+ class="img-circle img-responsive center-block"> {{vm.movieinfo.credits.cast[5].name}}

{{vm.movieinfo.credits.cast[5].character}}