pass thru plans

4 files changed, 23 insertions, 4 deletions

diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css
index ebc240a..7ae4a1e 100644
--- a/public/assets/stylesheets/staff.css
+++ b/public/assets/stylesheets/staff.css
@@ -45,7 +45,7 @@ nav.subnav {
 	margin: 20px 5px 200px 5px;
 	padding: 10px;
 	width: 400px;
-	display: inline-block;
+	display: block;
 }
 hr {
   border: 1px solid #bbb;
diff --git a/server/index.js b/server/index.js
index 4926a94..30cf69a 100644
--- a/server/index.js
+++ b/server/index.js
@@ -82,6 +82,8 @@ site.setup = function(){
 
 	// var io = websocket.listen(server)
 	// auth.initSockets(io, SessionStore)
+	
+  middleware.updatePlans()
 }
 
 site.route = function () {
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index 7dfe821..35c520c 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -6,11 +6,14 @@ var passport = require('passport'),
 	config = require('../../config.json'),
 	User = require('./schemas/User'),
 	Collaborator = require('./schemas/Collaborator'),
-	Project = require('./schemas/Project');
+	Project = require('./schemas/Project'),
+	Plan = require('./schemas/Plan');
 
 
 var middleware = {
 
+  plans: [],
+
 	enableCORS: function (req, res, next) {
 		res.header('Access-Control-Allow-Credentials', true);
 		// TODO Check https vs. http
@@ -46,7 +49,7 @@ var middleware = {
 	},
 
 	ensureLocals: function (req, res, next) {
-		res.locals.token = req.csrfToken();
+		res.locals.token = req.csrfToken()
 		res.locals.logged_in = req.isAuthenticated()
 		res.locals.user = req.user || { _id: undefined }
 		res.locals.config = config
@@ -56,6 +59,7 @@ var middleware = {
     res.locals.ogUrl = "http://vvalls.com/"
     res.locals.ogDescription = "3D gallery space, fully customizable"
     res.locals.ogAuthor = "VValls"
+    res.locals.plans = plans
 		res.locals.opt = {}
 		next()
 	},
@@ -106,6 +110,12 @@ var middleware = {
       })
     }
   },
+  
+  updatePlans: function(){
+    Plan.find({}).sort({ 'level': -1 }).exec(function (err, plans) {
+      middleware.plans = plans.map(function(plan){ return plan.toObject() })
+    })
+  },
 
 }
 
diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js
index 07050f1..19b361d 100644
--- a/server/lib/views/staff.js
+++ b/server/lib/views/staff.js
@@ -56,7 +56,12 @@ var staff = module.exports = {
           break
       }
       if (initial) {
-      	criteria.username = new RegExp('^' + initial, "i")
+        if (initial == "?") {
+          criteria.username = new RegExp('^[$a-zA-Z]', "i")
+        }
+        else {
+          criteria.username = new RegExp('^' + initial, "i")
+        }
       }
       User.find(criteria)
           .select(staff.fields.user)
@@ -749,6 +754,7 @@ var staff = module.exports = {
 
       new Plan (data).save(function(err, doc){
         if (err || ! doc) { return res.json({ error: err }) }
+        middleware.updatePlans()
         res.redirect("/staff/plans/")
       })
     },
@@ -767,6 +773,7 @@ var staff = module.exports = {
 
       req.plan.save(function(err, doc){
         if (err || ! doc) { return res.json({ error: err }) }
+        middleware.updatePlans()
         res.redirect("/staff/plans/")
       })
     },