Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-07 12:02:53 +08:00
Code Packages Activity Actions 9

UX: make the blue notification float over the column headers on desktop

Browse source
This commit is contained in:
Régis Hanol 2014-10-29 00:46:05 +01:00
parent 8f97056878
commit 7525a896df
5 changed files with 42 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
View file

@ -121,7 +121,6 @@ var controllerOpts = {
canBulkSelect: Em.computed.alias('currentUser.staff'), canBulkSelect: Em.computed.alias('currentUser.staff'),
hasTopics: Em.computed.gt('topics.length', 0), hasTopics: Em.computed.gt('topics.length', 0),
showTable: Em.computed.or('hasTopics', 'topicTrackingState.hasIncoming'),
allLoaded: Em.computed.empty('more_topics_url'), allLoaded: Em.computed.empty('more_topics_url'),
latest: Discourse.computed.endWith('filter', 'latest'), latest: Discourse.computed.endWith('filter', 'latest'),
new: Discourse.computed.endWith('filter', 'new'), new: Discourse.computed.endWith('filter', 'new'),

71
app/assets/javascripts/discourse/templates/discovery/topics.hbs
View file

@ -26,53 +26,46 @@
{{top-period-chooser period=period}} {{top-period-chooser period=period}}
</div> </div>
{{/if}} {{/if}}
{{#if showTable}} {{#if topicTrackingState.hasIncoming}}
<div class="show-more">
<div class='alert alert-info clickable' {{action "showInserted"}}>
{{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
{{i18n click_to_show}}
</div>
</div>
{{/if}}
{{#if hasTopics}}
<table class='topic-list'> <table class='topic-list'>
<thead> <thead>
<tr> <tr>
{{#if currentUser}} {{#if currentUser}}
<th class='star'> <th class='star'>
{{#if canBulkSelect}} {{#if canBulkSelect}}
<button class='btn bulk-select' {{action "toggleBulkSelect"}} title="{{i18n topics.bulk.toggle}}"><i class='fa fa-list'></i></button> <button class='btn bulk-select' {{action "toggleBulkSelect"}} title="{{i18n topics.bulk.toggle}}"><i class='fa fa-list'></i></button>
{{/if}}
</th>
{{/if}} {{/if}}
</th> {{#sortable-heading class="default"}} {{i18n topic.title}} {{/sortable-heading}}
{{/if}} {{#unless controller.hideCategory}}
{{#sortable-heading class="default"}} {{i18n topic.title}} {{/sortable-heading}} {{#sortable-heading sortBy="category" action="changeSort" order=order ascending=ascending}}
{{#unless controller.hideCategory}} {{i18n category_title}}
{{#sortable-heading sortBy="category" action="changeSort" order=order ascending=ascending}} {{/sortable-heading}}
{{i18n category_title}} {{/unless}}
{{#sortable-heading class="posters"}} {{i18n users}} {{/sortable-heading}}
{{#sortable-heading sortBy="posts" number=true action="changeSort" order=order ascending=ascending}}
{{i18n posts}}
{{/sortable-heading}} {{/sortable-heading}}
{{/unless}} {{#sortable-heading sortBy="views" number=true action="changeSort" order=order ascending=ascending}}
{{#sortable-heading class="posters"}} {{i18n users}} {{/sortable-heading}} {{i18n views}}
{{#sortable-heading sortBy="posts" number=true action="changeSort" order=order ascending=ascending}} {{/sortable-heading}}
{{i18n posts}} {{#sortable-heading sortBy="activity" number=true action="changeSort" order=order ascending=ascending}}
{{/sortable-heading}} {{i18n activity}}
{{#sortable-heading sortBy="views" number=true action="changeSort" order=order ascending=ascending}} {{/sortable-heading}}
{{i18n views}} </tr>
{{/sortable-heading}}
{{#sortable-heading sortBy="activity" number=true action="changeSort" order=order ascending=ascending}}
{{i18n activity}}
{{/sortable-heading}}
</tr>
</thead> </thead>
{{#if topicTrackingState.hasIncoming}}
<tbody>
<tr>
<td colspan="9">
<div class='alert alert-info clickable' {{action "showInserted"}}>
{{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
{{i18n click_to_show}}
</div>
</td>
</tr>
</tbody>
{{/if}}
<tbody> <tbody>
{{each topics itemController="topic-list-item" itemView="topic-list-item"}} {{each topics itemController="topic-list-item" itemView="topic-list-item"}}
</tbody> </tbody>
</table> </table>
{{/if}} {{/if}}
</div> </div>

2
app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
View file

@ -4,7 +4,7 @@
{{top-period-chooser period=period}} {{top-period-chooser period=period}}
</div> </div>
{{/if}} {{/if}}
{{#if showTable}} {{#if hasTopics}}
<table class='topic-list'> <table class='topic-list'>
{{#if topicTrackingState.hasIncoming}} {{#if topicTrackingState.hasIncoming}}
<tbody> <tbody>

6
app/assets/stylesheets/common/base/_topic-list.scss
View file

@ -1,3 +1,9 @@
.show-more {
position: absolute;
top: 5px;
width: 100%;
}
.list-controls { .list-controls {
#navigation-bar { #navigation-bar {
.has-icon span:before { .has-icon span:before {

3
app/assets/stylesheets/common/base/discourse.scss
View file

@ -2,6 +2,9 @@
@extend .clearfix; @extend .clearfix;
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
.contents {
position: relative;
}
} }
.full-width { .full-width {