IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: mobile topic list and suggested topics: show new/unread counts OR total post count, not both.

Browse Source
This commit is contained in:
Neil Lalonde 2015-09-10 18:17:00 -04:00
parent 18d7c1c75d
commit 4b43edee91
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs Normal file
View File

@ -0,0 +1,5 @@
{{#if view.showBadges}}
{{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}}
{{else}}
{{raw "list/posts-count-column" topic=topic tagName="div"}}
{{/if}}

12
app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
View File

@ -5,13 +5,9 @@
{{#each t in topics}} {{#each t in topics}}
<tr {{bind-attr class="t.archived"}}> <tr {{bind-attr class="t.archived"}}>
<td> <td>
<div class='main-link clearfix'> <div class='main-link'>
{{topic-status topic=t}} {{topic-status topic=t}}
{{topic-link t}} {{topic-link t}}
{{topic-post-badges unread=t.unread
newPosts=t.new_posts
unseen=t.unseen
url=t.lastUnreadUrl}}
{{#if t.hasExcerpt}} {{#if t.hasExcerpt}}
<div class="topic-excerpt"> <div class="topic-excerpt">
@ -25,10 +21,14 @@
</div> </div>
{{/if}} {{/if}}
</div> </div>
<div class='pull-right'>
{{raw "list/post-count-or-badges" topic=t postBadgesEnabled="true"}}
</div>
<div class='clearfix'></div>
<div class="topic-item-stats clearfix"> <div class="topic-item-stats clearfix">
<div class="pull-right"> <div class="pull-right">
{{raw "list/posts-count-column" topic=t tagName="div"}}
{{raw "list/activity-column" topic=t tagName="div" class="num activity last"}} {{raw "list/activity-column" topic=t tagName="div" class="num activity last"}}
<a href="{{t.lastPostUrl}}" title='{{i18n 'last_post'}}: {{{raw-date t.bumped_at}}}'>{{t.last_poster_username}}</a>
</div> </div>
{{#unless controller.hideCategory}} {{#unless controller.hideCategory}}
<div class='category'> <div class='category'>

7
app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs
View File

@ -2,13 +2,10 @@
<div class='main-link'> <div class='main-link'>
{{raw "topic-status" topic=content}} {{raw "topic-status" topic=content}}
{{topic-link content}} {{topic-link content}}
{{#if controller.showTopicPostBadges}}
{{raw "topic-post-badges" unread=content.unread newPosts=content.displayNewPosts unseen=content.unseen url=content.lastUnreadUrl}}
{{/if}}
{{raw "list/topic-excerpt" topic=content}} {{raw "list/topic-excerpt" topic=content}}
</div> </div>
<div class='pull-right'> <div class='pull-right'>
{{raw "list/posts-count-column" topic=content tagName="div"}} {{raw "list/post-count-or-badges" topic=content postBadgesEnabled=controller.showTopicPostBadges}}
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
@ -22,8 +19,8 @@
<div class="pull-right"> <div class="pull-right">
<div class='num activity last'> <div class='num activity last'>
<a href="{{content.lastPostUrl}}" title='{{i18n 'last_post'}}: {{{raw-date content.bumped_at}}}'>{{content.last_poster_username}}</a>
{{raw "list/activity-column" topic=content tagName="span" class="age"}} {{raw "list/activity-column" topic=content tagName="span" class="age"}}
<a href="{{content.lastPostUrl}}" title='{{i18n 'last_post'}}: {{{raw-date content.bumped_at}}}'>{{content.last_poster_username}}</a>
</div> </div>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>

6
app/assets/javascripts/discourse/views/list/post-count-or-badges.js.es6 Normal file
View File

@ -0,0 +1,6 @@
import computed from "ember-addons/ember-computed-decorators";
export default Ember.Object.extend({
postCountsPresent: Ember.computed.or('topic.unread', 'topic.displayNewPosts', 'topic.unseen'),
showBadges: Ember.computed.and('postBadgesEnabled', 'postCountsPresent')
});

2
app/assets/stylesheets/mobile/topic-list.scss
View File

@ -357,7 +357,7 @@ td .main-link {
padding: 5px 10px 5px 0; padding: 5px 10px 5px 0;
} }
} }
.topic-list-item { .topic-list {
.posts-map { .posts-map {
font-size: 1.071em; font-size: 1.071em;
padding-top: 2px; padding-top: 2px;