Skip to content

Commit

Permalink
BUGFIX: move mobile templates to discovery
Browse files Browse the repository at this point in the history
  • Loading branch information
ZogStriP committed Jan 18, 2014
1 parent 0a8e791 commit c4cbf93
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 50 deletions.
1 change: 0 additions & 1 deletion app/assets/javascripts/discourse/models/topic_list.js
Expand Up @@ -32,7 +32,6 @@ function finderFor(filter, params) {
}

Discourse.TopicList = Discourse.Model.extend({

forEachNew: function(topics, callback) {
var topicIds = [];
_.each(this.get('topics'),function(topic) {
Expand Down
Expand Up @@ -57,9 +57,8 @@
{{#if allLoaded}}
<h3>
{{#if latest}}
{{#if can_create_topic}}
{{footerMessage}}<a href='#' {{action createTopic}}>{{i18n topic.suggest_create_topic}}</a>
{{/if}}
{{footerMessage}}
{{#if can_create_topic}}<a href='#' {{action createTopic}}>{{i18n topic.suggest_create_topic}}</a>{{/if}}
{{else}}
{{#if top}}
{{#link-to "discovery.categories"}}{{i18n topic.browse_all_categories}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}} {{i18n or}} {{i18n filters.top.other_periods}}
Expand Down
@@ -0,0 +1,43 @@
<div class='contents'>
{{#if showTable}}
<table id='topic-list'>
{{#if topicTrackingState.hasIncoming}}
<tbody>
<tr>
<td>
<div class='alert alert-info' {{action showInserted}}>
{{countI18n new_topics_inserted countBinding="topicTrackingState.incomingCount"}}
{{i18n show_new_topics}}
</div>
</td>
</tr>
</tbody>
{{/if}}
{{collection contentBinding="topics" tagName="tbody" itemViewClass="Discourse.TopicListItemView"}}
</table>
{{/if}}
</div>

<footer id='topic-list-bottom'>
{{#if loadingMore}}
<div class='topics-loading'>{{i18n topic.loading_more}}</div>
{{/if}}
{{#if allLoaded}}
<h3>
{{#if latest}}
{{footerMessage}}
{{#if can_create_topic}}<a href='#' {{action createTopic}}>{{i18n topic.suggest_create_topic}}</a>{{/if}}
{{else}}
{{#if top}}
{{#link-to "discovery.categories"}}{{i18n topic.browse_all_categories}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}} {{i18n or}} {{i18n filters.top.other_periods}}
{{#unless yearly}}<a href="{{unbound showMoreYearlyUrl}}" class='btn'>{{i18n filters.top.this_year}}</a>{{/unless}}
{{#unless monthly}}<a href="{{unbound showMoreMonthlyUrl}}" class='btn'>{{i18n filters.top.this_month}}</a>{{/unless}}
{{#unless weekly}}<a href="{{unbound showMoreWeeklyUrl}}" class='btn'>{{i18n filters.top.this_week}}</a>{{/unless}}
{{#unless daily}}<a href="{{unbound showMoreDailyUrl}}" class='btn'>{{i18n filters.top.today}}</a>{{/unless}}
{{else}}
{{footerMessage}}{{#link-to "discovery.categories"}}{{i18n topic.browse_all_categories}}{{/link-to}} {{i18n or}} {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}}
{{/if}}
{{/if}}
</h3>
{{/if}}
</footer>

This file was deleted.

1 change: 1 addition & 0 deletions app/assets/stylesheets/mobile/topic-list.scss
Expand Up @@ -108,6 +108,7 @@
font-size: 14px;
margin-top: 8px;
color: $dark_gray;
word-break: break-word;
}

.topic-statuses:empty {
Expand Down

0 comments on commit c4cbf93

Please sign in to comment.