diff --git a/core/client/app/routes/settings/about.js b/core/client/app/routes/settings/about.js index 0933418af6..1e166742a5 100644 --- a/core/client/app/routes/settings/about.js +++ b/core/client/app/routes/settings/about.js @@ -25,6 +25,10 @@ var SettingsAboutRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, self.set('cachedConfig', cachedConfig); return cachedConfig; }); + }, + + renderTemplate: function () { + this.render('settings/about', {into: 'application'}); } }); diff --git a/core/client/app/routes/settings/apps.js b/core/client/app/routes/settings/apps.js index 143a64b1e0..842bee04fc 100644 --- a/core/client/app/routes/settings/apps.js +++ b/core/client/app/routes/settings/apps.js @@ -19,6 +19,10 @@ var AppsRoute = AuthenticatedRoute.extend(styleBody, CurrentUserSettings, { model: function () { return this.store.find('app'); + }, + + renderTemplate: function () { + this.render('settings/apps', {into: 'application'}); } }); diff --git a/core/client/app/routes/settings/code-injection.js b/core/client/app/routes/settings/code-injection.js index 332d34ea38..c266481c77 100644 --- a/core/client/app/routes/settings/code-injection.js +++ b/core/client/app/routes/settings/code-injection.js @@ -18,6 +18,10 @@ var SettingsCodeInjectionRoute = AuthenticatedRoute.extend(styleBody, loadingInd }); }, + renderTemplate: function () { + this.render('settings/code-injection', {into: 'application'}); + }, + actions: { save: function () { this.get('controller').send('save'); diff --git a/core/client/app/routes/settings/general.js b/core/client/app/routes/settings/general.js index db0644d2b1..cbc0731922 100644 --- a/core/client/app/routes/settings/general.js +++ b/core/client/app/routes/settings/general.js @@ -20,6 +20,10 @@ var SettingsGeneralRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator }); }, + renderTemplate: function () { + this.render('settings/general', {into: 'application'}); + }, + actions: { save: function () { this.get('controller').send('save'); diff --git a/core/client/app/routes/settings/labs.js b/core/client/app/routes/settings/labs.js index c926103719..d14e483c8c 100644 --- a/core/client/app/routes/settings/labs.js +++ b/core/client/app/routes/settings/labs.js @@ -17,6 +17,10 @@ var LabsRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, CurrentUs return this.store.find('setting', {type: 'blog,theme'}).then(function (records) { return records.get('firstObject'); }); + }, + + renderTemplate: function () { + this.render('settings/labs', {into: 'application'}); } }); diff --git a/core/client/app/routes/settings/navigation.js b/core/client/app/routes/settings/navigation.js index 310f31f7ae..f4fe79e308 100644 --- a/core/client/app/routes/settings/navigation.js +++ b/core/client/app/routes/settings/navigation.js @@ -19,6 +19,10 @@ var NavigationRoute = AuthenticatedRoute.extend(styleBody, CurrentUserSettings, }); }, + renderTemplate: function () { + this.render('settings/navigation', {into: 'application'}); + }, + actions: { save: function () { // since shortcuts are run on the route, we have to signal to the components diff --git a/core/client/app/templates/settings.hbs b/core/client/app/templates/settings.hbs deleted file mode 100644 index c24cd68950..0000000000 --- a/core/client/app/templates/settings.hbs +++ /dev/null @@ -1 +0,0 @@ -{{outlet}}