From 54c0bbef364774f8049004e1647a9f0e1d73fb62 Mon Sep 17 00:00:00 2001
From: Jonnie Spratley <jonniespratley@gmail.com>
Date: Thu, 1 Jan 2015 14:05:07 -0800
Subject: [PATCH] updated server.js

---
 app/views/pages.html | 65 ++++----------------------------------------
 server.js            | 18 +++---------
 2 files changed, 10 insertions(+), 73 deletions(-)

diff --git a/app/views/pages.html b/app/views/pages.html
index dd68f58..5265096 100755
--- a/app/views/pages.html
+++ b/app/views/pages.html
@@ -53,65 +53,12 @@
 								</div>
 						</div>
 				</section>
-				<div class="row ">
-
-
-
-
-					<!-- Create normal bootstrap form element -->
+				<div class="row">
 					<form class="form-horizontal" ng-submit="save(page)">
-
-
-						<div class="col-sm-7 col-xs-7">
-
-								<!-- Embed the schema editor on the form -->
-								<div
-								fg-form
-								fg-form-data="page"
-								fg-schema="pageSchema"></div>
-
-
-						</div>
-						<div class="col-sm-5 col-xs-5">
-							<span class="help-block">
-								<strong>Permlink:</strong> http://{{App.baseurl}}/?page_id={{page.slug}}
-							</span>
-								<ul class="list-unstyled form-list">
-										<li class="form-group">
-												<label class="col-sm-2 control-label">Published:</label>
-												<input type="checkbox" ng-model="page.status" value="true">
-										</li>
-										<li class="form-group">
-												<label class="col-sm-2 control-label">Order:</label>
-												<input type="number">
-										</li>
-										<li class="form-group">
-												<label class="col-sm-2 control-label">Parent:</label>
-												<select>
-														<option>Page 1</option>
-														<option>Option 2</option>
-														<option>Option 3</option>
-												</select>
-										</li>
-										<li class="form-group">
-												<label class="col-sm-2 control-label">Template:</label>
-												<select>
-														<option>Template 1</option>
-														<option>Option 2</option>
-														<option>Option 3</option>
-												</select>
-										</li>
-										<li class="form-actions">
-												<button href="#" class="btn btn-danger btn-block" ng-click="remove(page)">Move to trash</button>
-												<button class="btn pull-right btn-primary btn-block">Save</button>
-										</li>
-								</ul>
-
+						<div class="col-sm-12">
+								<div fg-form fg-form-data="page" fg-schema="pageSchema"></div>
+								<button href="#" class="btn btn-danger btn-block" ng-click="remove(page)">Move to trash</button>
+								<button class="btn pull-right btn-primary btn-block">Save</button>
 						</div>
+					</form>
 				</div>
-
-			</form>
-
-		</div>
-		<!--/span-->
-		<!--/row-->
diff --git a/server.js b/server.js
index 2b1271d..67ea21f 100755
--- a/server.js
+++ b/server.js
@@ -4,18 +4,8 @@
  */
 var express = require('express');
 var fs = require('fs');
-//var cmsRouter = require('./routes/cms-router.js');
+var cmsRouter = require('./routes/cms-router.js');
 var app = express();
-//var config = JSON.parse(fs.readFileSync('./config/config.json'));
-//var server = new cmsRouter.mount(config, app);
-//console.log(server);
-
-
-var Resource = require('./routes/generic.js');
-
-
-
-
-var r = Resource.init();
-
-console.log(r.findAll('users'));
+var config = JSON.parse(fs.readFileSync('./config/config.json'));
+var server = new cmsRouter.mount(config, app);
+console.log(server);