From 1aa075f70bed81b419e1a209ce74dd2ce7205cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 7 Aug 2015 18:06:55 +0200
Subject: [PATCH] FIX: hide custom top/footer in admin section
---
app/assets/javascripts/admin/routes/admin.js.es6 | 16 ++++++++++++++++
.../javascripts/admin/routes/admin_route.js | 5 -----
.../discourse/controllers/application.js.es6 | 1 +
.../discourse/templates/application.hbs | 4 +++-
4 files changed, 20 insertions(+), 6 deletions(-)
create mode 100644 app/assets/javascripts/admin/routes/admin.js.es6
delete mode 100644 app/assets/javascripts/admin/routes/admin_route.js
diff --git a/app/assets/javascripts/admin/routes/admin.js.es6 b/app/assets/javascripts/admin/routes/admin.js.es6
new file mode 100644
index 00000000000..c1b80b2df56
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin.js.es6
@@ -0,0 +1,16 @@
+export default Discourse.Route.extend({
+ titleToken() {
+ return I18n.t('admin_title');
+ },
+
+ activate() {
+ this.controllerFor("application").setProperties({
+ showTop: false,
+ showFooter: false,
+ });
+ },
+
+ deactivate() {
+ this.controllerFor("application").set("showTop", true);
+ }
+});
diff --git a/app/assets/javascripts/admin/routes/admin_route.js b/app/assets/javascripts/admin/routes/admin_route.js
deleted file mode 100644
index 07fc597f039..00000000000
--- a/app/assets/javascripts/admin/routes/admin_route.js
+++ /dev/null
@@ -1,5 +0,0 @@
-Discourse.AdminRoute = Discourse.Route.extend({
- titleToken: function() {
- return I18n.t('admin_title');
- }
-});
diff --git a/app/assets/javascripts/discourse/controllers/application.js.es6 b/app/assets/javascripts/discourse/controllers/application.js.es6
index 6017af32142..2f0b4cec5f3 100644
--- a/app/assets/javascripts/discourse/controllers/application.js.es6
+++ b/app/assets/javascripts/discourse/controllers/application.js.es6
@@ -1,4 +1,5 @@
export default Ember.Controller.extend({
+ showTop: true,
showFooter: false,
styleCategory: null,
diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs
index 7eb87f79e34..9d92d2063f2 100644
--- a/app/assets/javascripts/discourse/templates/application.hbs
+++ b/app/assets/javascripts/discourse/templates/application.hbs
@@ -2,7 +2,9 @@
<div id="main-outlet" class="wrap">
<div class="container">
- {{custom-html "top"}}
+ {{#if showTop}}
+ {{custom-html "top"}}
+ {{/if}}
{{global-notice}}
</div>
{{outlet}}