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

FIX: make sure the global notice shows up on ALL the pages

This commit is contained in:
Régis Hanol 2015-08-05 22:55:32 +02:00
parent 7ef83913b6
commit dbd6099b89
5 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/admin/templates/admin.hbs
View File

@ -1,5 +1,4 @@
<div class="container"> <div class="container">
{{global-notice}}
<div class="row"> <div class="row">
<div class="full-width"> <div class="full-width">

6
app/assets/javascripts/discourse/templates/application.hbs
View File

@ -1,6 +1,10 @@
{{render "header"}} {{render "header"}}
<div id='main-outlet' class='wrap'> <div id="main-outlet" class="wrap">
<div class="container">
{{custom-html "top"}}
{{global-notice}}
</div>
{{outlet}} {{outlet}}
{{render "user-card"}} {{render "user-card"}}
</div> </div>

12
app/assets/javascripts/discourse/templates/discovery.hbs
View File

@ -1,10 +1,8 @@
<div class='container'> <div class="container">
{{custom-html "top"}}
{{global-notice}}
{{discourse-banner user=currentUser banner=site.banner}} {{discourse-banner user=currentUser banner=site.banner}}
</div> </div>
<div class='list-controls'> <div class="list-controls">
<div class="container"> <div class="container">
{{outlet "navigation-bar"}} {{outlet "navigation-bar"}}
</div> </div>
@ -12,17 +10,17 @@
{{conditional-loading-spinner condition=loading}} {{conditional-loading-spinner condition=loading}}
<div class="container list-container {{if loading 'hidden'}}"> <div class="container list-container {{if loading "hidden"}}">
<div class="row"> <div class="row">
<div class="full-width"> <div class="full-width">
<div id='header-list-area'> <div id="header-list-area">
{{outlet "header-list-container"}} {{outlet "header-list-container"}}
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="full-width"> <div class="full-width">
<div id='list-area'> <div id="list-area">
{{plugin-outlet "discovery-list-container-top"}} {{plugin-outlet "discovery-list-container-top"}}
{{outlet "list-container"}} {{outlet "list-container"}}
</div> </div>

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

