diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 957511eb..0dd6f0db 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -741,7 +741,8 @@ TOPIC_DELETE: 'delete topic', TOPIC_TOP_TOPIC: 'top status', TOPIC_GLOBAL_TOPIC: 'global status', - TOPIC_THUMBS_UP: 'thumbs up and donate score' + TOPIC_THUMBS_UP: 'thumbs up and donate score', + HAS_ATTACH: 'has attach files' } }, diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index a18caa2a..3189f604 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -741,7 +741,8 @@ TOPIC_DELETE: '删除话题', TOPIC_TOP_TOPIC: '置顶话题', TOPIC_GLOBAL_TOPIC: '全局话题', - TOPIC_THUMBS_UP: '点赞送分' + TOPIC_THUMBS_UP: '点赞送分', + HAS_ATTACH: '包含附件' } }, diff --git a/modules/forums/client/controllers/forums-view.client.controller.js b/modules/forums/client/controllers/forums-view.client.controller.js index 59df31ba..9e76db01 100644 --- a/modules/forums/client/controllers/forums-view.client.controller.js +++ b/modules/forums/client/controllers/forums-view.client.controller.js @@ -147,5 +147,24 @@ return false; } }; + + /** + * hasAttach + * @param t + * @returns {boolean} + */ + vm.hasAttach = function (t) { + var has = false; + if (t._attach.length > 0) { + has = true; + } else { + angular.forEach(t._replies, function (r) { + if (r._attach.length > 0) { + has = true; + } + }); + } + return has; + } } }()); diff --git a/modules/forums/client/less/forum.less b/modules/forums/client/less/forum.less index d15b6978..7926c703 100644 --- a/modules/forums/client/less/forum.less +++ b/modules/forums/client/less/forum.less @@ -202,6 +202,11 @@ color: lighten(@brand-primary, 15%); } } + .fa { + margin-left: 3px; + color: darken(@brand-primary, 10%); + cursor: pointer; + } } .topic-by { color: #666; @@ -679,8 +684,8 @@ em { overflow: hidden; text-overflow: ellipsis; display: -webkit-box; - line-height: 20px; /* fallback */ - max-height: 40px; /* fallback */ + line-height: 20px; /* fallback */ + max-height: 40px; /* fallback */ -webkit-line-clamp: 2; /* number of lines to show */ -webkit-box-orient: vertical; } diff --git a/modules/forums/client/views/search-result.client.view.html b/modules/forums/client/views/search-result.client.view.html index 2ab2739d..0cb95f18 100644 --- a/modules/forums/client/views/search-result.client.view.html +++ b/modules/forums/client/views/search-result.client.view.html @@ -13,7 +13,7 @@
- - {{r.forum.category}} > {{r.forum.name}} + {{r.forum.category}} -> {{r.forum.name}}
diff --git a/modules/forums/client/views/view.client.view.html b/modules/forums/client/views/view.client.view.html index dda12df7..349b3a32 100644 --- a/modules/forums/client/views/view.client.view.html +++ b/modules/forums/client/views/view.client.view.html @@ -32,6 +32,9 @@

{{t.title}} + R

@@ -117,10 +120,13 @@