diff --git a/app/assets/javascripts/discourse/app/controllers/application.js b/app/assets/javascripts/discourse/app/controllers/application.js index 45bb0eedaf6..8f61937e09d 100644 --- a/app/assets/javascripts/discourse/app/controllers/application.js +++ b/app/assets/javascripts/discourse/app/controllers/application.js @@ -2,6 +2,7 @@ import Controller from "@ember/controller"; import { action } from "@ember/object"; import { service } from "@ember/service"; import runAfterFramePaint from "discourse/lib/after-frame-paint"; +import { applyValueTransformer } from "discourse/lib/transformer"; import { isTesting } from "discourse-common/config/environment"; import discourseDebounce from "discourse-common/lib/debounce"; import deprecated from "discourse-common/lib/deprecated"; @@ -39,6 +40,10 @@ export default class ApplicationController extends Controller { return this.showFooter && this.siteSettings.enable_powered_by_discourse; } + get showBannerContent() { + return applyValueTransformer("show-application-banner-content", true); + } + @discourseComputed canSignUp() { return ( diff --git a/app/assets/javascripts/discourse/app/lib/transformer/registry.js b/app/assets/javascripts/discourse/app/lib/transformer/registry.js index fb641495c61..50ecc15b473 100644 --- a/app/assets/javascripts/discourse/app/lib/transformer/registry.js +++ b/app/assets/javascripts/discourse/app/lib/transformer/registry.js @@ -13,4 +13,5 @@ export const VALUE_TRANSFORMERS = Object.freeze([ "mentions-class", "more-topics-tabs", "post-menu-buttons", + "show-application-banner-content", ]); diff --git a/app/assets/javascripts/discourse/app/templates/application.hbs b/app/assets/javascripts/discourse/app/templates/application.hbs index 7dab457db2e..a8d1e7a69f5 100644 --- a/app/assets/javascripts/discourse/app/templates/application.hbs +++ b/app/assets/javascripts/discourse/app/templates/application.hbs @@ -47,34 +47,44 @@ - + {{#if this.showBannerContent}} + + {{/if}}
- + {{#if this.showBannerContent}} + + {{/if}}
- {{#if this.showTop}} - + {{#if this.showBannerContent}} + {{#if this.showTop}} + + {{/if}} + + + + {{/if}} - - - -
{{outlet}} - + {{#if this.showBannerContent}} + + {{/if}}
- + {{#if this.showBannerContent}} + + {{/if}} {{#if this.showPoweredBy}} diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js index 149954d299d..2d285e262e7 100644 --- a/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js +++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-setup.js @@ -172,6 +172,16 @@ class ChatSetupInit { category: "organisms", id: "chat", }); + + api.registerValueTransformer( + "show-application-banner-content", + ({ value }) => { + if (this.router.currentRouteName.startsWith("chat.")) { + return false; + } + return value; + } + ); }); } diff --git a/plugins/chat/assets/stylesheets/common/core-extensions.scss b/plugins/chat/assets/stylesheets/common/core-extensions.scss index 89725bb9c3a..095a22b9824 100644 --- a/plugins/chat/assets/stylesheets/common/core-extensions.scss +++ b/plugins/chat/assets/stylesheets/common/core-extensions.scss @@ -1,10 +1,3 @@ -.has-full-page-chat { - .global-notice, - .bootstrap-mode-notice { - display: none; - } -} - .admin-plugins { [data-plugin-name="chat"] { display: none;