@ -1,25 +1,23 @@
<div class='container'> {{#if model}}
{{custom-html "top"}} <div class="container">
{{global-notice}}
{{#if model}}
{{discourse-banner user=currentUser banner=site.banner overlay=view.hasScrolled hide=model.errorLoading}} {{discourse-banner user=currentUser banner=site.banner overlay=view.hasScrolled hide=model.errorLoading}}
{{/if}} </div>
</div> {{/if}}
{{plugin-outlet "topic-above-post-stream"}} {{plugin-outlet "topic-above-post-stream"}}
{{#if model.postStream.loaded}} {{#if model.postStream.loaded}}
{{#if model.postStream.firstPostPresent}} {{#if model.postStream.firstPostPresent}}
<div id='topic-title'> <div id="topic-title">
<div class='container'> <div class="container">
<div class="title-wrapper"> <div class="title-wrapper">
{{#if editingTopic}} {{#if editingTopic}}
{{#if model.isPrivateMessage}} {{#if model.isPrivateMessage}}
<span class="private-message-glyph">{{fa-icon "envelope"}}</span> <span class="private-message-glyph">{{fa-icon "envelope"}}</span>
{{autofocus-text-field id='edit-title' value=buffered.title maxLength=maxTitleLength}} {{autofocus-text-field id="edit-title" value=buffered.title maxLength=maxTitleLength}}
{{else}} {{else}}
{{autofocus-text-field id='edit-title' value=buffered.title maxLength=maxTitleLength}} {{autofocus-text-field id="edit-title" value=buffered.title maxLength=maxTitleLength}}
<br> <br>
{{category-chooser valueAttribute="id" value=buffered.category_id source=buffered.category_id}} {{category-chooser valueAttribute="id" value=buffered.category_id source=buffered.category_id}}
{{/if}} {{/if}}
@ -36,13 +34,13 @@
{{#if model.details.loaded}} {{#if model.details.loaded}}
{{topic-status topic=model}} {{topic-status topic=model}}
<a href='{{unbound model.url}}' {{action "jumpTop"}} class='fancy-title'> <a href="{{unbound model.url}}" {{action "jumpTop"}} class="fancy-title">
{{{model.fancyTitle}}} {{{model.fancyTitle}}}
</a> </a>
{{/if}} {{/if}}
{{#if model.details.can_edit}} {{#if model.details.can_edit}}
<a href {{action "editTopic"}} class='edit-topic' title='{{i18n 'edit'}}'>{{fa-icon "pencil"}}</a> <a href {{action "editTopic"}} class="edit-topic" title="{{i18n "edit"}}">{{fa-icon "pencil"}}</a>
{{/if}} {{/if}}
</h1> </h1>
@ -61,10 +59,10 @@
{{view "selected-posts"}} {{view "selected-posts"}}
<div class="row"> <div class="row">
<section class="topic-area" id='topic' data-topic-id='{{unbound model.id}}'> <section class="topic-area" id="topic" data-topic-id="{{unbound model.id}}">
<div class='posts-wrapper'> <div class="posts-wrapper">
{{render 'topic-progress'}} {{render "topic-progress"}}
{{conditional-loading-spinner condition=model.postStream.loadingAbove}} {{conditional-loading-spinner condition=model.postStream.loadingAbove}}
@ -83,21 +81,21 @@
{{conditional-loading-spinner condition=model.postStream.loadingBelow}} {{conditional-loading-spinner condition=model.postStream.loadingBelow}}
</div> </div>
<div id='topic-bottom'></div> <div id="topic-bottom"></div>
{{#conditional-loading-spinner condition=model.postStream.loadingFilter}} {{#conditional-loading-spinner condition=model.postStream.loadingFilter}}
{{#if loadedAllPosts}} {{#if loadedAllPosts}}
{{view 'topic-closing' topic=model}} {{view "topic-closing" topic=model}}
{{view 'topic-footer-buttons' topic=model}} {{view "topic-footer-buttons" topic=model}}
{{#if model.pending_posts_count}} {{#if model.pending_posts_count}}
<div class='has-pending-posts'> <div class="has-pending-posts">
{{{i18n "queue.has_pending_posts" count=model.pending_posts_count}}} {{{i18n "queue.has_pending_posts" count=model.pending_posts_count}}}
{{#link-to 'queued-posts'}} {{#link-to "queued-posts"}}
{{fa-icon 'check'}} {{fa-icon "check"}}
{{i18n 'queue.view_pending'}} {{i18n "queue.view_pending"}}
{{/link-to}} {{/link-to}}
</div> </div>
{{/if}} {{/if}}
@ -105,9 +103,9 @@
{{plugin-outlet "topic-above-suggested"}} {{plugin-outlet "topic-above-suggested"}}
{{#if model.details.suggested_topics.length}} {{#if model.details.suggested_topics.length}}
<div id='suggested-topics'> <div id="suggested-topics">
<h3>{{i18n 'suggested_topics.title'}}</h3> <h3>{{i18n "suggested_topics.title"}}</h3>
<div class='topics'> <div class="topics">
{{basic-topic-list topics=model.details.suggested_topics postsAction="showTopicEntrance"}} {{basic-topic-list topics=model.details.suggested_topics postsAction="showTopicEntrance"}}
</div> </div>
<h3>{{{view.browseMoreMessage}}}</h3> <h3>{{{view.browseMoreMessage}}}</h3>
@ -122,10 +120,10 @@
</div> </div>
{{else}} {{else}}
<div class='container'> <div class="container">
{{#conditional-loading-spinner condition=noErrorYet}} {{#conditional-loading-spinner condition=noErrorYet}}
{{#if model.notFoundHtml}} {{#if model.notFoundHtml}}
<div class='not-found'>{{{model.notFoundHtml}}}</div> <div class="not-found">{{{model.notFoundHtml}}}</div>
{{else}} {{else}}
<div class="topic-error"> <div class="topic-error">
<div>{{model.message}}</div> <div>{{model.message}}</div>

5
app/assets/javascripts/discourse/templates/user/user.hbs
View File

@ -1,8 +1,3 @@
<div class='container'>
{{custom-html "top"}}
{{global-notice}}
</div>
<div class="container"> <div class="container">
<section class='user-main'> <section class='user-main'>
<section {{bind-attr class="collapsedInfo :about model.profileBackground:has-background:no-background"}} style={{model.profileBackground}}> <section {{bind-attr class="collapsedInfo :about model.profileBackground:has-background:no-background"}} style={{model.profileBackground}}>