4 files changed, 30 insertions, 22 deletions

diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css
index e5cafa2..fffadbf 100644
--- a/public/assets/stylesheets/staff.css
+++ b/public/assets/stylesheets/staff.css
@@ -67,7 +67,7 @@ hr {
 .staff .body a {
   border-bottom: 1px dotted;
 }
-.staff .editLinks a {
+.staff .editLinks a, .staff a.bluelink {
   color: #00f;
   border-bottom: 1px solid;
 }
diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js
index 6639137..2fdc2c3 100644
--- a/server/lib/views/staff.js
+++ b/server/lib/views/staff.js
@@ -629,6 +629,7 @@ var staff = module.exports = {
       res.render('staff/plans/new')
     },
     edit: function(req, res){
+      res.locals.plan = req.plan
       res.render('staff/plans/edit')
     },
     create: function(req, res){
@@ -650,13 +651,16 @@ var staff = module.exports = {
       })
     },
     update: function(req, res){
+      var fields = staff.fields.plans.split(" ")
+      var permissions = staff.fields.plans_permissions.split(" ")
+
       var data = util.cleanQuery(req.body)
       data.name = util.sanitize(data.name)
       data.slug = util.sanitize(data.slug.toLowerCase())
 
       _.extend(req.plan, data)
       permissions.forEach(function(field){
-        req.plan[field] = data["permissions_" + field]
+        req.plan.permissions[field] = data["permissions_" + field].length == 2
       })
 
       req.plan.save(function(err, doc){
diff --git a/views/staff/plans/_form.ejs b/views/staff/plans/_form.ejs
index fc86516..ae5ca5a 100644
--- a/views/staff/plans/_form.ejs
+++ b/views/staff/plans/_form.ejs
@@ -107,31 +107,31 @@
 
 <div>
 <li>
-  <input id="plan_permissions_basic_editor" name="permissions_basic_editor" type="hidden" value="0">
+  <input name="permissions_basic_editor" type="hidden" value="0">
   <input id="plan_permissions_basic_editor" name="permissions_basic_editor" type="checkbox" value="1" [[ if (plan.permissions.basic_editor) { ]]checked[[ } ]]>
   <label for="plan_permissions_basic_editor">Basic Editor</label>
 </li>
 
 <li>
-  <input id="plan_permissions_pro_editor" name="permissions_pro_editor" type="hidden" value="0">
+  <input name="permissions_pro_editor" type="hidden" value="0">
   <input id="plan_permissions_pro_editor" name="permissions_pro_editor" type="checkbox" value="1" [[ if (plan.permissions.pro_editor) { ]]checked[[ } ]]>
   <label for="plan_permissions_pro_editor">Pro Editor</label>
 </li>
 
 <li>
-  <input id="plan_permissions_solids" name="permissions_solids" type="hidden" value="0">
+  <input name="permissions_solids" type="hidden" value="0">
   <input id="plan_permissions_solids" name="permissions_solids" type="checkbox" value="1" [[ if (plan.permissions.solids) { ]]checked[[ } ]]>
   <label for="plan_permissions_solids">3D Objects</label>
 </li>
 
 <li>
-  <input id="plan_permissions_collaborators" name="permissions_collaborators" type="hidden" value="0">
+  <input name="permissions_collaborators" type="hidden" value="0">
   <input id="plan_permissions_collaborators" name="permissions_collaborators" type="checkbox" value="1" [[ if (plan.permissions.collaborators) { ]]checked[[ } ]]>
   <label for="plan_permissions_collaborators">Collaborators</label>
 </li>
 
 <li>
-  <input id="plan_permissions_no_logo" name="permissions_no_logo" type="hidden" value="0">
+  <input name="permissions_no_logo" type="hidden" value="0">
   <input id="plan_permissions_no_logo" name="permissions_no_logo" type="checkbox" value="1" [[ if (plan.permissions.no_logo) { ]]checked[[ } ]]>
   <label for="plan_permissions_no_logo">No Logo</label>
 </li>
diff --git a/views/staff/plans/index.ejs b/views/staff/plans/index.ejs
index 121a2fc..16fcf14 100644
--- a/views/staff/plans/index.ejs
+++ b/views/staff/plans/index.ejs
@@ -6,31 +6,33 @@
   
   <hr>
 
-[[ if (plans.length) { ]]
 <table>
   <tr>
-    <td></td>
-    [[ plans.forEach(function(plan){ ]]
     <td>
-      [[- plan.name ]]
+    </td>
+    [[ plans.forEach(function(plan){ ]]
+    <td style="text-align:right; min-width: 100px;">
+      <b style="text-transform:uppercase">[[- plan.name ]]</b>
     </td>
     [[ }) ]]
   </tr>
 
-  <tr>
-    <td></td>
-    [[ plans.forEach(function(plan){ ]]
+  <tr class="editLinks">
     <td>
-      <a href="/staff/plans/[[- plan.slug ]]">edit</a>
+      <a href="/staff/plans/new">New Plan</a>
+    </td>
+    [[ plans.forEach(function(plan){ ]]
+    <td style="text-align:right">
+      [<a href="/staff/plans/[[- plan.slug ]]">edit</a>]
     </td>
     [[ }) ]]
   </tr>
 
   [[ fields.forEach(function(field){ ]]
   <tr>
-    <td>[[- field.replace(/_/," ") ]]</td>
+    <td style="text-transform:capitalize">[[- field.replace(/_/g," ") ]]</td>
     [[ plans.forEach(function(plan){ ]]
-    <td>
+    <td style="text-align:right">
       [[ if (field.indexOf("_price") != -1) { ]]
         [[- plan[field] == 0 ? "" : "$" + (plan[field]/100).toFixed(2) ]]
       [[ } else { ]]
@@ -41,20 +43,22 @@
   </tr>
   [[ }) ]]
 
+  <tr>
+    <td style="border-bottom: 1px dotted #888;" colspan='10'></td>
+  </tr>
+
   [[ permissions.forEach(function(permission){ ]]
   <tr>
-    <td>[[- permission.replace(/_/," ") ]]</td>
+    <td style="text-transform:capitalize">[[- permission.replace(/_/g," ") ]]</td>
     [[ plans.forEach(function(plan){ ]]
-    <td>
-      [[- plan.permissions[permission] ? "x" : " " ]]
+    <td style="text-align:right">
+      [[- plan.permissions[permission] ? "<b>x</b>" : " " ]]
     </td>
     [[ }) ]]
   </tr>
   [[ }) ]]
 </table>
 <br clear="all">
-[[ } ]]
-  <a href="/staff/plans/new">New Plan</a>
 
   <hr>