github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-31 07:15:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: overlay the banner when reading a topic

Browse Source
This commit is contained in:
Régis Hanol 2014-06-20 18:53:12 +02:00
parent 94de396b99
commit 4878d88cbd
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{{#if visible}} {{#if visible}}
<div id="banner"> <div id="banner" {{bind-attr 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}}}

2
app/assets/javascripts/discourse/templates/topic.js.handlebars
View File

@ -1,7 +1,7 @@
<div class='container'> <div class='container'>
{{custom-html "top"}} {{custom-html "top"}}
{{Discourse.globalNotice}} {{Discourse.globalNotice}}
{{discourse-banner user=currentUser banner=Discourse.banner}} {{discourse-banner user=currentUser banner=Discourse.banner overlay=view.hasScrolled}}
</div> </div>
{{#if postStream.loaded}} {{#if postStream.loaded}}

7
app/assets/javascripts/discourse/views/topic_view.js
View File

@ -115,6 +115,9 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
this.set('docAt', false); this.set('docAt', false);
}, },
offset: 0,
hasScrolled: Em.computed.gt("offset", 0),
/** /**
The user has scrolled the window, or it is finished rendering and ready for processing. The user has scrolled the window, or it is finished rendering and ready for processing.
@ -129,6 +132,8 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
} }
} }
this.set("offset", offset);
var headerController = this.get('controller.controllers.header'), var headerController = this.get('controller.controllers.header'),
topic = this.get('controller.model'); topic = this.get('controller.model');
if (this.get('docAt')) { if (this.get('docAt')) {
@ -138,7 +143,7 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
} }
// Trigger a scrolled event // Trigger a scrolled event
this.appEvents.trigger('topic:scrolled'); this.appEvents.trigger('topic:scrolled', offset);
}, },
topicTrackingState: function() { topicTrackingState: function() {

6
app/assets/stylesheets/common/components/banner.css.scss
View File

@ -8,6 +8,12 @@
border-radius: 5px; border-radius: 5px;
background: scale-color($tertiary, $lightness: 90%); background: scale-color($tertiary, $lightness: 90%);
@include box-shadow(0 1px 2px scale-color($tertiary, $lightness: 70%)); @include box-shadow(0 1px 2px scale-color($tertiary, $lightness: 70%));
max-width: 1090px;
z-index: 501;
&.overlay {
position: fixed;
}
.close { .close {
font-size: 25px !important; font-size: 25px !important;