diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 5727ba71..7a5eb903 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -198,10 +198,14 @@ TMDB_INFO_FAILED: 'Load TMDB movie info ERROR', TAB_VIDEO_INFO: 'Video Info', TAB_USER_SUBTITLE: 'Subtitle Info', + TAB_THUMBS_LIST: 'Thumbs-up', TAB_USER_INFO: 'User Info', TAB_OTHER_TORRENTS: 'Other Torrents', TAB_MY_PANEL: 'My Pannel', TAB_ADMIN_PANEL: 'Admin Panel', + THUMBS_UP_TORRENT: 'Thumbs-up for this torrent and donate score ({{number}}) to uploader', + TORRENT_THUMBS_SUCCESSFULLY: 'Thumbs-up for torrent successfully', + TORRENT_THUMBS_FAILED: 'Thumbs-up for torrent failed', ANNOUNCE_URL: 'Announce Url', ATTRIBUTE_TAGS: 'Video Attribute (tags)', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 9811b77a..765ad978 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -198,10 +198,14 @@ TMDB_INFO_FAILED: '装载 TMDB 电影信息失败', TAB_VIDEO_INFO: '视频信息', TAB_USER_SUBTITLE: '字幕信息', + TAB_THUMBS_LIST: '点赞用户', TAB_USER_INFO: '用户信息', TAB_OTHER_TORRENTS: '其它种子', TAB_MY_PANEL: '我的面板', TAB_ADMIN_PANEL: '管理员面板', + THUMBS_UP_TORRENT: '我要为此种子点赞并赠送 {{number}} 积分给发布者', + TORRENT_THUMBS_SUCCESSFULLY: '为种子点赞成功', + TORRENT_THUMBS_FAILED: '为种子点赞失败', ANNOUNCE_URL: 'Tracker 地址', ATTRIBUTE_TAGS: '视频属性(标签)', diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index 5377ae77..6a64c409 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -707,7 +707,7 @@ body { > li { > a { margin-right: 5px; - padding: 10px 30px; + padding: 10px 20px; border-top: 3px solid transparent; } &.active { diff --git a/modules/forums/client/controllers/forums-topic.client.controller.js b/modules/forums/client/controllers/forums-topic.client.controller.js index d5f08983..2b15e531 100644 --- a/modules/forums/client/controllers/forums-topic.client.controller.js +++ b/modules/forums/client/controllers/forums-topic.client.controller.js @@ -12,6 +12,7 @@ marked, ModalConfirmService, $stateParams, TopicsService, localStorageService, $compile, RepliesService, $filter, Upload, DownloadService) { var vm = this; vm.forumsConfig = MeanTorrentConfig.meanTorrentConfig.forumsConfig; + vm.scoreConfig = MeanTorrentConfig.meanTorrentConfig.score; vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage; vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app; vm.user = Authentication.user; diff --git a/modules/forums/client/less/forum.less b/modules/forums/client/less/forum.less index f7bc2da4..74da8c8e 100644 --- a/modules/forums/client/less/forum.less +++ b/modules/forums/client/less/forum.less @@ -470,24 +470,6 @@ } } } - .thumbs-up-list { - margin-top: 20px; - .thumbs-header { - color: #777; - height: 40px; - padding: 15px 15px; - font-weight: 500; - } - .thumbs-users { - border-top: 1px dashed #ddd; - padding: 6px 15px; - width: auto; - .thumbs-item { - margin: 5px 10px; - font-size: 12px; - } - } - } } } .reply-avatar { @@ -503,6 +485,25 @@ } } +.thumbs-up-list { + margin-top: 20px; + .thumbs-header { + color: #777; + height: 40px; + padding: 15px 15px; + font-weight: 500; + } + .thumbs-users { + border-top: 1px dashed #ddd; + padding: 6px 15px; + width: auto; + .thumbs-item { + margin: 5px 10px; + font-size: 12px; + } + } +} + .add-moderator-popover { max-width: 250px; max-height: 150px; diff --git a/modules/forums/client/views/topic.client.view.html b/modules/forums/client/views/topic.client.view.html index d14bca5e..a7619058 100644 --- a/modules/forums/client/views/topic.client.view.html +++ b/modules/forums/client/views/topic.client.view.html @@ -104,7 +104,7 @@ ({{vm.topic._thumbs.length}}) @@ -177,7 +177,7 @@ ({{rep._thumbs.length}}) diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html index 860eca56..9ecde611 100644 --- a/modules/torrents/client/views/view-torrent.client.view.html +++ b/modules/torrents/client/views/view-torrent.client.view.html @@ -310,7 +310,9 @@