Merge pull request #5332 from cobbspur/route

Fix route for About page

ghost/admin/app/controllers/about.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-var SettingsAboutController = Ember.Controller.extend({
+var AboutController = Ember.Controller.extend({
     updateNotificationCount: 0,
 
     actions: {
@@ -9,4 +9,4 @@ var SettingsAboutController = Ember.Controller.extend({
     }
 });
 
-export default SettingsAboutController;
+export default AboutController;

ghost/admin/app/router.js

@@ -20,6 +20,7 @@ Router.map(function () {
     this.route('signout');
     this.route('signup', {path: '/signup/:token'});
     this.route('reset', {path: '/reset/:token'});
+    this.route('about', {path: '/about'});
 
     this.resource('posts', {path: '/'}, function () {
         this.route('post', {path: ':post_id'});
@@ -37,6 +38,7 @@ Router.map(function () {
             this.route('user', {path: '/:slug'});
         });
 
+        // Redirect about page
         this.route('about');
         this.route('tags');
         this.route('labs');

ghost/admin/app/routes/about.js

@@ -0,0 +1,35 @@
+import AuthenticatedRoute from 'ghost/routes/authenticated';
+import loadingIndicator from 'ghost/mixins/loading-indicator';
+import styleBody from 'ghost/mixins/style-body';
+
+var AboutRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, {
+    titleToken: 'About',
+
+    classNames: ['view-about'],
+
+    cachedConfig: false,
+    model: function () {
+        var cachedConfig = this.get('cachedConfig'),
+            self = this;
+        if (cachedConfig) {
+            return cachedConfig;
+        }
+
+        return ic.ajax.request(this.get('ghostPaths.url').api('configuration'))
+            .then(function (configurationResponse) {
+                var configKeyValues = configurationResponse.configuration;
+                cachedConfig = {};
+                configKeyValues.forEach(function (configKeyValue) {
+                    cachedConfig[configKeyValue.key] = configKeyValue.value;
+                });
+                self.set('cachedConfig', cachedConfig);
+                return cachedConfig;
+            });
+    },
+
+    renderTemplate: function () {
+        this.render('about', {into: 'application'});
+    }
+});
+
+export default AboutRoute;

ghost/admin/app/routes/settings/about.js

@@ -3,32 +3,8 @@ import loadingIndicator from 'ghost/mixins/loading-indicator';
 import styleBody from 'ghost/mixins/style-body';
 
 var SettingsAboutRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, {
-    titleToken: 'About',
-
-    classNames: ['settings-view-about'],
-
-    cachedConfig: false,
-    model: function () {
-        var cachedConfig = this.get('cachedConfig'),
-            self = this;
-        if (cachedConfig) {
-            return cachedConfig;
-        }
-
-        return ic.ajax.request(this.get('ghostPaths.url').api('configuration'))
-            .then(function (configurationResponse) {
-                var configKeyValues = configurationResponse.configuration;
-                cachedConfig = {};
-                configKeyValues.forEach(function (configKeyValue) {
-                    cachedConfig[configKeyValue.key] = configKeyValue.value;
-                });
-                self.set('cachedConfig', cachedConfig);
-                return cachedConfig;
-            });
-    },
-
-    renderTemplate: function () {
-        this.render('settings/about', {into: 'application'});
+    beforeModel: function () {
+        this.transitionTo('about');
     }
 });
 

ghost/admin/app/templates/about.hbs

@@ -3,7 +3,7 @@
     <header class="gh-about-header">
         <img class="gh-logo" src="{{gh-path 'admin' '/img/ghost-logo.png'}}" alt="Ghost" />
         <!-- TODO: fix about notifications -->
-        {{gh-notifications location="settings-about-upgrade" notify="updateNotificationChange"}}
+        {{gh-notifications location="about-upgrade" notify="updateNotificationChange"}}
     </header>
 
     <section class="gh-env-details">

ghost/admin/app/views/about.js

@@ -0,0 +1,5 @@
+import BaseView from 'ghost/views/settings/content-base';
+
+var AboutView = BaseView.extend();
+
+export default AboutView;

ghost/admin/app/views/settings/about.js

@@ -1,5 +0,0 @@
-import BaseView from 'ghost/views/settings/content-base';
-
-var SettingsAboutView = BaseView.extend();
-
-export default SettingsAboutView;