codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 19:08:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Malformed HTML really screws with the renderer

Browse source
This commit is contained in:
Robin Ward 2014-10-06 16:28:48 -04:00
parent 52298faaa0
commit 76a9eca5b0
2 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/assets/javascripts/discourse/templates/header.hbs
View file

@ -99,27 +99,27 @@
<a {{bind-attr class=":star topic.starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="topic.starTooltip"}}></a> <a {{bind-attr class=":star topic.starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="topic.starTooltip"}}></a>
{{/if}} {{/if}}
<div class="title-wrapper"> <div class="title-wrapper">
<h1> <h1>
{{#if showPrivateMessageGlyph}} {{#if showPrivateMessageGlyph}}
<span class="private-message-glyph">{{fa-icon envelope}}</span> <span class="private-message-glyph">{{fa-icon envelope}}</span>
{{/if}}
{{#if topic.details.loaded}}
{{topic-status topic=topic}}
<a class='topic-link' href='{{unbound topic.url}}' {{action "jumpToTopPost"}}>{{{topic.fancy_title}}}</a>
{{else}}
{{#if topic.errorLoading}}
{{topic.errorTitle}}
{{else}}
{{i18n topic.loading}}
{{/if}} {{/if}}
{{#if topic.details.loaded}}
{{topic-status topic=topic}}
<a class='topic-link' href='{{unbound topic.url}}' {{action "jumpToTopPost"}}>{{{topic.fancy_title}}}</a>
{{else}}
{{#if topic.errorLoading}}
{{topic.errorTitle}}
{{else}}
{{i18n topic.loading}}
{{/if}}
{{/if}}
</h1>
{{#if topic.category.parentCategory}}
{{bound-category-link topic.category.parentCategory onlyStripe="true"}}
{{/if}} {{/if}}
</h1> {{bound-category-link topic.category onlyStripe="true"}}
{{#if topic.category.parentCategory}} </div>
{{bound-category-link topic.category.parentCategory onlyStripe="true"}}
{{/if}}
{{bound-category-link topic.category onlyStripe="true"}}
</div>
</div> </div>
</div> </div>
{{/if}} {{/if}}

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

@ -9,14 +9,11 @@
{{#if postStream.firstPostPresent}} {{#if postStream.firstPostPresent}}
<div id='topic-title'> <div id='topic-title'>
<div class='container'> <div class='container'>
{{#if showStarButton}}
<a {{bind-attr class=":star starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="starTooltip"}}></a>
{{/if}}
{{#if showStarButton}} <div class="title-wrapper">
<a {{bind-attr class=":star starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="starTooltip"}}></a>
{{/if}}
<div class="title-wrapper">
{{#if editingTopic}} {{#if editingTopic}}
{{#if isPrivateMessage}} {{#if isPrivateMessage}}
<span class="private-message-glyph">{{fa-icon envelope}}</span> <span class="private-message-glyph">{{fa-icon envelope}}</span>
@ -56,12 +53,10 @@
{{/if}} {{/if}}
{{bound-category-link category}} {{bound-category-link category}}
{{/unless}} {{/unless}}
</div>
{{/if}} {{/if}}
{{plugin-outlet "topic-title"}}
</div> </div>
{{plugin-outlet "topic-title"}}
</div>
</div> </div>
{{/if}} {{/if}}