diff --git a/app/assets/javascripts/discourse/app/controllers/application.js b/app/assets/javascripts/discourse/app/controllers/application.js index a6ef09a7f58..2d257776d82 100644 --- a/app/assets/javascripts/discourse/app/controllers/application.js +++ b/app/assets/javascripts/discourse/app/controllers/application.js @@ -81,6 +81,11 @@ export default Controller.extend({ return enableSidebar; }, + @discourseComputed("router.currentRouteName") + showSiteHeader(currentRouteName) { + return !currentRouteName.startsWith("wizard"); + }, + @action toggleSidebar() { // enables CSS transitions, but not on did-insert diff --git a/app/assets/javascripts/discourse/app/templates/application.hbs b/app/assets/javascripts/discourse/app/templates/application.hbs index 431ea4d302f..05ad77af9f2 100644 --- a/app/assets/javascripts/discourse/app/templates/application.hbs +++ b/app/assets/javascripts/discourse/app/templates/application.hbs @@ -3,16 +3,18 @@ - + {{#if this.showSiteHeader}} + + {{/if}} diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-test.js index 38edead380c..8f01c55695c 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-test.js @@ -101,13 +101,6 @@ acceptance( exists(".sidebar-container"), "does not display the sidebar on wizard route" ); - - await click(".hamburger-dropdown"); - - assert.ok( - exists(".sidebar-hamburger-dropdown"), - "navigation around the site can still be done via the sidebar hamburger" - ); }); test("showing and hiding sidebar", async function (assert) { diff --git a/app/assets/javascripts/discourse/tests/acceptance/wizard-test.js b/app/assets/javascripts/discourse/tests/acceptance/wizard-test.js index 51395f65cb0..eed98e7585f 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/wizard-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/wizard-test.js @@ -14,6 +14,10 @@ acceptance("Wizard", function (needs) { test("Wizard starts", async function (assert) { await visit("/wizard"); assert.ok(exists(".wizard-container")); + assert.notOk( + exists(".d-header-wrap"), + "header is not rendered on wizard pages" + ); assert.strictEqual(currentRouteName(), "wizard.step"); });