Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 9

UX: Pending Posts at the bottom of topics looked wonky

Browse source
This commit is contained in:
Robin Ward 2017-09-26 10:27:24 -04:00
parent 451340d058
commit 06072b3d99
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/assets/javascripts/discourse/templates/topic.hbs
View file

@ -186,6 +186,19 @@
{{#conditional-loading-spinner condition=model.postStream.loadingFilter}} {{#conditional-loading-spinner condition=model.postStream.loadingFilter}}
{{#if loadedAllPosts}} {{#if loadedAllPosts}}
{{#if model.pending_posts_count}}
<div class="has-pending-posts">
{{{i18n "queue.has_pending_posts" count=model.pending_posts_count}}}
{{#if currentUser.show_queued_posts}}
{{#link-to "queued-posts"}}
{{d-icon "check"}}
{{i18n "queue.view_pending"}}
{{/link-to}}
{{/if}}
</div>
{{/if}}
{{topic-timer-info {{topic-timer-info
statusType=model.topic_timer.status_type statusType=model.topic_timer.status_type
executeAt=model.topic_timer.execute_at executeAt=model.topic_timer.execute_at
@ -224,19 +237,6 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if model.pending_posts_count}}
<div class="has-pending-posts">
{{{i18n "queue.has_pending_posts" count=model.pending_posts_count}}}
{{#if currentUser.show_queued_posts}}
{{#link-to "queued-posts"}}
{{d-icon "check"}}
{{i18n "queue.view_pending"}}
{{/link-to}}
{{/if}}
</div>
{{/if}}
{{#if showSelectedPostsAtBottom}} {{#if showSelectedPostsAtBottom}}
<div class='selected-posts {{unless multiSelect 'hidden'}}'> <div class='selected-posts {{unless multiSelect 'hidden'}}'>
{{partial "selected-posts"}} {{partial "selected-posts"}}

2
app/assets/stylesheets/common/base/topic.scss
View file

@ -95,6 +95,8 @@
a[href] { a[href] {
float: right; float: right;
} }
margin-top: 1em;
max-width: 757px;
} }
// Target the .badge-category text, the bullet icon needs to maintain `display: block` // Target the .badge-category text, the bullet icon needs to maintain `display: block`