diff --git a/app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars b/app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars index 6bb88dfb71a..48f6e8b3fd1 100644 --- a/app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars +++ b/app/assets/javascripts/discourse/templates/list/wide_categories.js.handlebars @@ -4,7 +4,6 @@ {{i18n categories.category}} - {{i18n categories.participants}} {{i18n categories.topics}} {{i18n categories.posts}} {{i18n categories.latest}} @@ -20,25 +19,35 @@ {{#if newTopics}} {{unbound newTopics}} {{/if}} + {{#if description_excerpt}}
{{{description_excerpt}}}
{{/if}} - {{#each featured_users}} - {{avatar this imageSize="small"}} - {{/each}} - - {{number topic_count}} - {{number post_count}} + {{number topic_count}} + {{number post_count}} {{#with latestTopic}} {{topicStatus topic=this}} - {{{topicLink this}}} -
- {{i18n categories.by}} {{unbound last_poster.username}} - {{unboundAge last_posted_at}} + {{{unbound fancy_title}}} + {{#if unread}} + {{unbound unread}} + {{/if}} + {{#if new_posts}} + {{unbound new_posts}} + {{/if}} + {{#if unseen}} + + {{/if}} +
+ {{i18n categories.latest_by}} {{unbound last_poster.username}} + {{unboundAge last_posted_at}}
{{/with}} diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index 139841bcd69..c9dd515c2b2 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -193,8 +193,21 @@ #topic-list.categories { + .last-user-info { + font-size: 12px; + margin-top: 3px; + } + tbody td { + padding-bottom: 20px; + } .category{ - width: 50%; + position: relative; + width: 55%; + .featured-users { + position: absolute; + right: 5px; + top: 3px; + } .category-description { margin-top: 10px; } diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb index 9a304e0163b..87356b7e0a0 100644 --- a/app/serializers/listable_topic_serializer.rb +++ b/app/serializers/listable_topic_serializer.rb @@ -20,9 +20,8 @@ class ListableTopicSerializer < BasicTopicSerializer :archived has_one :last_poster, serializer: BasicUserSerializer, embed: :objects - - def include_associations! - include! :last_poster if object.include_last_poster + def include_last_poster? + object.include_last_poster end def bumped diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 99bde17a7c7..02f1a0deb36 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -185,11 +185,10 @@ en: categories: category: "Category" - participants: "Participants" posts: "Posts" topics: "Topics" latest: "Latest" - by: "by" + latest_by: "latest by" user: said: "{{username}} said:"