Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "FIX: Added <br/> for @coding-horror" 

This reverts commit d62218fb5b.
This commit is contained in:
Robin Ward 2014-08-25 18:55:56 -04:00
parent 64331e2ac1
commit 939b7ce7e2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/routes/discovery_top_routes.js
View File

@ -26,7 +26,7 @@ Discourse.DiscoveryTopRoute = Discourse.Route.extend(Discourse.OpenComposer, {
renderTemplate: function() { renderTemplate: function() {
this.render('navigation/default', { outlet: 'navigation-bar' }); this.render('navigation/default', { outlet: 'navigation-bar' });
this.render('discovery/topics', { outlet: 'list-container' }); this.render('discovery/top', { outlet: 'list-container' });
}, },
actions: { actions: {

3
app/assets/javascripts/discourse/templates/discovery/top.js.handlebars
View File

@ -6,7 +6,7 @@
{{#if topicList}} {{#if topicList}}
<div class="clearfix"> <div class="clearfix">
{{top-period-chooser period=period}} {{top-period-chooser period=period}}
{{basic-topic-list topicList=topicList hideCategory=hideCategory postsAction="showTopicEntrance"}}
{{#if topicList.topics.length}}<a href="{{unbound period.showMoreUrl}}" class='btn btn-default pull-right'>{{i18n show_more}}</a>{{/if}} {{#if topicList.topics.length}}<a href="{{unbound period.showMoreUrl}}" class='btn btn-default pull-right'>{{i18n show_more}}</a>{{/if}}
</div> </div>
{{/if}} {{/if}}
@ -17,7 +17,6 @@
{{#link-to "discovery.categories"}}{{i18n topic.browse_all_categories}}{{/link-to}} {{i18n or}} {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}}. {{#link-to "discovery.categories"}}{{i18n topic.browse_all_categories}}{{/link-to}} {{i18n or}} {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}}.
{{else}} {{else}}
{{#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}} {{#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}}
<br/>
{{top-period-buttons period=period}} {{top-period-buttons period=period}}
{{/if}} {{/if}}
</h3> </h3>