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

Fixing HTML structure of tag filtered topic list

This commit is contained in:
Kris 2018-08-15 19:40:58 -04:00
parent ac3b0f0164
commit 7b412727bb
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/templates/tags.hbs
View File

@ -1,11 +1,3 @@
{{#d-section pageClass="tags"}}
<div class="container list-container">
<div class="row">
<div class="full-width">
<div id='list-area'>
{{outlet}}
</div>
</div>
</div>
</div>
{{/d-section}}
{{#d-section pageClass="tags" tagName=""}}
{{outlet}}
{{/d-section}}

66
app/assets/javascripts/discourse/templates/tags/show.hbs
View File

@ -4,6 +4,7 @@
<div class="list-controls">
<div class="container">
<section class="navigation-container">
{{#if tagNotification}}
{{#unless additionalTags}}
{{tag-notifications-button action="changeTagNotification"
@ -11,10 +12,10 @@
{{/unless}}
{{/if}}
{{#if showAdminControls}}
{{d-button action="deleteTag" icon="trash-o" class="admin-tag btn-danger"}}
{{d-button action="renameTag" actionParam=tag icon="pencil" class="admin-tag"}}
{{/if}}
{{#if showAdminControls}}
{{d-button action="deleteTag" icon="trash-o" class="admin-tag btn-danger"}}
{{d-button action="renameTag" actionParam=tag icon="pencil" class="admin-tag"}}
{{/if}}
{{create-topic-button
canCreateTopic=canCreateTopic
@ -40,35 +41,42 @@
{{/each}}
</h2>
{{/if}}
</section>
</div>
</div>
{{plugin-outlet name="discovery-list-container-top"}}
<div class="container list-container">
<div class="row">
<div class="full-width">
<div id='list-area'>
{{conditional-loading-spinner condition=loading}}
{{conditional-loading-spinner condition=loading}}
{{#unless loading}}
{{#if list.topics}}
{{#discovery-topics-list model=list refresh="refresh"}}
{{bulk-select-button selected=selected action="refresh"}}
{{#unless loading}}
{{#if list.topics}}
{{#discovery-topics-list model=list refresh="refresh"}}
{{bulk-select-button selected=selected action="refresh"}}
{{topic-list topics=list.topics
canBulkSelect=canBulkSelect
toggleBulkSelect="toggleBulkSelect"
bulkSelectEnabled=bulkSelectEnabled
selected=selected
showPosters=true
order=order
ascending=ascending
changeSort="changeSort"}}
{{/discovery-topics-list}}
{{else}}
<footer class='topic-list-bottom'>
<h3>
{{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}}.
</h3>
</footer>
{{/if}}
{{/unless}}
{{topic-list topics=list.topics
canBulkSelect=canBulkSelect
toggleBulkSelect="toggleBulkSelect"
bulkSelectEnabled=bulkSelectEnabled
selected=selected
showPosters=true
order=order
ascending=ascending
changeSort="changeSort"}}
{{/discovery-topics-list}}
{{else}}
<footer class='topic-list-bottom'>
<h3>
{{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}}.
</h3>
</footer>
{{/if}}
{{/unless}}
</div>
</div>
</div>
</div>