From 233188e7d36dea5f5e5102322be4df81b9d4114e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 1 Sep 2016 18:32:18 -0400
Subject: fix adminConfig path

---
 app/index.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/index.js b/app/index.js
index 48e713a..c0d2ff3 100644
--- a/app/index.js
+++ b/app/index.js
@@ -31,14 +31,23 @@ function OKCMS(options) {
   app.enable('strict routing');
   app.disable('x-powered-by');
 
+  var schemaConfig = options.schemas || {};
+  var resourceConfig = options.resources || [];
+  var viewConfig = options.views || {
+    '/': { template: 'index' }
+  };
+  var serviceConfig = options.services || {};
+  var adminConfig = options.admin || {}
+
   var root = this._root = options.root || 'public';
-  var adminConfig = options.admin || {};
+  var templateRoot = options.templateRoot || 'templates';
+
+  var adminPath = this._adminPath = adminConfig.path || '/admin';
   var adminRoot = this._adminRoot = adminConfig.root ||
       path.join(__dirname, '../themes/okadmin/public');
-  var adminPath = this._adminPath = '/admin';
-  var templateRoot = options.templateRoot || 'templates';
-  var adminTemplateRoot = options.templateRoot ||
+  var adminTemplateRoot = adminConfig.templateRoot ||
     path.join(__dirname, '../themes/okadmin/templates');
+
   var debug = !!options.debug;
   var production = !!options.production;
 
@@ -58,14 +67,6 @@ function OKCMS(options) {
       services: options.services,
   }, metaDefault, metaUser);
 
-  var schemaConfig = options.schemas || {};
-  var resourceConfig = options.resources || [];
-  var viewConfig = options.views || {
-    '/': { template: 'index' }
-  };
-  var serviceConfig = options.services || {};
-  var adminConfig = options.admin || {}
-
   var templateProvider = this._templateProvider = new OKTemplate({
     root: templateRoot,
     debug: debug
-- 
cgit v1.2.3-70-g09d2