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

Fix banner breaking on reentry.

This commit is contained in:
Robin Ward 2015-05-04 16:01:35 -04:00
parent 82a4066993
commit 72b6c86564
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
View File

@ -1,5 +1,5 @@
<div class="row"> <div class="row">
<div id="banner" {{bind-attr class="overlay"}}> <div id="banner" class={{overlay}}>
<div id="banner-content"> <div id="banner-content">
<div class="close" {{action "dismiss"}}><i class="fa fa-times" title="{{i18n 'banner.close'}}"></i></div> <div class="close" {{action "dismiss"}}><i class="fa fa-times" title="{{i18n 'banner.close'}}"></i></div>
{{{banner.html}}} {{{banner.html}}}

4
app/assets/javascripts/discourse/templates/topic.hbs
View File

@ -1,7 +1,9 @@
<div class='container'> <div class='container'>
{{custom-html "top"}} {{custom-html "top"}}
{{global-notice}} {{global-notice}}
{{discourse-banner user=currentUser banner=site.banner overlay=view.hasScrolled hide=model.errorLoading}} {{#if model}}
{{discourse-banner user=currentUser banner=site.banner overlay=view.hasScrolled hide=model.errorLoading}}
{{/if}}
</div> </div>
{{plugin-outlet "topic-above-post-stream"}} {{plugin-outlet "topic-above-post-stream"}}