From 6cc5a58b6807ddd59675c633883261eff6da27ef Mon Sep 17 00:00:00 2001 From: Paul Adam Davis Date: Sun, 11 Jan 2015 19:55:52 +0000 Subject: [PATCH] Navigation UI Ember Integration Closes #4537 - Adds Navigation to the Settings menu - Adds a `navigationUI` config flag (redirects if not an editor or author) --- core/client/controllers/settings.js | 3 ++ .../client/controllers/settings/navigation.js | 25 ++++++++++++ core/client/models/setting.js | 3 +- core/client/router.js | 1 + core/client/routes/settings/navigation.js | 27 +++++++++++++ core/client/templates/settings.hbs | 4 ++ core/client/templates/settings/navigation.hbs | 40 +++++++++++++++++++ core/client/views/settings/navigation.js | 5 +++ core/server/api/configuration.js | 1 + core/server/data/default-settings.json | 3 ++ 10 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 core/client/controllers/settings/navigation.js create mode 100644 core/client/routes/settings/navigation.js create mode 100644 core/client/templates/settings/navigation.hbs create mode 100644 core/client/views/settings/navigation.js diff --git a/core/client/controllers/settings.js b/core/client/controllers/settings.js index d60fd784fe..1b0fd9e8f7 100644 --- a/core/client/controllers/settings.js +++ b/core/client/controllers/settings.js @@ -10,6 +10,9 @@ var SettingsController = Ember.Controller.extend({ showTags: Ember.computed('session.user.name', function () { return this.get('session.user.isAuthor') ? false : true; }), + showNavigation: Ember.computed('session.user.name', 'config.navigationUI', function () { + return this.get('session.user.isAuthor') || this.get('session.user.isEditor') || !this.get('config.navigationUI') ? false : true; + }), showCodeInjection: Ember.computed('session.user.name', 'controllers.feature.codeInjectionUI', function () { return this.get('session.user.isAuthor') || this.get('session.user.isEditor') || !this.get('controllers.feature.codeInjectionUI') ? false : true; }), diff --git a/core/client/controllers/settings/navigation.js b/core/client/controllers/settings/navigation.js new file mode 100644 index 0000000000..a16fdc5b6f --- /dev/null +++ b/core/client/controllers/settings/navigation.js @@ -0,0 +1,25 @@ +var NavigationController = Ember.Controller.extend(Ember.Evented, { + + navigationJSON: Ember.computed('model.navigation', function () { + var navJSON = JSON.parse(this.get('model.navigation') || {}), + lastNavItem = navJSON[navJSON.length - 1]; + lastNavItem.last = true; // Set a 'last' property on the last nav item, only used in the template + return navJSON; + }), + + actions: { + addItem: function () { + // Add a new item + }, + + deleteItem: function () { + // Delete navItem which should be a function param like: `deleteItem: function(navItem) {` + }, + + save: function () { + // Save everything + } + } +}); + +export default NavigationController; diff --git a/core/client/models/setting.js b/core/client/models/setting.js index a44f3e4d74..5f5214cdb4 100644 --- a/core/client/models/setting.js +++ b/core/client/models/setting.js @@ -17,7 +17,8 @@ var Setting = DS.Model.extend(NProgressSaveMixin, ValidationEngine, { availableThemes: DS.attr(), ghost_head: DS.attr('string'), ghost_foot: DS.attr('string'), - labs: DS.attr('string') + labs: DS.attr('string'), + navigation: DS.attr('string') }); export default Setting; diff --git a/core/client/router.js b/core/client/router.js index e2fc518007..e21925ce79 100644 --- a/core/client/router.js +++ b/core/client/router.js @@ -41,6 +41,7 @@ Router.map(function () { this.route('tags'); this.route('labs'); this.route('code-injection'); + this.route('navigation'); }); // Redirect debug to settings labs diff --git a/core/client/routes/settings/navigation.js b/core/client/routes/settings/navigation.js new file mode 100644 index 0000000000..0f26cf9a62 --- /dev/null +++ b/core/client/routes/settings/navigation.js @@ -0,0 +1,27 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; +import CurrentUserSettings from 'ghost/mixins/current-user-settings'; + +var NavigationRoute = AuthenticatedRoute.extend(CurrentUserSettings, { + + titleToken: 'Navigation', + + beforeModel: function () { + if (!this.get('config.navigationUI')) { + return this.transitionTo('settings.general'); + } + + return this.currentUser().then(this.transitionAuthor()); + }, + + model: function () { + return this.store.find('setting', {type: 'blog,theme'}).then(function (records) { + return records.get('firstObject'); + }); + }, + + setupController: function (controller, model) { + this._super(controller, model); + } +}); + +export default NavigationRoute; diff --git a/core/client/templates/settings.hbs b/core/client/templates/settings.hbs index 55bc0e3c36..db30c06ba2 100644 --- a/core/client/templates/settings.hbs +++ b/core/client/templates/settings.hbs @@ -19,6 +19,10 @@ {{gh-activating-list-item route="settings.tags" title="Tags" classNames="settings-nav-tags icon-tag"}} {{/if}} + {{#if showNavigation}} + {{gh-activating-list-item route="settings.navigation" title="Navigation" classNames="settings-nav-navigation icon-compass"}} + {{/if}} + {{#if showCodeInjection}} {{gh-activating-list-item route="settings.code-injection" title="Code Injection" classNames="settings-nav-code icon-code"}} {{/if}} diff --git a/core/client/templates/settings/navigation.hbs b/core/client/templates/settings/navigation.hbs new file mode 100644 index 0000000000..ee493face3 --- /dev/null +++ b/core/client/templates/settings/navigation.hbs @@ -0,0 +1,40 @@ +
+ {{#link-to "settings" class="btn btn-default btn-back"}}Back{{/link-to}} +

Navigation

+
+ +
+
+ +
+
+ + {{#each navItem in navigationJSON}} +
+ +
+ + + + + + +
+ + {{#if navItem.last}} + + {{else}} + + {{/if}} + +
+ {{/each}} + +
+
\ No newline at end of file diff --git a/core/client/views/settings/navigation.js b/core/client/views/settings/navigation.js new file mode 100644 index 0000000000..74146cb972 --- /dev/null +++ b/core/client/views/settings/navigation.js @@ -0,0 +1,5 @@ +import BaseView from 'ghost/views/settings/content-base'; + +var SettingsNavigationView = BaseView.extend(); + +export default SettingsNavigationView; diff --git a/core/server/api/configuration.js b/core/server/api/configuration.js index 75a203cea8..16f8230a4a 100644 --- a/core/server/api/configuration.js +++ b/core/server/api/configuration.js @@ -11,6 +11,7 @@ function getValidKeys() { var validKeys = { fileStorage: config.fileStorage === false ? false : true, apps: config.apps === true ? true : false, + navigationUI: config.navigationUI === true ? true : false, codeInjectionUI: config.codeInjectionUI === true ? true : false, version: config.ghostVersion, environment: process.env.NODE_ENV, diff --git a/core/server/data/default-settings.json b/core/server/data/default-settings.json index 8818fc7b0b..6f2ec7dafe 100644 --- a/core/server/data/default-settings.json +++ b/core/server/data/default-settings.json @@ -70,6 +70,9 @@ }, "labs": { "defaultValue": "{}" + }, + "navigation": { + "defaultValue": "[{\"id\": 1, \"label\":\"Home\", \"url\":\"http://my-ghost-blog.com/\"},{\"id\": 2, \"label\":\"About\", \"url\":\"http://my-ghost-blog.com/about/\"},{\"id\": 3, \"label\":\"Links\", \"url\":\"http://my-ghost-blog.com/links/\"},{\"id\": 4, \"label\":\"External\", \"url\":\"https://ghost.org\"}]" } }, "theme": {