From 0810b806f7605a75b080ea4a6fc9010c6552095c Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Sat, 11 Apr 2015 01:41:34 -0400
Subject: Implement admin interface resource reordering

---
 examples/db.json | 63 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 53 insertions(+), 10 deletions(-)

(limited to 'examples')

diff --git a/examples/db.json b/examples/db.json
index 148391a..20d4510 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -3,8 +3,8 @@
   "bread": [
     {
       "type": "pretzel",
-      "description": "really a very tasty bread! yup yes",
-      "color": "green",
+      "description": "really a very tasty bread!",
+      "color": "red",
       "id": "pretzel",
       "title": "Pretzel Chips",
       "images": [
@@ -23,7 +23,8 @@
         "token": "",
         "title": "",
         "thumb": ""
-      }
+      },
+      "__index": 0
     },
     {
       "type": "bagel",
@@ -38,31 +39,73 @@
         "token": "112498725",
         "title": "FW14-2H-VIDEO-V4 2",
         "thumb": "http://i.vimeocdn.com/video/497493142_640.jpg"
-      }
+      },
+      "__index": 1
     },
     {
       "type": "pumpernickel",
-      "description": "grandma's recipe",
+      "description": "yup",
       "id": "pumpernickel",
-      "title": "Pumpernickel",
+      "title": "ok",
       "images": [
         {
           "uri": "cool",
           "caption": "cool"
         }
-      ]
+      ],
+      "color": "red",
+      "video": {
+        "url": "",
+        "type": "",
+        "token": "",
+        "title": "",
+        "thumb": ""
+      },
+      "__index": 2
+    },
+    {
+      "type": "cracker",
+      "title": "",
+      "description": "once upon a time this noble creature etc",
+      "color": "red",
+      "video": {
+        "url": "",
+        "type": "",
+        "token": "",
+        "title": "",
+        "thumb": ""
+      },
+      "__index": 4,
+      "id": "cracker"
+    },
+    {
+      "type": "croissant",
+      "title": "",
+      "description": "wow just wow",
+      "color": "red",
+      "video": {
+        "url": "",
+        "type": "",
+        "token": "",
+        "title": "",
+        "thumb": ""
+      },
+      "__index": 3,
+      "id": "croissant"
     }
   ],
   "page": [
     {
       "title": "About Us",
       "body": "Just a small bakery",
-      "id": "about"
+      "id": "about",
+      "__index": 1
     },
     {
-      "title": "contact",
+      "title": "ok...",
       "body": "2406 Old Rd, San Juan Bautista",
-      "id": "contact"
+      "id": "contact",
+      "__index": 0
     }
   ]
 }
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 5b7e5a133e5326a98b974b7e9e390ac393d1a05e Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Mon, 13 Apr 2015 13:42:11 -0400
Subject: Client friendly error handling

---
 app/index.js                          |  64 ++++++++++++++--
 app/node_modules/okadminview/index.js | 125 ++++++++++++++------------------
 app/node_modules/okserver/index.js    |   7 ++
 app/node_modules/okview/index.js      | 133 +++++++++++++++-------------------
 examples/index.js                     |   2 +
 themes/okadmin/templates/404.liquid   |  54 ++++++++++++++
 themes/okadmin/templates/5xx.liquid   |  54 ++++++++++++++
 7 files changed, 289 insertions(+), 150 deletions(-)
 create mode 100644 themes/okadmin/templates/404.liquid
 create mode 100644 themes/okadmin/templates/5xx.liquid

(limited to 'examples')

diff --git a/app/index.js b/app/index.js
index 719c424..419adfc 100644
--- a/app/index.js
+++ b/app/index.js
@@ -36,6 +36,7 @@ function OKCMS(options) {
   var templateRoot = options.templateRoot || 'templates';
   var adminTemplateRoot = options.templateRoot ||
     path.join(__dirname, '../themes/okadmin/templates');
+  var debug = options.debug || false;
 
   // Set metadata defaults
   // TODO Abstract this out somewhere else
@@ -84,13 +85,17 @@ function OKCMS(options) {
   });
   var resourceCache = this._resourceCache =
       this._createResources(resourceConfig, db, schemas);
+  var errorHandler = createErrorHandlerProducer(
+      templateProvider, adminTemplateProvider, debug);
 
   // Create view instances from config
   var views = this._views =
-      this._createViews(viewConfig, db, meta, resourceCache, templateProvider);
+      this._createViews(viewConfig, db, meta, resourceCache, templateProvider,
+          errorHandler);
   var adminViews = this._adminViews =
       this._createAdminViews(adminPath, app, express, resourceConfig,
-          resourceCache, adminTemplateProvider, adminMeta);
+          resourceCache, adminTemplateProvider, adminMeta,
+          errorHandler);
 
   // Create services
   var imageService = OKImageService({
@@ -109,7 +114,8 @@ function OKCMS(options) {
     adminPath: adminPath,
     services: {
       image: imageService
-    }
+    },
+    errorHandler: errorHandler
   });
 }
 
@@ -152,7 +158,7 @@ OKCMS.prototype._createResources = function(resourceConfig, db, schemaCache) {
 };
 
 OKCMS.prototype._createViews = function(viewConfig, db,
-    meta, resourceCache, templateProvider) {
+    meta, resourceCache, templateProvider, errorHandler) {
   viewConfig = viewConfig || {};
   var self = this;
   var createQueries = this._createQueries.bind(this);
@@ -171,7 +177,8 @@ OKCMS.prototype._createViews = function(viewConfig, db,
       route: route,
       template: template,
       queries: queries,
-      meta: meta
+      meta: meta,
+      errorHandler: errorHandler
     });
     return cache;
   }, {});
@@ -193,7 +200,8 @@ OKCMS.prototype._createViews = function(viewConfig, db,
 };
 
 OKCMS.prototype._createAdminViews = function(path, app, express,
-  resourceConfig, resourceCache, templateProvider, meta) {
+  resourceConfig, resourceCache, templateProvider, meta,
+  errorHandler) {
   var views = {};
   var withTrail = withTrailingSlash(path);
   var withoutTrail = withoutTrailingSlash(path);
@@ -217,7 +225,8 @@ OKCMS.prototype._createAdminViews = function(path, app, express,
     resourceConfig: resourceConfig,
     resourceCache: resourceCache,
     templateProvider: templateProvider,
-    meta: meta
+    meta: meta,
+    errorHandler: errorHandler
   });
   return views;
 };
@@ -269,6 +278,47 @@ ResourceCache.prototype.get = function(type, id) {
   }
 };
 
+/**
+ * Higher order function implementing customizable error handling
+ */
+function createErrorHandlerProducer(templateProvider, adminTemplateProvider, debugMode) {
+
+  var template404 = templateProvider.getTemplate('404') ||
+      adminTemplateProvider.getTemplate('404');
+  var template5xx = templateProvider.getTemplate('5xx') ||
+      adminTemplateProvider.getTemplate('5xx');
+
+  if (!template404 || !template5xx)
+    throw new Error('No error templates provided by admin theme or user')
+
+  return debugMode ? createDebugHandler : createErrorHandler;
+
+  function createErrorHandler(req, res, status) {
+    return function handleError(err) {
+      switch (status) {
+        case 404:
+          template404.render().then(function(rendered) {
+            res.status(status);
+            res.send(rendered);
+          });
+          break;
+        default:
+          template5xx.render().then(function(rendered) {
+            res.status(status);
+            res.send(rendered);
+          });
+      }
+
+    };
+  }
+
+  function createDebugHandler(req, res, status) {
+    return function handleError(err) {
+      res.send(err.stack);
+    };
+  }
+}
+
 module.exports = {
 
   createApp: function(options) {
diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index 2f31e1e..648487c 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -37,6 +37,8 @@ function OKAdminView(options) {
     throw new Error('No templateProvider provided to OKAdminView');
   if (!options.meta)
     throw new Error('No meta query provided to OKAdminView');
+  if (!options.errorHandler)
+    throw new Error('No error handler provided to OKAdminView');
 
   var app = options.app;
   var express = options.express;
@@ -44,6 +46,7 @@ function OKAdminView(options) {
   var resourceCache = this._resourceCache = options.resourceCache;
   var resourceConfig = this._resourceConfig = cloneDeep(options.resourceConfig);
   var provider = options.templateProvider;
+  var error = this._error = options.errorHandler;
 
   // Load templates
   var templates = this._templates =
@@ -112,12 +115,10 @@ function OKAdminView(options) {
       }
     }));
 
-    var auth = passport.authenticate('digest', {session: false});
-
     // This should really be mounted on the router, but can't be due to
     // https://github.com/jaredhanson/passport-http/pull/16
     app.use('/admin/', passport.initialize());
-    app.all('/admin/:path*', auth);
+    app.all('/admin/:path*', passport.authenticate('digest', {session: false}));
 
     router.get('/', function readIndex(req, res, next) {
       fetchIndexTemplateData(meta, indexQueries).then(function(data) {
@@ -125,22 +126,22 @@ function OKAdminView(options) {
           success: req.flash('success'),
           errors: req.flash('errors')
         }));
-      }).fail(errorHandler(req, res));
+      }).fail(error(req, res, 500));
     });
 
     router.get('/:type/new/', function createResourceView(req, res, next) {
       var type = req.params.type || '';
       var resource = resourceCache.get(type);
       if (!resource) {
-        errorHandler(req, res)(new Error('No such resource ' + type));
+        error(req, res, 404)(new Error('No such resource ' + type));
       } else {
         meta.get().then(function(metadata) {
-          var templateData = getResourceTemplateData(metadata, resource, {});
+          var templateData = transformData(metadata, resource, {});
           view.renderResourceNew(req, res, assign(templateData, {
             success: req.flash('success'),
             errors: req.flash('errors'),
           }));
-        }).fail(errorHandler(req, res));
+        }).fail(error(req, res, 500));
       }
     });
 
@@ -148,26 +149,27 @@ function OKAdminView(options) {
       var type = req.params.type || '';
       var id = req.params.id || '';
       var resource = resourceCache.get(type, id);
-      if (!resource) {
-        errorHandler(req, res)(new Error('No such resource'));
-      } else {
-        var query = OKQuery({
-          resource: resource,
-          query: id
-        });
-        fetchResourceTemplateData(meta, query, getResourceTemplateData)
-            .then(function(data) {
-              if (!data) {
-                resourceMissingHandler(req, res)()
-              } else {
-                view.renderResource(req, res, assign(data, {
-                  success: req.flash('success'),
-                  errors: req.flash('errors')
-                }));
-              }
-            }).fail(errorHandler(req, res));
-      }
-
+      var query = OKQuery({
+        resource: resource,
+        query: id
+      });
+      fetchResourceTemplateData(meta, query, transformData)
+          .then(function(data) {
+            if (!data) {
+              resourceMissingHandler(req, res)()
+            } else {
+              view.renderResource(req, res, assign(data, {
+                success: req.flash('success'),
+                errors: req.flash('errors')
+              }));
+            }
+          }).fail(function(err) {
+            if (err.message === 'No resource data') {
+              error(req, res, 404)(new Error('No such resource'));
+            } else {
+              error(req, res, 500)(err);
+            }
+          });
     });
 
     router.post('/:type/', function createResource(req, res, next) {
@@ -175,7 +177,7 @@ function OKAdminView(options) {
       var resource = resourceCache.get(type);
       var data = req.body;
       if (!resource) {
-        errorHandler(req, res)(new Error('No such resource ' + type));
+        error(req, res, 400)(new Error('No such resource ' + type));
       } else {
         meta.get().then(function(metadata) {
           try {
@@ -183,12 +185,12 @@ function OKAdminView(options) {
             resource.create(data).then(function(created) {
               req.flash('success', {action: 'create'});
               res.redirect(303, resource.getID(data));
-            }).fail(errorHandler(req, res));
+            }).fail(error(req, res, 500));
           } catch (errors) {
-            var templateData = getResourceTemplateData(metadata, resource, data);
+            var templateData = transformData(metadata, resource, data);
             view.renderResource(req, res, assign(templateData, {errors: errors}));
           }
-        }).fail(errorHandler(req, res));;
+        }).fail(error(req, res, 500));;
       }
     });
 
@@ -198,11 +200,9 @@ function OKAdminView(options) {
       var resourcesJSON = body[type];
       var resource = resourceCache.get(type);
       if (!resourcesJSON || !resourcesJSON.length) {
-        res.status(400);
-        errorHandler(req, res)(new Error('Bad request'));
+        error(req, res, 400)(new Error('Bad request'));
       } else if (!resource) {
-        res.status(404);
-        errorHandler(req, res)(new Error('No such resource'));
+        error(req, res, 404)(new Error('No such resource'));
       } else {
         try {
           var ids = [];
@@ -212,7 +212,7 @@ function OKAdminView(options) {
             return data;
           });
         } catch (e) {
-           errorHandler(req, res)(new Error('Resource batch contains invalid JSON'));
+           error(req, res, 500)(new Error('Resource batch contains invalid JSON'));
            return;
         }
         Q.all([
@@ -222,7 +222,7 @@ function OKAdminView(options) {
           var metadata = results.shift();
           req.flash('success', {action: 'batch_update'});
           res.redirect(303, '../..');
-        }).fail(errorHandler(req, res));
+        }).fail(error(req, res, 500));
       }
     });
 
@@ -232,7 +232,7 @@ function OKAdminView(options) {
       var data = req.body;
       var resource = resourceCache.get(type, id);
       if (!resource) {
-        errorHandler(req, res)(new Error('No such resource ' + type));
+        error(req, res, 400)(new Error('No such resource ' + type));
       } else {
         // TODO Prob should make metadata synchronous...
         meta.get().then(function(metadata) {
@@ -241,12 +241,12 @@ function OKAdminView(options) {
             resource.update(id, data).then(function(updated) {
               req.flash('success', {action: 'update'});
               res.redirect(303, '../' + resource.getID(updated));
-            }).fail(errorHandler(req, res));
+            }).fail(error(req, res, 500));
           } catch (errors) {
-            var templateData = getResourceTemplateData(metadata, resource, data);
+            var templateData = transformData(metadata, resource, data);
             view.renderResource(req, res, assign(templateData, {errors: errors}));
           }
-        }).fail(errorHandler(req, res));
+        }).fail(error(req, res, 500));
       }
     });
 
@@ -255,14 +255,14 @@ function OKAdminView(options) {
       var id = req.params.id;
       var resource = resourceCache.get(type, id);
       if (!resource) {
-        errorHandler(req, res)(new Error('No such resource ' + type));
+        error(req, res, 500)(new Error('No such resource ' + type));
       } else {
         meta.get().then(function(metadata) {
           resource.destroy(id).then(function() {
             req.flash('success', {action: 'delete'});
             res.redirect(303, '../..');
-          }).fail(errorHandler(req, res));
-        }).fail(errorHandler(req, res));
+          }).fail(error(req, res, 500));
+        }).fail(error(req, res, 500));
       }
     });
 
@@ -271,9 +271,9 @@ function OKAdminView(options) {
 }
 
 /**
- * Get template data for a single resource
+ * Yields formatted template data for a single resource
  */
-function getResourceTemplateData(meta, resource, data) {
+function transformData(meta, resource, data) {
   meta = meta || {};
   resource = resource || {};
   data = data || {};
@@ -306,21 +306,21 @@ OKAdminView.prototype.renderIndex = function(req, res, data) {
   data = data || {};
   this._templates['index'].render(data).then(function(rendered) {
     res.send(rendered);
-  }).fail(errorHandler(req, res));
+  }).fail(this._error(req, res, 500));
 };
 
 OKAdminView.prototype.renderResource = function(req, res, data) {
   data = data || {};
   this._templates['resource'].render(data).then(function(rendered) {
     res.send(rendered);
-  }).fail(errorHandler(req, res));
+  }).fail(this._error(req, res, 500));
 };
 
 OKAdminView.prototype.renderResourceNew = function(req, res, data) {
   data = data || {meta: {}, resource: {}};
   this._templates['resource_new'].render(data).then(function(rendered) {
     res.send(rendered);
-  }).fail(errorHandler(req, res));
+  }).fail(this._error(req, res, 500));
 };
 
 /**
@@ -378,30 +378,15 @@ function fetchResourceTemplateData(meta, query, fn) {
   return Q.promise(function(resolve, reject) {
     meta.get().then(function(metadata) {
       query.get().then(function(data) {
-        var resource = query.resource;
-        resolve(fn(metadata, resource, data));
+        if (!data) {
+          reject(new Error('No resource data'));
+        } else {
+          var resource = query.resource;
+          resolve(fn(metadata, resource, data));
+        }
       }).fail(reject);
     }).fail(reject)
   });
 }
 
-/**
- * TODO Real error handling
- */
-function errorHandler(req, res) {
-  return function(err) {
-    res.send(err.stack);
-  };
-}
-
-/**
- * TODO Real 404 handling
- */
-function resourceMissingHandler(req, res) {
-  return function() {
-    res.status(404);
-    res.send('404');
-  }
-}
-
 module.exports = OKAdminView;
diff --git a/app/node_modules/okserver/index.js b/app/node_modules/okserver/index.js
index cf06b3c..abca8b5 100644
--- a/app/node_modules/okserver/index.js
+++ b/app/node_modules/okserver/index.js
@@ -16,6 +16,8 @@ function OKServer(options) {
     throw new Error('No admin root directory provided to OKServer');
   if (!options.adminPath)
     throw new Error('No admin path provided to OKServer');
+  if (!options.errorHandler)
+    throw new Error('No error handler provided to OKServer');
   var root = options.root;
   var adminRoot = options.adminRoot;
   var adminPath = options.adminPath;
@@ -25,6 +27,7 @@ function OKServer(options) {
   var router = express.Router({
     strict: app.get('strict routing')
   });
+  var error = options.errorHandler;
   var services = options.services || {};
   Object.keys(views)
     // Sort such that more general routes are matched last
@@ -67,6 +70,10 @@ function OKServer(options) {
   // Make sure this lady is last. Checks whether the desired
   // route has a trailing-slash counterpart and redirects there
   app.use(slash());
+  // Otherwise it's a 404
+  app.use(function(req, res) {
+    error(req, res, 404)(new Error('No matching route'));
+  });
 }
 
 OKServer.prototype.listen = function listen(port) {
diff --git a/app/node_modules/okview/index.js b/app/node_modules/okview/index.js
index 2d1c0a0..63f22b5 100644
--- a/app/node_modules/okview/index.js
+++ b/app/node_modules/okview/index.js
@@ -24,8 +24,11 @@ function OKView(options) {
     throw new Error('No meta resource provided to OKView');
   if (!options.route)
     throw new Error('No route provided to OKView');
+  if (!options.errorHandler)
+    throw new Error('No error handler provided to OKView');
   var route = options.route;
   var mount = options.mount || 'get';
+  var error = this._error = options.errorHandler;
   this._template = options.template;
   var meta = this._meta = options.meta;
   var queries = this._queries = options.queries || [];
@@ -47,16 +50,9 @@ function OKView(options) {
     enumerable: true
   });
 
-  this._middleware = createMiddleware(this);
-  this._fetchTemplateData = unbound ? fetchUnbound : fetchBound;
-
-  function fetchUnbound(id) {
-    return fetchTemplateData(meta, queries, id)
-  }
-
-  function fetchBound() {
-    return fetchTemplateData(meta, queries);
-  }
+  this._middleware = unbound
+      ? unboundMiddleware(this, meta, queries, error)
+      : boundMiddleware(this, meta, queries, error);
 }
 
 OKView.prototype.middleware = function() {
@@ -66,39 +62,20 @@ OKView.prototype.middleware = function() {
 OKView.prototype.render = function(req, res, data) {
   this._template.render(data).then(function(html) {
     res.send(html);
-  }).fail(errorHandler(req, res, data));
-};
-
-OKView.prototype.fetchTemplateData = function() {
-  return this._fetchTemplateData.apply(this, arguments);
+  }).fail(this._error(req, res, 500));
 };
 
-/**
- * Unbound views need different middleware to resolve requests
- */
-function createMiddleware(view) {
-  if (view.unbound) {
-    return unboundMiddleware(view);
-  } else {
-    return boundMiddleware(view);
-  }
-}
-
-// Note that these middleware do not call next
-// and should thus always be added at the end of the
-// middleware chain.
-
 /**
  * Creates middleware for a view which does not
  * yet have a resource id associated with it
  */
-function unboundMiddleware(view) {
+function unboundMiddleware(view, meta, queries, error) {
   var paramName = getParamName(view.route);
   return function(req, res, next) {
     var id = req.params[paramName];
-    view.fetchTemplateData(id).then(function(data) {
+    fetchTemplateData(meta, queries, id).then(function(data) {
       view.render(req, res, data);
-    }).fail(errorHandler(req, res, next));
+    }).fail(failHandler(req, res, error));
   };
 }
 
@@ -106,20 +83,22 @@ function unboundMiddleware(view) {
  * Creates middleware for a view which already
  * has a resource id associated with it
  */
-function boundMiddleware(view) {
+function boundMiddleware(view, meta, queries, error) {
   return function(req, res, next) {
-    view.fetchTemplateData().then(function(data) {
+   fetchTemplateData(meta, queries).then(function(data) {
       view.render(req, res, data);
-    }).fail(errorHandler(req, res, next));
+    }).fail(failHandler(req, res, error));
   };
 }
 
-/**
- * TODO BS error handling for now
- */
-function errorHandler(req, res, next) {
-  return function(err) {
-    res.send(err.stack);
+function failHandler(req, res, error) {
+  return function (err) {
+    // TODO Use custom exception type
+    if (err.message === 'No resource found') {
+      error(req, res, 404)(err);
+    } else {
+      error(req, res, 500)(err);
+    }
   }
 }
 
@@ -138,9 +117,12 @@ function getParamName(route) {
  * and returns a promise for an object merging all queried
  * data, pluralizing keys where necessary.
  *
- * Lil bit convoluted, sorry.
+ * Pretty convoluted, sorry.
  */
 function fetchTemplateData(meta, queries, id) {
+  // If there's only one query, we assume it is for a single
+  // resource and will resolve errors if no data is found
+  var single = queries && queries.length === 1;
   return Q.promise(function(resolve, reject) {
     return Q.all(
       [meta.get()].concat(queries.map(function(query) {
@@ -148,39 +130,44 @@ function fetchTemplateData(meta, queries, id) {
       })))
     .then(function(results) {
       var metadata = results.shift();
-      var normalized = results.reduce(function(cache, result, i) {
-        // Could be just some rogue request
-        if (!result) {
-          return cache;
-        }
-        var resource = queries[i].resource;
-        var type = queries[i].type;
-        var manyResult = isarray(result);
-        // Inform template of ID in generic field
-        if (manyResult) {
-          result = result.map(function(data) {
-            return assign({}, data, {id: resource.getID(data)})
-          });
-        } else {
-          result = assign({}, result, {id: resource.getID(result)});
-        }
-        // If we have a lot of results for a certain type,
-        // we pluralize the key and yield an array of results
-        if (cache[type] || manyResult) {
-          var plural = pluralize(type);
-          delete cache[type];
-          cache[plural] = [];
+      if (single && !results[0]) {
+        reject(new Error('No resource found'));
+      } else {
+        var normalized = results.reduce(function(cache, result, i) {
+          // Could be just some rogue request
+          if (!result) {
+            return cache;
+          }
+          var resource = queries[i].resource;
+          var type = queries[i].type;
+          var manyResult = isarray(result);
+          // Inform template of ID in generic field
           if (manyResult) {
-            cache[plural] = cache[plural].concat(result);
+            result = result.map(function(data) {
+              return assign({}, data, {id: resource.getID(data)})
+            });
+          } else {
+            result = assign({}, result, {id: resource.getID(result)});
+          }
+          // If we have a lot of results for a certain type,
+          // we pluralize the key and yield an array of results
+          if (cache[type] || manyResult) {
+            var plural = pluralize(type);
+            delete cache[type];
+            cache[plural] = [];
+            if (manyResult) {
+              cache[plural] = cache[plural].concat(result);
+            } else {
+              cache[plural].push(result);
+            }
           } else {
-            cache[plural].push(result);
+            cache[type] = result;
           }
-        } else {
-          cache[type] = result;
-        }
-        return cache;
-      }, {meta: metadata});
-      resolve(normalized);
+          return cache;
+        }, {meta: metadata});
+
+        resolve(normalized);
+      }
     }).fail(reject);
   });
 }
diff --git a/examples/index.js b/examples/index.js
index 95d2bcf..3e9f509 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -4,6 +4,8 @@ var app  = okcms.createApp({
 
   root: 'public',
 
+  debug: false,
+
   schemas: {
     page: {
       id: {type: 'string'},
diff --git a/themes/okadmin/templates/404.liquid b/themes/okadmin/templates/404.liquid
new file mode 100644
index 0000000..87f5342
--- /dev/null
+++ b/themes/okadmin/templates/404.liquid
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>404</title>
+    <style type="text/css">
+      html, body {
+        margin: 0;
+        padding: 0;
+        font-family: "Helvetica", sans-serif;
+        background-image: url('http://okfoc.us/assets/images/photocopy.png');
+        background-position: bottom center;
+        background-repeat: repeat;
+        background-attachment: scroll;
+        height: 100%;
+        font-size: 1.75em;
+        font-weight: bold;
+        color: #FFFFFF;
+      }
+
+      a {
+        color: #8888FF;
+        text-decoration: none;
+      }
+
+      a:hover {
+        border-bottom: 3px solid #8888FF;
+      }
+
+      a:visited {
+        color: #8888FF;
+      }
+
+      .message {
+        width: 700px;
+        padding: 1em 1em 1em 1em;
+        background-color: #0000FF;
+        margin: 0 auto;
+        margin-top: 1em;
+      }
+
+      .message p:first-child {
+        margin-top: 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="message">
+      <p>¯\_(ツ)_/¯</p>
+      <p>We couldn't find that page.</p>
+      <p>Sure you have the right URL?</p>
+      <a href="javascript:history.back()">Back</a>
+    </div>
+  </body>
+</html>
diff --git a/themes/okadmin/templates/5xx.liquid b/themes/okadmin/templates/5xx.liquid
new file mode 100644
index 0000000..f245545
--- /dev/null
+++ b/themes/okadmin/templates/5xx.liquid
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>404</title>
+    <style type="text/css">
+      html, body {
+        margin: 0;
+        padding: 0;
+        font-family: "Helvetica", sans-serif;
+        background-image: url('http://okfoc.us/assets/images/photocopy.png');
+        background-position: bottom center;
+        background-repeat: repeat;
+        background-attachment: scroll;
+        height: 100%;
+        font-size: 1.75em;
+        font-weight: bold;
+        color: #FFFFFF;
+      }
+
+      a {
+        color: #8888FF;
+        text-decoration: none;
+      }
+
+      a:hover {
+        border-bottom: 3px solid #8888FF;
+      }
+
+      a:visited {
+        color: #8888FF;
+      }
+
+      .message {
+        width: 700px;
+        padding: 0 1em 1em 1em;
+        background-color: #0000FF;
+        margin: 0 auto;
+        margin-top: 1em;
+      }
+
+      .message p:first-child {
+        margin-top: 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="message">
+      <p>(；一_一)</p>
+      <p>Looks like we experienced an error.</p>
+      <p>Sorry about that. Maybe try again later.</p>
+      <a href="javascript:history.back()">Back</a>
+    </div>
+  </body>
+</html>
-- 
cgit v1.2.3-70-g09d2


From 8898bbe48285c7f9f11760ef420cca43d683d5e0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 28 Mar 2016 13:59:50 -0400
Subject: modify links field to specify text and uri

---
 app/index.js                                    |  1 +
 app/node_modules/okdb/index.js                  |  2 +-
 app/node_modules/okschema/index.js              | 17 +++++++-
 examples/db.json                                |  9 +++-
 examples/index.js                               |  5 ++-
 package.json                                    |  2 +-
 themes/okadmin/public/css/main.css              |  8 ++++
 themes/okadmin/public/js/app.js                 | 34 ++++++---------
 themes/okadmin/templates/partials/inputs.liquid | 56 +++++++++++++++++++------
 9 files changed, 93 insertions(+), 41 deletions(-)

(limited to 'examples')

diff --git a/app/index.js b/app/index.js
index 6a1c74f..06b1591 100644
--- a/app/index.js
+++ b/app/index.js
@@ -28,6 +28,7 @@ function OKCMS(options) {
 
   var app = express();
   app.enable('strict routing');
+  app.disable('x-powered-by');
 
   var root = this._root = options.root || 'public';
   var adminConfig = options.admin || {};
diff --git a/app/node_modules/okdb/index.js b/app/node_modules/okdb/index.js
index 4820c8c..ad8d9a7 100644
--- a/app/node_modules/okdb/index.js
+++ b/app/node_modules/okdb/index.js
@@ -97,7 +97,7 @@ FSDB.prototype.update = function(collection, id, data) {
   }
 
   var result = chain.assign(cloneDeep(data)).value();
-  if (result ) {
+  if (result) {
     return resolve(cloneDeep(result));
   } else {
     return resolve(null, new Error('Problem updating document'));
diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index 330ad6b..82aa13f 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -63,8 +63,21 @@ var types = {
     assertValid: function(spec, value) {}
   },
   'tag-list': {
-    parent: 'string',
-    assertValid: function(spec, value) {}
+    parent: [{
+      uri: { type: 'string' },
+      text: { type: 'string' }
+    }],
+    assertValid: function(spec, value) {
+      var message;
+      var actual;
+      if (!value || !value.length) {
+        throw [{
+          message: 'Not an array',
+          expected: JSON.stringify(this.parent),
+          actual: value
+        }];
+      }
+    }
   },
   'date': {
     parent: 'string',
diff --git a/examples/db.json b/examples/db.json
index 20d4510..4319237 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -99,7 +99,14 @@
       "title": "About Us",
       "body": "Just a small bakery",
       "id": "about",
-      "__index": 1
+      "__index": "1",
+      "links": [
+        {
+          "text": "asdf2",
+          "uri": "asdf"
+        }
+      ],
+      "dateCreated": ""
     },
     {
       "title": "ok...",
diff --git a/examples/index.js b/examples/index.js
index 3e9f509..bf51dfc 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -10,7 +10,8 @@ var app  = okcms.createApp({
     page: {
       id: {type: 'string'},
       title: {type: 'string'},
-      body: {type: 'text'}
+      body: {type: 'text'},
+      links: {type: 'link-list'},
     },
     bread: {
       type: {type: 'string', id: true},
@@ -19,7 +20,7 @@ var app  = okcms.createApp({
       color: {type: 'enum', options: ["red","blue","green"]},
       video: {type: 'video'},
       images: {type: 'captioned-image-list'}
-    }
+    },
   },
 
   resources: [
diff --git a/package.json b/package.json
index 192685c..faf3cc9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index a5fbdeb..9289fdf 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -305,6 +305,14 @@ button, input[type=submit] {
 .main.resource form .video-element input[type=text] {
   width: 15em;
 }
+.main.resource form .group input[type=text].link-input,
+.main.resource form .group input[type=text].link-input-new {
+  width: 13.05em;
+  padding: 0 0 0 0.5em;
+}
+.main.resource form .links li {
+  height: auto;
+}
 .main .link-list .add-link-btn,
 .main .link-list .remove-link-btn {
   margin: 0;
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index edf9980..17b35d0 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -120,35 +120,25 @@ var OKAdmin = function(){
     e.stopPropagation()
     var $delegate = $(e.delegateTarget)
     var $list = $delegate.find('.links')
-    var length = $list.find('input').length
-    var name = $delegate.parent('.property').data('name')
-    var $new = $delegate.find('.link-input-new')
-    var input = document.createElement('input')
-    var delBtn = document.createElement('button')
-    var inputName = name + '[' + length + ']'
-    $(input).attr({
-      name: inputName,
-      type: 'text',
-      value: $new.val()
-    })
-    $list.append(input)
-    $(delBtn).addClass('remove-link-btn')
-    $(delBtn).data('for', inputName)
-    delBtn.innerHTML = '-'
-    $list.append(delBtn)
-    $new.val('')
+    var $linkText = $delegate.find(".link-input-new.link-text")
+    var $linkURI = $delegate.find(".link-input-new.link-uri")
+    
+    var template = $delegate.find(".link-template").html()
+    var $el = $(template)
+    $el.find(".link-text").val( $linkText.val() )
+    $el.find(".link-uri").val( $linkURI.val() )
+    $list.append($el)
+    console.log($list, template)
+    $linkText.val("")
+    $linkURI.val("")
   })
 
   // Remove a link from the list
   $('.link-list').on('click', '.remove-link-btn', function(e) {
     e.preventDefault()
     e.stopPropagation()
-    var $delegate = $(e.delegateTarget)
     var $target = $(e.target)
-    var inputName = $target.data('for')
-    var $input = $delegate.find('[name="' + inputName + '"]')
-    $input.remove()
-    $target.remove()
+    $target.closest("li").remove()
   })
 
   // fix post indexing in list-driven inputs
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index c6efc68..55d5fb8 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -79,26 +79,58 @@
                value="{{spec.value}}"
                placeholder="Enter a comma separated list of tags.">
       </div>
-    {% elsif type == 'link-list' %}
 
+    {% elsif type == 'link-list' %}
       <div class="link-list group">
         <div class="links">
-          {% for url in spec.value %}
-            <input
-                name="{{name}}[{{forloop.index0}}]"
-                value="{{url}}"
-                type="text"
-                class="link-input">
-            <button class="remove-link-btn"
-                    data-for="{{name}}[{{forloop.index0}}]">
-              -
-            </button>
+          {% for link in spec.value %}
+            <li>
+              <input
+                  name="{{name}}[][text]"
+                  value="{{link.text}}"
+                  type="text"
+                  placeholder="Link text"
+                  class="link-input link-text">
+              <input
+                  name="{{name}}[][uri]"
+                  value="{{link.uri}}"
+                  type="text"
+                  placeholder="URL"
+                  class="link-input link-uri">
+              <button class="remove-link-btn">
+                -
+              </button>
+            </li>
           {% endfor %}
         </div>
         <input type="text"
-               class="link-input-new"
+               class="link-input-new link-text"
+               placeholder="Link text">
+        <input type="text"
+               class="link-input-new link-uri"
                placeholder="http://www.example.com">
         <button class="add-link-btn">+</button>
+
+        <script type="text/html" class="link-template">
+          <li>
+            <input
+                name="{{name}}[][text]"
+                value=""
+                type="text"
+                placeholder="Link text"
+                class="link-input link-text">
+            <input
+                name="{{name}}[][uri]"
+                value=""
+                type="text"
+                placeholder="URL"
+                class="link-input link-uri">
+            <button class="remove-link-btn">
+              -
+            </button>
+          </li>
+        </script>
+
       </div>
 
     {% elsif type == 'media-list' %}
-- 
cgit v1.2.3-70-g09d2


From ea9a94f3e1f980153588da1aee3fc7e456e292b5 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 28 Mar 2016 14:39:44 -0400
Subject: okschema: replace array-type data with empty list if unspecified (due
 to constraint of querystring body-parser)

---
 app/node_modules/okschema/index.js | 74 ++++++++++++++++++++++++++------------
 examples/db.json                   | 23 ++++++++----
 2 files changed, 68 insertions(+), 29 deletions(-)

(limited to 'examples')

diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index 82aa13f..cf041fb 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -41,43 +41,25 @@ var types = {
     }
   },
   'captioned-image-list': {
+    isArray: true,
     parent: [{
       uri: { type: 'string' }, // TODO Implement URI type
       caption: { type: 'string' }
     }],
-    assertValid: function(spec, value) {
-      var message;
-      var actual;
-      if (!value || !value.length) {
-        throw [{
-          message: 'Not an array',
-          expected: JSON.stringify(this.parent),
-          actual: value
-        }];
-      }
-    }
+    assertValid: function(spec, value) {}
   },
   // Special type for resource meta information
   'meta': {
     parent: 'string',
     assertValid: function(spec, value) {}
   },
-  'tag-list': {
+  'link-list': {
+    isArray: true,
     parent: [{
       uri: { type: 'string' },
       text: { type: 'string' }
     }],
-    assertValid: function(spec, value) {
-      var message;
-      var actual;
-      if (!value || !value.length) {
-        throw [{
-          message: 'Not an array',
-          expected: JSON.stringify(this.parent),
-          actual: value
-        }];
-      }
-    }
+    assertValid: function(spec, value) {}
   },
   'date': {
     parent: 'string',
@@ -90,8 +72,38 @@ var types = {
   'foreign-key': {
     parent: 'enum',
     assertValid: function(spec, value) {}
+  },
+  'media-list': {
+    isArray: true,
+    parent: [],
+    assertValid: function(spec, value) {}
+  },
+  'double-captioned-image-list': {
+    isArray: true,
+    parent: [],
+    assertValid: function(spec, value) {}
+  },
+  'triple-captioned-image-list': {
+    isArray: true,
+    parent: [],
+    assertValid: function(spec, value) {}
+  },
+}
+
+/*
+function checkArrayLength (spec, value) {
+  var message;
+  var actual;
+  if (!value || !value.length) {
+    throw [{
+      message: 'Not an array',
+      expected: JSON.stringify(this.parent),
+      actual: value
+    }];
   }
 }
+*/
+
 
 /**
  * OKSchema!
@@ -162,9 +174,25 @@ function OKSchema(spec) {
   });
 }
 
+OKSchema.prototype.checkDataForMissingArrays = function(data) {
+  data = data || {};
+  var spec = this.spec;
+
+  // The qs body-parser module does not have a way to represent
+  // empty lists.  If you delete all elements from a list,
+  // check against the spec so we know to replace with an empty list.
+  Object.keys(spec).forEach(function(prop){
+    var type = spec[prop].type;
+    if (types[type] && types[type].isArray && ! data[prop]) {
+      data[prop] = []
+    }
+  })
+}
+
 OKSchema.prototype.assertValid = function(data) {
   data = data || {};
   var spec = this.spec;
+  this.checkDataForMissingArrays(data)
   // Run through custom validators, they'll throw if invalid
   Object.keys(data).forEach(function(prop) {
     var type = spec[prop].type;
diff --git a/examples/db.json b/examples/db.json
index 4319237..5e10d60 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -92,6 +92,22 @@
       },
       "__index": 3,
       "id": "croissant"
+    },
+    {
+      "type": "Test",
+      "title": "Testing",
+      "description": "",
+      "color": "red",
+      "video": {
+        "url": "",
+        "type": "",
+        "token": "",
+        "title": "",
+        "thumb": ""
+      },
+      "__index": "5",
+      "dateCreated": "Mon, 28 Mar 2016 18:49:32 GMT",
+      "images": []
     }
   ],
   "page": [
@@ -100,12 +116,7 @@
       "body": "Just a small bakery",
       "id": "about",
       "__index": "1",
-      "links": [
-        {
-          "text": "asdf2",
-          "uri": "asdf"
-        }
-      ],
+      "links": [],
       "dateCreated": ""
     },
     {
-- 
cgit v1.2.3-70-g09d2


From 49fe25c8e884c14ab3258d22240a62f0b57da490 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 28 Mar 2016 16:15:46 -0400
Subject: make links sortable

---
 examples/db.json                                | 33 ++++++++++++-------------
 themes/okadmin/public/css/main.css              |  9 ++++++-
 themes/okadmin/public/js/app.js                 | 19 ++++++++++----
 themes/okadmin/templates/partials/inputs.liquid | 19 ++++++++------
 4 files changed, 49 insertions(+), 31 deletions(-)

(limited to 'examples')

diff --git a/examples/db.json b/examples/db.json
index 5e10d60..9ab7233 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -92,22 +92,6 @@
       },
       "__index": 3,
       "id": "croissant"
-    },
-    {
-      "type": "Test",
-      "title": "Testing",
-      "description": "",
-      "color": "red",
-      "video": {
-        "url": "",
-        "type": "",
-        "token": "",
-        "title": "",
-        "thumb": ""
-      },
-      "__index": "5",
-      "dateCreated": "Mon, 28 Mar 2016 18:49:32 GMT",
-      "images": []
     }
   ],
   "page": [
@@ -123,7 +107,22 @@
       "title": "ok...",
       "body": "2406 Old Rd, San Juan Bautista",
       "id": "contact",
-      "__index": 0
+      "__index": "0",
+      "links": [
+        {
+          "text": "US Bread Board",
+          "uri": "http://bread.com/"
+        },
+        {
+          "text": "National Council on Grain",
+          "uri": "http://grain.org/"
+        },
+        {
+          "text": "USDA",
+          "uri": "http://usda.gov/"
+        }
+      ],
+      "dateCreated": ""
     }
   ]
 }
\ No newline at end of file
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 9289fdf..df0ca43 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -310,8 +310,15 @@ button, input[type=submit] {
   width: 13.05em;
   padding: 0 0 0 0.5em;
 }
+.handle {
+  display: block;
+  width: 1em;
+  height: 2em;
+  background: #ddd;
+  float: left;
+}
 .main.resource form .links li {
-  height: auto;
+  height: 2em;
 }
 .main .link-list .add-link-btn,
 .main .link-list .remove-link-btn {
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 17b35d0..da398eb 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -91,7 +91,7 @@ var OKAdmin = function(){
   })
 
   // make the region sortable with drag-and-drop
-  $(".media-list ol, .image-list ol").sortable()
+  $(".media-list ol, .image-list ol, .link-list .links").sortable()
   $(".media-list ol, .image-list ol").disableSelection()
 
   // populate a video field with info from our url parser
@@ -115,20 +115,22 @@ var OKAdmin = function(){
   }))
 
   // Add a new link to the list
-  $('.link-list').on('click', '.add-link-btn', function(e) {
-    e.preventDefault()
-    e.stopPropagation()
+  $('.link-list').on('click', '.add-link-btn', function addNewLink (e) {
+    e.preventDefault && e.preventDefault()
+    e.stopPropagation && e.stopPropagation()
     var $delegate = $(e.delegateTarget)
     var $list = $delegate.find('.links')
+    var linkCount = $list.find("li").length
+    
     var $linkText = $delegate.find(".link-input-new.link-text")
     var $linkURI = $delegate.find(".link-input-new.link-uri")
     
     var template = $delegate.find(".link-template").html()
+    template = template.replace(/\[\]/g, "[" + linkCount + "]")
     var $el = $(template)
     $el.find(".link-text").val( $linkText.val() )
     $el.find(".link-uri").val( $linkURI.val() )
     $list.append($el)
-    console.log($list, template)
     $linkText.val("")
     $linkURI.val("")
   })
@@ -195,6 +197,13 @@ var OKAdmin = function(){
         input.checked = true
       }
     })
+    
+    $(".link-list").each(function(){
+      var $inputs = $(this).find(".link-input-new")
+      if ($inputs.eq(0).val() && $inputs.eq(1).val()) {
+        $(this).find(".add-link-btn").trigger("click")
+      }
+    })
 
     $("ol").each(function(){
       $("li", this).each(function(index){
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 55d5fb8..4acb435 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -82,17 +82,18 @@
 
     {% elsif type == 'link-list' %}
       <div class="link-list group">
-        <div class="links">
+        <ol class="links">
           {% for link in spec.value %}
             <li>
+              <div class="handle"></div>
               <input
-                  name="{{name}}[][text]"
+                  name="{{name}}[{{forloop.index0}}][text]"
                   value="{{link.text}}"
                   type="text"
                   placeholder="Link text"
                   class="link-input link-text">
               <input
-                  name="{{name}}[][uri]"
+                  name="{{name}}[{{forloop.index0}}][uri]"
                   value="{{link.uri}}"
                   type="text"
                   placeholder="URL"
@@ -102,7 +103,8 @@
               </button>
             </li>
           {% endfor %}
-        </div>
+        </ol>
+        
         <input type="text"
                class="link-input-new link-text"
                placeholder="Link text">
@@ -113,6 +115,7 @@
 
         <script type="text/html" class="link-template">
           <li>
+            <div class="handle"></div>
             <input
                 name="{{name}}[][text]"
                 value=""
@@ -172,12 +175,12 @@
             {% if image.token %}
               <li class="video-element">
                 <div style="float: left">
-                <input name="{{name}}[][type]" value="{{image.type}}" type="hidden" class="video-type" hidden>
-                <input name="{{name}}[][token]" value="{{image.token}}" type="hidden" class="video-token" hidden>
+                <input name="{{name}}[{{forloop.index0}}][type]" value="{{image.type}}" type="hidden" class="video-type" hidden>
+                <input name="{{name}}[{{forloop.index0}}][token]" value="{{image.token}}" type="hidden" class="video-token" hidden>
                 <label>Caption</label>
-                <input name="{{name}}[][title]" value="{{image.title}}" type="text" class="video-title">
+                <input name="{{name}}[{{forloop.index0}}][title]" value="{{image.title}}" type="text" class="video-title">
                 <label>Thumbnail</label>
-                <input name="{{name}}[][thumb]" value="{{image.thumb}}" type="text" class="video-thumb">
+                <input name="{{name}}[{{forloop.index0}}][thumb]" value="{{image.thumb}}" type="text" class="video-thumb">
                 </div>
                 <img src="{{image.thumb}}">
                 <button class="remove">x</button>
-- 
cgit v1.2.3-70-g09d2


From d8e9b4d5334db049feec81b0083c3adcedaf7e12 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 28 Mar 2016 19:10:26 -0400
Subject: allow generic urls in media field

---
 examples/db.json                                | 15 +++++++++
 examples/index.js                               |  6 ++++
 themes/okadmin/public/js/app.js                 | 38 ++++++++++++++++-------
 themes/okadmin/public/js/parser.js              |  4 +--
 themes/okadmin/templates/partials/inputs.liquid | 41 ++++++++++++++++++++-----
 5 files changed, 83 insertions(+), 21 deletions(-)

(limited to 'examples')

diff --git a/examples/db.json b/examples/db.json
index 9ab7233..b9de44b 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -124,5 +124,20 @@
       ],
       "dateCreated": ""
     }
+  ],
+  "test": [
+    {
+      "id": "test",
+      "title": "tEst",
+      "media": [
+        {
+          "uri": "http://asdf.us/",
+          "caption": "ASDF",
+          "type": "link"
+        }
+      ],
+      "__index": "0",
+      "dateCreated": "Mon, 28 Mar 2016 23:02:45 GMT"
+    }
   ]
 }
\ No newline at end of file
diff --git a/examples/index.js b/examples/index.js
index bf51dfc..4bf385f 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -21,12 +21,18 @@ var app  = okcms.createApp({
       video: {type: 'video'},
       images: {type: 'captioned-image-list'}
     },
+    test: {
+      id: {type: 'string', hidden: true},
+      title: {type: 'string'},
+      media: {type: 'media-list'},
+    }
   },
 
   resources: [
     { type: 'page', static: {id: 'about'}},
     { type: 'page', static: {id: 'contact'}},
     { type: 'bread' },
+    { type: 'test' },
   ],
 
   services: {
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index da398eb..61fc8c8 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -47,17 +47,33 @@ var OKAdmin = function(){
       $("ol", parent).prepend($el)
     }
     uploader.addVideo = function(media){
-      console.log(media)
-      var videoTemplate = $(".video-template", parent).html()
-      var $el = $(videoTemplate)
-      $el.addClass("loaded")
-      $el.find(".video-type").val( media.type )
-      $el.find(".video-token").val( media.token )
-      $el.find(".video-title").val( media.title )
-      $el.find(".video-thumb").val( media.thumbnail )
-      $el.find("img").attr("src", media.thumbnail )
-      $("ol", parent).prepend($el)
-   }
+      switch (media.type) {
+        case 'youtube':
+        case 'vimeo':
+        case 'video':
+          var videoTemplate = $(".video-template", parent).html()
+          var $el = $(videoTemplate)
+          $el.addClass("loaded")
+          $el.find(".video-type").val( media.type )
+          $el.find(".video-token").val( media.token )
+          $el.find(".video-title").val( media.title )
+          $el.find(".video-thumb").val( media.thumbnail )
+          $el.find(".video-width").val( media.width )
+          $el.find(".video-height").val( media.height )
+          $el.find("img").attr("src", media.thumbnail )
+          $("ol", parent).prepend($el)
+          break
+        case 'link':
+          var linkTemplate = $(".link-template", parent).html()
+          var $el = $(linkTemplate)
+          $el.addClass("loaded")
+          $el.find(".uri").val( media.url )
+          $("ol", parent).prepend($el)
+          break
+        default:
+          alert("Unsupported link type!")
+      }
+    }
   })
   // delete image from gallery
   $(document).on("mousedown", ".media-list .remove", function(){
diff --git a/themes/okadmin/public/js/parser.js b/themes/okadmin/public/js/parser.js
index 411f425..95b391c 100644
--- a/themes/okadmin/public/js/parser.js
+++ b/themes/okadmin/public/js/parser.js
@@ -145,7 +145,6 @@ var Parser = {
 					'&amp;color=ff6600&amp;auto_play=false&amp;show_artwork=true"></iframe>'
 		}
 	},
-  /*
 	{
 		type: 'link',
 		regex: /^http.+/i,
@@ -163,8 +162,7 @@ var Parser = {
 		tag: function (media) {
 			return '<a href="' + media.url + '" target="_blank">' + media.url + '</a>'
 		}
-	}
-	*/
+	},
 	],
 
   tumblr: function(url, cb){
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 4acb435..77ee7a4 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -29,6 +29,8 @@
         <input name="{{name}}[url]" type="text" value="{{spec.value.url}}" class="url" placeholder="Enter a video URL">
         <input name="{{name}}[type]" type="hidden" value="{{spec.value.type}}" class="video-type" hidden>
         <input name="{{name}}[token]" type="hidden" value="{{spec.value.token}}" class="video-token" hidden>
+        <input name="{{name}}[width]" value="{{spec.value.width}}" type="hidden" class="video-width" hidden>
+        <input name="{{name}}[height]" value="{{spec.value.height}}" type="hidden" class="video-height" hidden>
         <label>Title</label>
         <input name="{{name}}[title]" type="text" value="{{spec.value.title}}" class="video-title">
         <label>Thumbnail</label>
@@ -143,11 +145,12 @@
             <input type="file" accept="image/*" multiple>
             <button>+ Add images</button>
           </div>
-          <input class="add-url" type="text" placeholder="+ Add Image/Video URL">
+          <input class="add-url" type="text" placeholder="+ Add Image/Video/Link URL">
         </div>
 
         <script type="text/html" class="image-template">
           <li class="image-element">
+            <label>Caption</label>
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
             <textarea class="caption" name="{{name}}[][caption]"></textarea>
             <img>
@@ -160,6 +163,8 @@
             <div style="float: left">
             <input name="{{name}}[][type]" type="hidden" class="video-type" hidden>
             <input name="{{name}}[][token]" type="hidden" class="video-token" hidden>
+            <input name="{{name}}[][width]" value="{{image.width}}" type="hidden" class="video-width" hidden>
+            <input name="{{name}}[][height]" value="{{image.height}}" type="hidden" class="video-height" hidden>
             <label>Caption</label>
             <input name="{{name}}[][title]" type="text" class="video-title">
             <label>Thumbnail</label>
@@ -170,13 +175,24 @@
           </li>
         </script>
 
+        <script type="text/html" class="link-template">
+          <li class="link-element">
+            <input class="uri" type="text" name="{{name}}[][uri]" value="">
+            <textarea class="caption" name="{{name}}[][caption]" placeholder="Caption"></textarea>
+            <input type="hidden" name="{{name}}[][type]" value="link">
+            <button class="remove">x</button>
+          </li>
+        </script>
+        
         <ol>
           {% for image in spec.value %}
-            {% if image.token %}
+            {% if image.type and (image.type == "vimeo" or image.type == "youtube" or image.type == "video") %}
               <li class="video-element">
                 <div style="float: left">
                 <input name="{{name}}[{{forloop.index0}}][type]" value="{{image.type}}" type="hidden" class="video-type" hidden>
                 <input name="{{name}}[{{forloop.index0}}][token]" value="{{image.token}}" type="hidden" class="video-token" hidden>
+                <input name="{{name}}[{{forloop.index0}}][width]" value="{{image.width}}" type="hidden" class="video-width" hidden>
+                <input name="{{name}}[{{forloop.index0}}][height]" value="{{image.height}}" type="hidden" class="video-height" hidden>
                 <label>Caption</label>
                 <input name="{{name}}[{{forloop.index0}}][title]" value="{{image.title}}" type="text" class="video-title">
                 <label>Thumbnail</label>
@@ -185,11 +201,22 @@
                 <img src="{{image.thumb}}">
                 <button class="remove">x</button>
               </li>
+            {% elsif image.type and image.type == "link" %}
+              <li class="link-element">
+                <label>URL</label>
+                <input class="uri" type="text" name="{{name}}[][uri]" value="{{image.uri}}">
+                <label>Caption</label>
+                <textarea class="caption" name="{{name}}[][caption]" placeholder="Caption">{{image.caption}}</textarea>
+                <input type="hidden" name="{{name}}[][type]" value="link">
+                <button class="remove">x</button>
+              </li>
             {% else %}
               <li class="image-element">
+                <label>Caption</label>
                 <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
                 <textarea class="caption" name="{{name}}[{{forloop.index0}}][caption]">{{image.caption}}</textarea>
-                <img src="{{image.uri}}" alt="{{image.caption}}">
+                <input type="hidden" name="{{name}}[][type]" value="image">
+                <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
                 <button class="remove">x</button>
               </li>
             {% endif %}
@@ -210,7 +237,7 @@
           <li class="image-element">
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
             <textarea class="caption" name="{{name}}[][caption]"></textarea>
-            <img alt="{{image.caption}}">
+            <img>
             <button class="remove">x</button>
           </li>
         </script>
@@ -220,7 +247,7 @@
             <li class="image-element">
               <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
               <textarea class="caption" name="{{name}}[{{forloop.index0}}][caption]">{{image.caption}}</textarea>
-              <img src="{{image.uri}}" alt="{{image.caption}}">
+              <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
               <button class="remove">x</button>
             </li>
           {% endfor %}
@@ -238,7 +265,7 @@
 
         <script type="text/html" class="image-template">
           <li class="image-element">
-            <img alt="{{image.caption}}">
+            <img>
             <button class="remove">x</button>
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
             <input class="caption" name="{{name}}[][label]" placeholder="Name">
@@ -249,7 +276,7 @@
         <ol>
           {% for image in spec.value %}
             <li class="image-element">
-              <img src="{{image.uri}}" alt="{{image.caption}}">
+              <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
               <button class="remove">x</button>
               <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
               <input class="caption" name="{{name}}[{{forloop.index0}}][label]" value="{{image.label}}" placeholder="Name">
-- 
cgit v1.2.3-70-g09d2


From d70037e31737713eb8c50013723a9f85c0fb00e5 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 30 Mar 2016 15:07:54 -0400
Subject: cmd-s to save

---
 examples/db.json                                | 9 ++++++++-
 themes/okadmin/public/js/app.js                 | 7 +++++++
 themes/okadmin/templates/partials/inputs.liquid | 4 ++--
 themes/okadmin/templates/resource.liquid        | 2 +-
 themes/okadmin/templates/resource_new.liquid    | 2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'examples')

diff --git a/examples/db.json b/examples/db.json
index b9de44b..c370864 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -12,6 +12,10 @@
           "uri": "cool",
           "caption": "cool"
         },
+        {
+          "uri": "https://ltho.s3.amazonaws.com/013781df-a926-409b-ab2a-b7b2becf99fa.png",
+          "caption": ""
+        },
         {
           "uri": "https://ltho.s3.amazonaws.com/5f4c3351-9434-446a-883b-aa4bffce8da3.png",
           "caption": "errrr"
@@ -21,10 +25,13 @@
         "url": "",
         "type": "",
         "token": "",
+        "width": "",
+        "height": "",
         "title": "",
         "thumb": ""
       },
-      "__index": 0
+      "__index": "0",
+      "dateCreated": ""
     },
     {
       "type": "bagel",
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 61fc8c8..e7f902d 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -284,6 +284,13 @@ var OKAdmin = function(){
       $input.val(JSON.stringify(parsed));
     })
   });
+  
+  $(window).on('keydown', function(e){
+    if ( (e.ctrlKey || e.altKey || e.metaKey) && e.keyCode == 83 ) {
+      e.preventDefault()
+      $("#resource_form").submit()
+    }
+  })
 }
 
 $(function(){
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index ba4459c..fa03e48 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -214,8 +214,8 @@
             {% else %}
               <li class="image-element">
                 <label>Caption</label>
-                <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
-                <textarea class="caption" name="{{name}}[{{forloop.index0}}][caption]">{{image.caption}}</textarea>
+                <input type="hidden" name="{{name}}[][uri]" value="{{image.uri}}">
+                <textarea class="caption" name="{{name}}[][caption]">{{image.caption}}</textarea>
                 <input type="hidden" name="{{name}}[][type]" value="image">
                 <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
                 <button class="remove">x</button>
diff --git a/themes/okadmin/templates/resource.liquid b/themes/okadmin/templates/resource.liquid
index 9454123..88f93bd 100644
--- a/themes/okadmin/templates/resource.liquid
+++ b/themes/okadmin/templates/resource.liquid
@@ -10,7 +10,7 @@
 
 <section class="resource main" data-type="{{ resource.type }}" data-id="{{ resource.id }}">
   <h2>EDIT {{ resource.type }} '{{ resource.spec.title.value }}'</h2>
-  <form action="." method="POST">
+  <form action="." method="POST" id="resource_form">
     <input type="hidden" name="_method" value="PUT">
     {% include 'partials/inputs' %}
     <label>&nbsp;</label><button type="submit">Save</button>
diff --git a/themes/okadmin/templates/resource_new.liquid b/themes/okadmin/templates/resource_new.liquid
index d059445..15d13ba 100644
--- a/themes/okadmin/templates/resource_new.liquid
+++ b/themes/okadmin/templates/resource_new.liquid
@@ -8,7 +8,7 @@
 
 <section class="main resource resource-new">
   <h2>NEW {{ resource.type }}</h2>
-  <form action=".." method="POST">
+  <form action=".." method="POST" id="resource_form">
     <input type="hidden" name="_method" value="POST">
     {% include 'partials/inputs' %}
     <label>&nbsp;</label><button type="submit">Create</button>
-- 
cgit v1.2.3-70-g09d2


From 1b2576bf18685a84053ba1ff7348076aa06ce851 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 30 Mar 2016 16:44:31 -0400
Subject: add progress bars

---
 examples/db.json                              | 20 +++++++-
 themes/okadmin/public/css/main.css            | 27 +++++++++++
 themes/okadmin/public/js/upload.js            | 68 +++++++++++++++++++++++++++
 themes/okadmin/templates/partials/tail.liquid |  1 +
 4 files changed, 114 insertions(+), 2 deletions(-)

(limited to 'examples')

diff --git a/examples/db.json b/examples/db.json
index c370864..bdad6c8 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -39,15 +39,31 @@
       "id": "bagel",
       "title": "nice",
       "color": "blue",
-      "images": [],
+      "images": [
+        {
+          "uri": "https://ltho.s3.amazonaws.com/229bcbc6-fb3c-428f-8c34-0c6bb69e70fd.gif",
+          "caption": ""
+        },
+        {
+          "uri": "https://ltho.s3.amazonaws.com/a7663bfc-501c-4354-b6ed-6ea305a8fb39.gif",
+          "caption": ""
+        },
+        {
+          "uri": "https://ltho.s3.amazonaws.com/7d380c24-7803-491a-94df-e812cbe667bb.gif",
+          "caption": ""
+        }
+      ],
       "video": {
         "url": "https://vimeo.com/112498725",
         "type": "vimeo",
         "token": "112498725",
+        "width": "",
+        "height": "",
         "title": "FW14-2H-VIDEO-V4 2",
         "thumb": "http://i.vimeocdn.com/video/497493142_640.jpg"
       },
-      "__index": 1
+      "__index": "1",
+      "dateCreated": ""
     },
     {
       "type": "pumpernickel",
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index df0ca43..2f2d376 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -216,6 +216,7 @@ button, input[type=submit] {
   font-family: "Helvetica", sans-serif;
 }
 .main.resource form .group {
+  position: relative;
   display: block;
   float: left;
   width: 31em;
@@ -361,6 +362,32 @@ button, input[type=submit] {
 	color: red;
 }
 
+.progress {
+  position: absolute;
+  top: 0; right: -100px;
+  padding: 10px 10px 0 10px;
+  margin: 0px;
+  width: 100px;
+  pointer-events: none;
+  background: #eee;
+  opacity: 0;
+  transition: opacity 0.3s;
+}
+.progress .xhr {
+  height: 10px;
+  background: black;
+  margin-bottom: 10px;
+  transition: all 0.2s;
+}
+.progress .xhr div {
+  background: white;
+  transition: all 0.2s;
+  height: 100%;
+}
+.progress.loading {
+  opacity: 1;
+}
+
 /* 
 .remove {
   display: none;
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index 8d73dd5..cfc1199 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -4,6 +4,12 @@ var OKUpload = function(){
 }
 OKUpload.prototype.bind = function(rapper){
   var uploader = this
+  this.rapper = rapper
+  this.$progress = $("<div class='progress'>")
+  this.xhrCount = 0
+  this.loadCount = 0
+  
+  $(this.rapper).append(this.$progress)
   $(".add-image-button input", rapper).change( uploader.handleFileSelect.bind(uploader) )
   $(".add-url", rapper).on("keydown blur", pressEnter( function(e){
     var url = $(this).val()
@@ -34,9 +40,62 @@ OKUpload.prototype.handleFileSelect = function(e) {
   }
 }
 OKUpload.prototype.upload = function(f){
+  this.xhrCount += 1
+
+  this.$progress.addClass("loading")
+
+  var $loader = $("<div class='xhr'>")
+  var $loading_bar = $("<div>")
+  $loading_bar.css("width", "0%")
+  $loader.append( $loading_bar )
+  this.$progress.append($loader)
+  
   var fd = new FormData()
   fd.append('image', f)
 
+  var request = new XMLHttpRequest()
+  request.open("POST", this.action, true)
+ 
+  request.addEventListener("progress", updateProgress.bind(this));
+  request.addEventListener("load", transferComplete.bind(this));
+  request.addEventListener("error", transferError.bind(this));
+  request.addEventListener("abort", transferAbort.bind(this));
+
+  function updateProgress (e) {
+    if (e.lengthComputable) {
+      var percentComplete = Math.round( 100 * e.loaded / e.total )
+      $loading_bar.css("width", percentComplete + "%")
+    }
+  }
+  function transferComplete (data) {
+    this.loadCount += 1
+    this.hideUploadBars()
+    if (request.readyState == 4 && request.status == 200) {
+      var responseData
+      try {
+        responseData = JSON.parse( request.responseText )
+        this.success( responseData )
+      }
+      catch (e) {
+        console.log("ERROR PARSING JSON")
+      }
+    }
+    console.log(arguments, request)
+  }
+  function transferError (data) {
+    this.loadCount += 1
+    this.hideUploadBars()
+    console.log(arguments)
+  }
+  function transferAbort (data) {
+    this.loadCount += 1
+    this.hideUploadBars()
+    console.log(arguments)
+  }
+
+  request.send(fd)
+  
+/*
   var request = $.ajax({
     url: this.action,
     type: "post",
@@ -46,6 +105,15 @@ OKUpload.prototype.upload = function(f){
     contentType: false,
   })
   request.done(this.success.bind(this))
+*/
+}
+OKUpload.prototype.hideUploadBars = function () {
+  if (this.xhrCount == this.loadCount) {
+    this.$progress.removeClass("loading")
+    setTimeout(function(){
+      this.$progress.empty()
+    }.bind(this), 300)
+  }
 }
 OKUpload.prototype.success = function(data){
   if (data.error) {
diff --git a/themes/okadmin/templates/partials/tail.liquid b/themes/okadmin/templates/partials/tail.liquid
index b3c575d..53823b0 100644
--- a/themes/okadmin/templates/partials/tail.liquid
+++ b/themes/okadmin/templates/partials/tail.liquid
@@ -1,4 +1,5 @@
     </div> {% comment %} closes container tag {% endcomment %}
+    <div id="progress"></div>
   </body>
   <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/3.6.0/lodash.min.js"></script>
-- 
cgit v1.2.3-70-g09d2


From cd929e1c38c02c1d048abe702c04c7d4d6188011 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 5 Apr 2016 11:46:47 -0400
Subject: Fix sorting bug when saving

---
 app/node_modules/okschema/index.js              | 23 ++++++++++++++++++++---
 examples/db.json                                | 20 +++++++++++++++++---
 examples/index.js                               |  2 +-
 themes/okadmin/public/js/app.js                 |  4 ++++
 themes/okadmin/public/js/parser.js              |  2 +-
 themes/okadmin/templates/partials/inputs.liquid |  2 ++
 6 files changed, 45 insertions(+), 8 deletions(-)

(limited to 'examples')

diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index cf041fb..8162fd4 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -174,8 +174,7 @@ function OKSchema(spec) {
   });
 }
 
-OKSchema.prototype.checkDataForMissingArrays = function(data) {
-  data = data || {};
+OKSchema.prototype.fixMissingLists = function(data) {
   var spec = this.spec;
 
   // The qs body-parser module does not have a way to represent
@@ -189,10 +188,22 @@ OKSchema.prototype.checkDataForMissingArrays = function(data) {
   })
 }
 
+OKSchema.prototype.fixIndexField = function(data) {
+  // Likewise numbers always come in as strings. The field used to sort
+  // records, __index, is of type "meta", so the parseFloat in
+  // assertValid (below) never fires and we end up with sorting issues.
+  if (data.__index && typeof data.__index == "string") {
+    var __index = parseInt(data.__index)
+    if (! isNaN(__index)) {
+      data.__index = __index
+    }
+  }
+}
+
 OKSchema.prototype.assertValid = function(data) {
   data = data || {};
   var spec = this.spec;
-  this.checkDataForMissingArrays(data)
+  
   // Run through custom validators, they'll throw if invalid
   Object.keys(data).forEach(function(prop) {
     var type = spec[prop].type;
@@ -210,6 +221,12 @@ OKSchema.prototype.assertValid = function(data) {
   if (!result.valid) {
     throw result.errors;
   }
+  
+  // Fix various issues with our data, having to do
+  // with use of the "qs" body-parser module.
+  // TODO: just send JSON?
+  this.fixMissingLists(data)
+  this.fixIndexField(data)
 };
 
 /**
diff --git a/examples/db.json b/examples/db.json
index bdad6c8..1d045c3 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -150,8 +150,8 @@
   ],
   "test": [
     {
-      "id": "test",
-      "title": "tEst",
+      "id": "red",
+      "title": "Red",
       "media": [
         {
           "uri": "http://asdf.us/",
@@ -159,8 +159,22 @@
           "type": "link"
         }
       ],
-      "__index": "0",
+      "__index": 0,
       "dateCreated": "Mon, 28 Mar 2016 23:02:45 GMT"
+    },
+    {
+      "id": "blue",
+      "title": "Blue",
+      "__index": 2,
+      "dateCreated": "Tue, 05 Apr 2016 15:17:54 GMT",
+      "media": []
+    },
+    {
+      "id": "green",
+      "title": "Green",
+      "__index": 1,
+      "dateCreated": "Tue, 05 Apr 2016 15:17:57 GMT",
+      "media": []
     }
   ]
 }
\ No newline at end of file
diff --git a/examples/index.js b/examples/index.js
index 4bf385f..81d9241 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -4,7 +4,7 @@ var app  = okcms.createApp({
 
   root: 'public',
 
-  debug: false,
+  debug: true,
 
   schemas: {
     page: {
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index e7f902d..e79f704 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -56,6 +56,7 @@ var OKAdmin = function(){
           $el.addClass("loaded")
           $el.find(".video-type").val( media.type )
           $el.find(".video-token").val( media.token )
+          $el.find(".video-uri").val( media.uri )
           $el.find(".video-title").val( media.title )
           $el.find(".video-thumb").val( media.thumbnail )
           $el.find(".video-width").val( media.width )
@@ -125,8 +126,11 @@ var OKAdmin = function(){
       $el.parent().addClass("loaded")
       $el.parent().find(".video-type").val( media.type )
       $el.parent().find(".video-token").val( media.token )
+      $el.parent().find(".video-uri").val( media.uri )
       $el.parent().find(".video-title").val( media.title )
       $el.parent().find(".video-thumb").val( media.thumbnail )
+      $el.parent().find(".video-width").val( media.width )
+      $el.parent().find(".video-height").val( media.height )
     })
   }))
 
diff --git a/themes/okadmin/public/js/parser.js b/themes/okadmin/public/js/parser.js
index 6c964f7..b4a087d 100644
--- a/themes/okadmin/public/js/parser.js
+++ b/themes/okadmin/public/js/parser.js
@@ -39,7 +39,7 @@ var Parser = {
 				done({
 					url: url,
 					type: "video",
-					token: "",
+					token: url,
 					thumbnail: "http://okfocus.s3.amazonaws.com/misc/okcms/video.png",
 					title: filename,
 					width: width,
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index fa03e48..e618c61 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -164,6 +164,7 @@
             <div style="float: left">
             <input name="{{name}}[][type]" type="hidden" class="video-type" hidden>
             <input name="{{name}}[][token]" type="hidden" class="video-token" hidden>
+            <input name="{{name}}[][uri]" type="hidden" class="video-uri" hidden>
             <input name="{{name}}[][width]" value="{{image.width}}" type="hidden" class="video-width" hidden>
             <input name="{{name}}[][height]" value="{{image.height}}" type="hidden" class="video-height" hidden>
             <label>Caption</label>
@@ -192,6 +193,7 @@
                 <div style="float: left">
                 <input name="{{name}}[{{forloop.index0}}][type]" value="{{image.type}}" type="hidden" class="video-type" hidden>
                 <input name="{{name}}[{{forloop.index0}}][token]" value="{{image.token}}" type="hidden" class="video-token" hidden>
+                <input name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}" type="hidden" class="video-uri" hidden>
                 <input name="{{name}}[{{forloop.index0}}][width]" value="{{image.width}}" type="hidden" class="video-width" hidden>
                 <input name="{{name}}[{{forloop.index0}}][height]" value="{{image.height}}" type="hidden" class="video-height" hidden>
                 <label>Caption</label>
-- 
cgit v1.2.3-70-g09d2


From 56580705e3a62eaf1c498c1c0456fc33fe3b2f76 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 5 Apr 2016 14:05:35 -0400
Subject: broaden media support

---
 app/node_modules/okserver/index.js              |  2 +-
 app/node_modules/okservices/oks3/index.js       | 54 ++++++++++++++++++--
 examples/db.json                                | 29 ++++++++++-
 examples/index.js                               |  5 ++
 package.json                                    |  2 +-
 themes/okadmin/public/css/main.css              |  3 ++
 themes/okadmin/public/js/app.js                 | 18 ++++++-
 themes/okadmin/public/js/parser.js              | 31 +++++++++--
 themes/okadmin/public/js/upload.js              | 61 ++++++++++++++++------
 themes/okadmin/templates/partials/inputs.liquid | 68 ++++++++++++++++++-------
 10 files changed, 226 insertions(+), 47 deletions(-)

(limited to 'examples')

diff --git a/app/node_modules/okserver/index.js b/app/node_modules/okserver/index.js
index ee1b4fb..3428565 100644
--- a/app/node_modules/okserver/index.js
+++ b/app/node_modules/okserver/index.js
@@ -60,7 +60,7 @@ function OKServer(options) {
   app.use(router);
   // Add services
   if (services.s3) {
-    app.use('/_services/image', services.s3.middleware());
+    app.use('/_services/s3', services.s3.middleware());
   }
   if (services.twitter) {
     app.use('/_services/twitter', services.twitter.middleware())
diff --git a/app/node_modules/okservices/oks3/index.js b/app/node_modules/okservices/oks3/index.js
index d556c20..dc0ca19 100644
--- a/app/node_modules/okservices/oks3/index.js
+++ b/app/node_modules/okservices/oks3/index.js
@@ -4,7 +4,7 @@ var skipperS3 = require('skipper-s3')
 // Hack to prevent this god-forsaken module from crashing our shit
 var d = require('domain').create()
 d.on('error', function (err) {
-  console.error('Stupid error in S3 upload. Image upload probably prematurely canceled')
+  console.error('Stupid error in S3 upload. Upload probably prematurely canceled')
 })
 
 function OKS3(options) {
@@ -20,9 +20,9 @@ function OKS3(options) {
 
   router.use(skipper());
 
-  router.post('/', function(req, res) {
-    // req should have a method `file` on it which is
-    // provided by skipper. Use that to do AWS stuff
+  // req should have a method `file` on it which is
+  // provided by skipper. Use that to do AWS stuff
+  router.post('/image', function(req, res) {
     d.run(function () {
       req.file('image').upload({
         adapter: skipperS3,
@@ -38,7 +38,51 @@ function OKS3(options) {
         if (err) res.status(500).send(err)
         res.json(uploadedFiles);
       });
-    })
+    });
+  });
+
+  router.post('/audio', function(req, res) {
+    d.run(function () {
+      if (! options.s3.allowAudioUploads) {
+        return res.status(500).json({ error: "audio uploading not permitted" })
+      }
+      req.file('audio').upload({
+        adapter: skipperS3,
+        key: options.s3.key,
+        secret: options.s3.secret,
+        bucket: options.s3.bucket,
+        dirname: options.s3.dirname,
+        maxBytes: options.s3.maxbytesAudio,
+        headers: {
+          'x-amz-acl': 'public-read'
+        }
+      }, function (err, uploadedFiles) {
+        if (err) res.status(500).send(err)
+        res.json(uploadedFiles);
+      });
+    });
+  });
+
+  router.post('/video', function(req, res) {
+    d.run(function () {
+      if (! options.s3.allowVideoUploads) {
+        return res.status(500).json({ error: "video uploading not permitted" })
+      }
+      req.file('video').upload({
+        adapter: skipperS3,
+        key: options.s3.key,
+        secret: options.s3.secret,
+        bucket: options.s3.bucket,
+        dirname: options.s3.dirname,
+        maxBytes: options.s3.maxbytesVideo,
+        headers: {
+          'x-amz-acl': 'public-read'
+        }
+      }, function (err, uploadedFiles) {
+        if (err) res.status(500).send(err)
+        res.json(uploadedFiles);
+      });
+    });
   });
 
   this._middleware = router;
diff --git a/examples/db.json b/examples/db.json
index 1d045c3..3650355 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -174,7 +174,34 @@
       "title": "Green",
       "__index": 1,
       "dateCreated": "Tue, 05 Apr 2016 15:17:57 GMT",
-      "media": []
+      "media": [
+        {
+          "type": "video",
+          "token": "https://ltho.s3.amazonaws.com/ee12b137-1c8a-400a-87e3-89cbee7b4da6.mp4",
+          "uri": "",
+          "width": "400",
+          "height": "400",
+          "title": "ee12b137-1c8a-400a-87e3-89cbee7b4da6.mp4",
+          "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png"
+        },
+        {
+          "type": "youtube",
+          "token": "y_35kXCQxN4",
+          "uri": "",
+          "width": "640",
+          "height": "360",
+          "title": "dëf lëöpär¨d¨¨¨¨<>~!@~#!:I!@",
+          "thumb": "http://i.ytimg.com/vi/y_35kXCQxN4/hqdefault.jpg"
+        },
+        {
+          "type": "audio",
+          "token": "http://asdf.us/clouds35.mp3",
+          "uri": "",
+          "duration": "225.645792",
+          "title": "clouds35.mp3",
+          "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png"
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/examples/index.js b/examples/index.js
index 81d9241..e9de0a3 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -40,6 +40,11 @@ var app  = okcms.createApp({
       key: process.env.S3_KEY,
       secret: process.env.S3_SECRET,
       bucket: process.env.S3_BUCKET,
+      allowVideoUploads: true,
+      allowAudioUploads: true,
+      maxsize: 200,
+      maxsizeVideo: 150000000,
+      maxsizeAudio: 150000000,
     }
   },
 
diff --git a/package.json b/package.json
index c95a2bc..c3a7280 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.24",
+  "version": "0.1.27",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 2f2d376..15b8781 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -303,6 +303,7 @@ button, input[type=submit] {
   width: 15em;
   height: 6em;
 }
+.main.resource form .audio-element input[type=text],
 .main.resource form .video-element input[type=text] {
   width: 15em;
 }
@@ -353,10 +354,12 @@ button, input[type=submit] {
   margin: 0; padding: 0;
   cursor: pointer;
 }
+.audio-element:hover .remove,
 .video-element:hover .remove,
 .image-element:hover .remove {
   display: block;
 }
+.audio-element .remove:hover,
 .video-element .remove:hover,
 .image-element .remove:hover {
 	color: red;
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index e79f704..a12f517 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -5,7 +5,8 @@ var OKAdmin = function(){
     var parent = this
     var uploader = new OKUpload ()
     uploader.bind( this )
-    uploader.add = function(url){
+    uploader.add = function(media){
+      var url = media.url
       var imageTemplate = $(".image-template", parent).html()
       var $el = $(imageTemplate)
       $el.find(".uri").val(url)
@@ -46,7 +47,7 @@ var OKAdmin = function(){
       $el.find("img").attr("src", url)
       $("ol", parent).prepend($el)
     }
-    uploader.addVideo = function(media){
+    uploader.addMedia = function(media){
       switch (media.type) {
         case 'youtube':
         case 'vimeo':
@@ -64,6 +65,19 @@ var OKAdmin = function(){
           $el.find("img").attr("src", media.thumbnail )
           $("ol", parent).prepend($el)
           break
+        case 'audio':
+          var audioTemplate = $(".audio-template", parent).html()
+          var $el = $(audioTemplate)
+          $el.addClass("loaded")
+          $el.find(".audio-type").val( media.type )
+          $el.find(".audio-token").val( media.token )
+          $el.find(".audio-uri").val( media.uri )
+          $el.find(".audio-title").val( media.title )
+          $el.find(".audio-thumb").val( media.thumbnail )
+          $el.find(".audio-duration").val( media.duration )
+          $el.find("img").attr("src", media.thumbnail )
+          $("ol", parent).prepend($el)
+          break
         case 'link':
           var linkTemplate = $(".link-template", parent).html()
           var $el = $(linkTemplate)
diff --git a/themes/okadmin/public/js/parser.js b/themes/okadmin/public/js/parser.js
index b4a087d..4ab9a6c 100644
--- a/themes/okadmin/public/js/parser.js
+++ b/themes/okadmin/public/js/parser.js
@@ -52,6 +52,31 @@ var Parser = {
 		tag: function (media) {
 			return '<video src="' + media.url + '">';
 		}
+	}, {
+		type: 'audio',
+		regex: /\.(wav|mp3)(\?.*)?$/i,
+		fetch: function(url, done) {
+			var audio = document.createElement("audio")
+			var url_parts = url.replace(/\?.*$/, "").split("/")
+			var filename = url_parts[ url_parts.length-1 ]
+			audio.addEventListener("loadedmetadata", function(){
+				var duration = audio.duration
+				audio = null
+				done({
+					url: url,
+					type: "audio",
+					token: url,
+					thumbnail: "http://okfocus.s3.amazonaws.com/misc/okcms/audio.png",
+					title: filename,
+					duration: duration,
+				})
+			})
+			audio.src = url
+			audio.load()
+		},
+		tag: function (media) {
+			return '<audio src="' + media.url + '">';
+		}
 	}, {
 		type: 'youtube',
 		regex:  /(?:youtube\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|.*[?&]v=)|youtu\.be\/)([^"&?\/ ]{11})/i,
@@ -116,8 +141,7 @@ var Parser = {
 			// return '<img class="video" type="vimeo" vid="'+media.token+'" src="'+media.thumbnail+'"><span class="playvid">&#9654;</span>';
 			return '<div class="video" style="width: ' + media.width + 'px; height: ' + media.height + 'px; overflow: hidden; position: relative;"><iframe frameborder="0" scrolling="no" seamless="seamless" webkitallowfullscreen="webkitAllowFullScreen" mozallowfullscreen="mozallowfullscreen" allowfullscreen="allowfullscreen" id="okplayer" src="http://player.vimeo.com/video/' + media.token + '?api=1&title=0&byline=0&portrait=0&playbar=0&player_id=okplayer&loop=0&autoplay=0" width="' + media.width + '" height="' + media.height + '" style="position: absolute; top: 0px; left: 0px; width: ' + media.width + 'px; height: ' + media.height + 'px;"></iframe></div>'
 		}
-	},
-	{
+	}, {
 		type: 'soundcloud',
 		regex: /soundcloud.com\/[-a-zA-Z0-9]+\/[-a-zA-Z0-9]+\/?$/i,
 		fetch: function (url, done) {
@@ -128,13 +152,14 @@ var Parser = {
 					+ '&client_id=' 
 					+ '0673fbe6fc794a7750f680747e863b10',
 				success: function(result) {
-				  // console.log(result)
+				  console.log(result)
 					done({
 						url: url,
 						type: "soundcloud",
 						token: result.id,
 						thumbnail: result.artwork_url || result.user.avatar_url,
 						title: result.user.username + " - " + result.title,
+						duration: result.duration,
 						width: 166,
 						height: 166,
 					})
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index cfc1199..2ce14ad 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -1,6 +1,8 @@
 
 var OKUpload = function(){
-	this.action = "/_services/image"
+	this.action = this.imageAction = "/_services/s3/image"
+	this.videoAction = "/_services/s3/video"
+	this.audioAction = "/_services/s3/audio"
 }
 OKUpload.prototype.bind = function(rapper){
   var uploader = this
@@ -14,18 +16,25 @@ OKUpload.prototype.bind = function(rapper){
   $(".add-url", rapper).on("keydown blur", pressEnter( function(e){
     var url = $(this).val()
     $(this).val("")
-    if (! url) return
-    Parser.parse( url, function(media){
-      console.log(url, media)
-      if (media.type == "image") {
-        uploader.add(url)
-      }
-      else {
-        uploader.addVideo(media)
-      }
-    })
+    uploader.parse(url)
   }))
 }
+OKUpload.prototype.parse = function(url){
+  if (! url) return
+  var uploader = this
+  Parser.parse( url, function(media){
+    console.log(url, media)
+    if (! media) {
+      alert("Not a valid link")
+    }
+    else if (media.type == "image") {
+      uploader.add(media)
+    }
+    else {
+      uploader.addMedia(media)
+    }
+  })
+}
 OKUpload.prototype.handleFileSelect = function(e) {
   e.stopPropagation();
   e.preventDefault();
@@ -33,13 +42,29 @@ OKUpload.prototype.handleFileSelect = function(e) {
   var files = e.dataTransfer ? e.dataTransfer.files : e.target.files;
 
   for (var i = 0, f; f = files[i]; i++) {
-    if ( ! f.type.match('image.*')) {
+    if ( ! f.type.match('image.*') && ! f.type.match('video.*') ) {
       continue;
     }
     this.upload(f)
   }
 }
 OKUpload.prototype.upload = function(f){
+
+  var field, action
+
+  if ( f.type.match('video.*') ) {
+    field = 'video'
+    action = this.videoAction
+  }
+  else if ( f.type.match('audio.*') ) {
+    field = 'audio'
+    action = this.audioAction
+  }
+  else {
+    field = 'image'
+    action = this.imageAction || this.action
+  }
+  
   this.xhrCount += 1
 
   this.$progress.addClass("loading")
@@ -51,10 +76,10 @@ OKUpload.prototype.upload = function(f){
   this.$progress.append($loader)
   
   var fd = new FormData()
-  fd.append('image', f)
+  fd.append(field, f)
 
   var request = new XMLHttpRequest()
-  request.open("POST", this.action, true)
+  request.open("POST", action, true)
  
   request.addEventListener("progress", updateProgress.bind(this));
   request.addEventListener("load", transferComplete.bind(this));
@@ -77,6 +102,7 @@ OKUpload.prototype.upload = function(f){
         this.success( responseData )
       }
       catch (e) {
+        console.log(request.responseText)
         console.log("ERROR PARSING JSON")
       }
     }
@@ -121,12 +147,15 @@ OKUpload.prototype.success = function(data){
     return
   }
   var url = data[0].extra.Location
-  this.add(url)
+  this.parse(url)
 }
 OKUpload.prototype.add = function(media){
   console.log(media)
 }
-OKUpload.prototype.addVideo = function(media){
+OKUpload.prototype.addMedia = function(media){
+  console.log(media)
+}
+OKUpload.prototype.addAudio = function(media){
   console.log(media)
 }
 OKUpload.prototype.error = function(error){
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index e618c61..0cd7f6b 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -9,14 +9,14 @@
 
     {% if type == 'string' %}
       <input
-        name="{{name}}" type="text" value="{{spec.value}}">
+        name="{{name}}" type="text" value="{{spec.value | escape}}">
     {% elsif type == 'text' %}
       <textarea
-        name="{{name}}">{{spec.value}}</textarea>
+        name="{{name}}">{{spec.value | escape}}</textarea>
     {% elsif type == 'number' %}
       <input
         type="number"
-        name="{{name}}" value="{{spec.value}}">
+        name="{{name}}" value="{{spec.value | escape}}">
     {% elsif type == 'enum' or type == 'foreign-key' %}
       <select
         name="{{name}}">
@@ -32,9 +32,9 @@
         <input name="{{name}}[width]" value="{{spec.value.width}}" type="hidden" class="video-width" hidden>
         <input name="{{name}}[height]" value="{{spec.value.height}}" type="hidden" class="video-height" hidden>
         <label>Title</label>
-        <input name="{{name}}[title]" type="text" value="{{spec.value.title}}" class="video-title">
+        <input name="{{name}}[title]" type="text" value="{{spec.value.title | escape}}" class="video-title">
         <label>Thumbnail</label>
-        <input name="{{name}}[thumb]" type="text" value="{{spec.value.thumb}}" class="video-thumb">
+        <input name="{{name}}[thumb]" type="text" value="{{spec.value.thumb | escape}}" class="video-thumb">
       </div>
     {% elsif type == 'image' %}
       <div class="image group {% if spec.value.uri %}loaded{% endif %}">
@@ -47,8 +47,8 @@
         </div>
         <div class="image-element">
           <input class="uri" type="hidden" name="{{name}}[uri]" value="{{spec.value.uri}}">
-          <textarea class="caption" name="{{name}}[caption]">{{spec.value.caption}}</textarea>
-          <img src="{{spec.value.uri}}" alt="{{spec.value.caption}}">
+          <textarea class="caption" name="{{name}}[caption]">{{spec.value.caption | escape}}</textarea>
+          <img src="{{spec.value.uri}}" alt="{{spec.value.caption | escape}}">
           <button class="remove">x</button>
         </div>
       </div>
@@ -78,7 +78,7 @@
     {% elsif type == 'tag-list' %}
       <div class="tag-list">
         <input name="{{name}}"
-               value="{{spec.value}}"
+               value="{{spec.value | escape}}"
                placeholder="Enter a comma separated list of tags.">
       </div>
 
@@ -90,13 +90,13 @@
               <div class="handle"></div>
               <input
                   name="{{name}}[{{forloop.index0}}][text]"
-                  value="{{link.text}}"
+                  value="{{link.text | escape}}"
                   type="text"
                   placeholder="Link text"
                   class="link-input link-text">
               <input
                   name="{{name}}[{{forloop.index0}}][uri]"
-                  value="{{link.uri}}"
+                  value="{{link.uri | escape}}"
                   type="text"
                   placeholder="URL"
                   class="link-input link-uri">
@@ -142,8 +142,8 @@
       <div class="media-list group loaded">
         <div class="fields">
           <div class="add-image-button">
-            <input type="file" accept="image/*" multiple>
-            <button>+ Add images</button>
+            <input type="file" accept="image/*,video/*,audio/*" multiple>
+            <button>+ Add media</button>
           </div>
           <input class="add-url" type="text" placeholder="+ Add Image/Video/Link URL">
         </div>
@@ -177,6 +177,23 @@
           </li>
         </script>
 
+        <script type="text/html" class="audio-template">
+          <li class="audio-element">
+            <div style="float: left">
+            <input name="{{name}}[][type]" type="hidden" class="audio-type" hidden>
+            <input name="{{name}}[][token]" type="hidden" class="audio-token" hidden>
+            <input name="{{name}}[][uri]" type="hidden" class="audio-uri" hidden>
+            <input name="{{name}}[][duration]" value="{{image.duration}}" type="hidden" class="audio-duration" hidden>
+            <label>Caption</label>
+            <input name="{{name}}[][title]" type="text" class="audio-title">
+            <label>Thumbnail</label>
+            <input name="{{name}}[][thumb]" type="text" class="audio-thumb">
+            </div>
+            <img>
+            <button class="remove">x</button>
+          </li>
+        </script>
+
         <script type="text/html" class="link-template">
           <li class="link-element">
             <input class="uri" type="text" name="{{name}}[][uri]" value="">
@@ -197,19 +214,34 @@
                 <input name="{{name}}[{{forloop.index0}}][width]" value="{{image.width}}" type="hidden" class="video-width" hidden>
                 <input name="{{name}}[{{forloop.index0}}][height]" value="{{image.height}}" type="hidden" class="video-height" hidden>
                 <label>Caption</label>
-                <input name="{{name}}[{{forloop.index0}}][title]" value="{{image.title}}" type="text" class="video-title">
+                <input name="{{name}}[{{forloop.index0}}][title]" value="{{image.title | escape}}" type="text" class="video-title">
                 <label>Thumbnail</label>
                 <input name="{{name}}[{{forloop.index0}}][thumb]" value="{{image.thumb}}" type="text" class="video-thumb">
                 </div>
                 <img src="{{image.thumb}}">
                 <button class="remove">x</button>
               </li>
+            {% elsif image.type and (image.type == "audio" or image.type == "soundcloud") %}
+              <li class="audio-element">
+                <div style="float: left">
+                <input name="{{name}}[{{forloop.index0}}][type]" value="{{image.type}}" type="hidden" class="audio-type" hidden>
+                <input name="{{name}}[{{forloop.index0}}][token]" value="{{image.token}}" type="hidden" class="audio-token" hidden>
+                <input name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}" type="hidden" class="audio-uri" hidden>
+                <input name="{{name}}[{{forloop.index0}}][duration]" value="{{image.duration}}" type="hidden" class="audio-duration" hidden>
+                <label>Caption</label>
+                <input name="{{name}}[{{forloop.index0}}][title]" value="{{image.title | escape}}" type="text" class="audio-title">
+                <label>Thumbnail</label>
+                <input name="{{name}}[{{forloop.index0}}][thumb]" value="{{image.thumb}}" type="text" class="audio-thumb">
+                </div>
+                <img src="{{image.thumb}}">
+                <button class="remove">x</button>
+              </li>
             {% elsif image.type and image.type == "link" %}
               <li class="link-element">
                 <label>URL</label>
                 <input class="uri" type="text" name="{{name}}[][uri]" value="{{image.uri}}">
                 <label>Caption</label>
-                <textarea class="caption" name="{{name}}[][caption]" placeholder="Caption">{{image.caption}}</textarea>
+                <textarea class="caption" name="{{name}}[][caption]" placeholder="Caption">{{image.caption | escape}}</textarea>
                 <input type="hidden" name="{{name}}[][type]" value="link">
                 <button class="remove">x</button>
               </li>
@@ -217,7 +249,7 @@
               <li class="image-element">
                 <label>Caption</label>
                 <input type="hidden" name="{{name}}[][uri]" value="{{image.uri}}">
-                <textarea class="caption" name="{{name}}[][caption]">{{image.caption}}</textarea>
+                <textarea class="caption" name="{{name}}[][caption]">{{image.caption | escape}}</textarea>
                 <input type="hidden" name="{{name}}[][type]" value="image">
                 <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
                 <button class="remove">x</button>
@@ -249,7 +281,7 @@
           {% for image in spec.value %}
             <li class="image-element">
               <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
-              <textarea class="caption" name="{{name}}[{{forloop.index0}}][caption]">{{image.caption}}</textarea>
+              <textarea class="caption" name="{{name}}[{{forloop.index0}}][caption]">{{image.caption | escape}}</textarea>
               <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
               <button class="remove">x</button>
             </li>
@@ -282,8 +314,8 @@
               <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
               <button class="remove">x</button>
               <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
-              <input class="caption" name="{{name}}[{{forloop.index0}}][label]" value="{{image.label}}" placeholder="Name">
-              <input class="caption" name="{{name}}[{{forloop.index0}}][caption]" value="{{image.caption}}"  placeholder="Email">
+              <input class="caption" name="{{name}}[{{forloop.index0}}][label]" value="{{image.label | escape}}" placeholder="Name">
+              <input class="caption" name="{{name}}[{{forloop.index0}}][caption]" value="{{image.caption | escape}}"  placeholder="Email">
             </li>
           {% endfor %}
         </ol>
-- 
cgit v1.2.3-70-g09d2


From 62ce072b3c32bacf3d290b44bf1b9db8154d30a7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 5 Apr 2016 14:40:46 -0400
Subject: configuration options

---
 app/node_modules/okservices/oks3/index.js | 27 ++++++++++++++++++++++++---
 examples/index.js                         |  2 ++
 themes/okadmin/public/js/upload.js        |  2 +-
 3 files changed, 27 insertions(+), 4 deletions(-)

(limited to 'examples')

diff --git a/app/node_modules/okservices/oks3/index.js b/app/node_modules/okservices/oks3/index.js
index dc0ca19..97abef0 100644
--- a/app/node_modules/okservices/oks3/index.js
+++ b/app/node_modules/okservices/oks3/index.js
@@ -14,6 +14,20 @@ function OKS3(options) {
     throw new Error('Express not provided to OKS3');
   if (!options.s3)
     throw new Error('S3 configuration not provided to OKS3');
+  
+  if (!options.s3.image) options.s3.image = {}
+  if (!options.s3.audio) options.s3.audio = {}
+  if (!options.s3.video) options.s3.video = {}
+
+  if (options.s3.maxbytes) {
+    if (! ('maxbytes' in options.s3.image))
+      options.s3.image.maxbytes = options.s3.maxbytes
+    if (! ('maxbytes' in options.s3.video))
+      options.s3.video.maxbytes = options.s3.maxbytes
+    if (! ('maxbytes' in options.s3.audio))
+      options.s3.audio.maxbytes = options.s3.maxbytes
+  }
+  
   var express = options.express;
 
   var router = express.Router();
@@ -30,7 +44,8 @@ function OKS3(options) {
         secret: options.s3.secret,
         bucket: options.s3.bucket,
         dirname: options.s3.dirname,
-        maxBytes: options.s3.maxbytes,
+        maxBytes: options.s3.image.maxbytes,
+        saveAs: options.s3.image.preserveFilename && preserveFilename,
         headers: {
           'x-amz-acl': 'public-read'
         }
@@ -52,7 +67,8 @@ function OKS3(options) {
         secret: options.s3.secret,
         bucket: options.s3.bucket,
         dirname: options.s3.dirname,
-        maxBytes: options.s3.maxbytesAudio,
+        maxBytes: options.s3.audio.maxbytes,
+        saveAs: options.s3.audio.preserveFilename && preserveFilename,
         headers: {
           'x-amz-acl': 'public-read'
         }
@@ -74,7 +90,8 @@ function OKS3(options) {
         secret: options.s3.secret,
         bucket: options.s3.bucket,
         dirname: options.s3.dirname,
-        maxBytes: options.s3.maxbytesVideo,
+        maxBytes: options.s3.video.maxbytes,
+        saveAs: options.s3.video.preserveFilename && preserveFilename,
         headers: {
           'x-amz-acl': 'public-read'
         }
@@ -84,6 +101,10 @@ function OKS3(options) {
       });
     });
   });
+  
+  function preserveFilename (stream, cb){
+    cb(null, stream.filename)
+  }
 
   this._middleware = router;
 }
diff --git a/examples/index.js b/examples/index.js
index e9de0a3..147750e 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -40,8 +40,10 @@ var app  = okcms.createApp({
       key: process.env.S3_KEY,
       secret: process.env.S3_SECRET,
       bucket: process.env.S3_BUCKET,
+      dirname: "okcms-example",
       allowVideoUploads: true,
       allowAudioUploads: true,
+      preserveFilenames: true,
       maxsize: 200,
       maxsizeVideo: 150000000,
       maxsizeAudio: 150000000,
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index 2ce14ad..6149424 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -146,7 +146,7 @@ OKUpload.prototype.success = function(data){
     console.log(data.error)
     return
   }
-  var url = data[0].extra.Location
+  var url = data[0].extra.Location.replace(/%2F/, '\/')
   this.parse(url)
 }
 OKUpload.prototype.add = function(media){
-- 
cgit v1.2.3-70-g09d2


From 6c09824946214db696beb59e34ce2e448d504abc Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 5 Apr 2016 17:10:00 -0400
Subject: better max file size stuff

---
 app/index.js                                  |  3 ++-
 app/node_modules/okservices/oks3/index.js     | 34 +++++++++++++++++--------
 app/node_modules/okservices/oks3/package.json |  2 +-
 examples/db.json                              |  8 +++++-
 examples/index.js                             | 10 +++-----
 package.json                                  |  4 +--
 themes/okadmin/public/js/app.js               |  3 ++-
 themes/okadmin/public/js/upload.js            | 36 +++++++++++++++++++++------
 themes/okadmin/templates/partials/head.liquid |  2 +-
 themes/okadmin/templates/partials/tail.liquid |  4 +++
 10 files changed, 76 insertions(+), 30 deletions(-)

(limited to 'examples')

diff --git a/app/index.js b/app/index.js
index 06b1591..d478a03 100644
--- a/app/index.js
+++ b/app/index.js
@@ -53,7 +53,8 @@ function OKCMS(options) {
   }, metaDefault, metaUser);
 
   var adminMeta = assign({
-      static: withoutTrailingSlash(adminPath)
+      static: withoutTrailingSlash(adminPath),
+      services: options.services,
   }, metaDefault, metaUser);
 
   var schemaConfig = options.schemas || {};
diff --git a/app/node_modules/okservices/oks3/index.js b/app/node_modules/okservices/oks3/index.js
index 97abef0..34c5840 100644
--- a/app/node_modules/okservices/oks3/index.js
+++ b/app/node_modules/okservices/oks3/index.js
@@ -4,6 +4,7 @@ var skipperS3 = require('skipper-s3')
 // Hack to prevent this god-forsaken module from crashing our shit
 var d = require('domain').create()
 d.on('error', function (err) {
+  console.log(err)
   console.error('Stupid error in S3 upload. Upload probably prematurely canceled')
 })
 
@@ -19,6 +20,12 @@ function OKS3(options) {
   if (!options.s3.audio) options.s3.audio = {}
   if (!options.s3.video) options.s3.video = {}
 
+/*
+  // TODO: maxBytes property doesn't work - if you upload a large file,
+  // it will just hang until you reload the browser, and then CRASH.
+  
+  // Make sure maxbytes property is there - it can be a number,
+  // or zero/undefined (for no maximum upload size)
   if (options.s3.maxbytes) {
     if (! ('maxbytes' in options.s3.image))
       options.s3.image.maxbytes = options.s3.maxbytes
@@ -27,7 +34,14 @@ function OKS3(options) {
     if (! ('maxbytes' in options.s3.audio))
       options.s3.audio.maxbytes = options.s3.maxbytes
   }
-  
+*/
+  if (options.s3.image.preserveFilename)
+    options.s3.image.preserveFilename = preserveFilename
+  if (options.s3.video.preserveFilename)
+    options.s3.video.preserveFilename = preserveFilename
+  if (options.s3.audio.preserveFilename)
+    options.s3.audio.preserveFilename = preserveFilename
+
   var express = options.express;
 
   var router = express.Router();
@@ -38,22 +52,22 @@ function OKS3(options) {
   // provided by skipper. Use that to do AWS stuff
   router.post('/image', function(req, res) {
     d.run(function () {
-      req.file('image').upload({
+      var skip = req.file('image').upload({
         adapter: skipperS3,
         key: options.s3.key,
         secret: options.s3.secret,
         bucket: options.s3.bucket,
         dirname: options.s3.dirname,
-        maxBytes: options.s3.image.maxbytes,
-        saveAs: options.s3.image.preserveFilename && preserveFilename,
+        // maxBytes: options.s3.image.maxbytes,
+        saveAs: options.s3.image.preserveFilename,
         headers: {
           'x-amz-acl': 'public-read'
         }
       }, function (err, uploadedFiles) {
-        if (err) res.status(500).send(err)
+        if (err) return res.status(500).send(err)
         res.json(uploadedFiles);
       });
-    });
+   });
   });
 
   router.post('/audio', function(req, res) {
@@ -67,8 +81,8 @@ function OKS3(options) {
         secret: options.s3.secret,
         bucket: options.s3.bucket,
         dirname: options.s3.dirname,
-        maxBytes: options.s3.audio.maxbytes,
-        saveAs: options.s3.audio.preserveFilename && preserveFilename,
+        // maxBytes: options.s3.audio.maxbytes,
+        saveAs: options.s3.audio.preserveFilename,
         headers: {
           'x-amz-acl': 'public-read'
         }
@@ -90,8 +104,8 @@ function OKS3(options) {
         secret: options.s3.secret,
         bucket: options.s3.bucket,
         dirname: options.s3.dirname,
-        maxBytes: options.s3.video.maxbytes,
-        saveAs: options.s3.video.preserveFilename && preserveFilename,
+        // maxBytes: options.s3.video.maxbytes,
+        saveAs: options.s3.video.preserveFilename,
         headers: {
           'x-amz-acl': 'public-read'
         }
diff --git a/app/node_modules/okservices/oks3/package.json b/app/node_modules/okservices/oks3/package.json
index 1d72a26..19a2d2a 100644
--- a/app/node_modules/okservices/oks3/package.json
+++ b/app/node_modules/okservices/oks3/package.json
@@ -9,7 +9,7 @@
   "author": "OKFocus",
   "license": "None",
   "dependencies": {
-    "skipper": "^0.5.8",
+    "skipper": "^0.5.9",
     "skipper-s3": "^0.5.6"
   }
 }
diff --git a/examples/db.json b/examples/db.json
index 3650355..da7c19a 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -167,7 +167,13 @@
       "title": "Blue",
       "__index": 2,
       "dateCreated": "Tue, 05 Apr 2016 15:17:54 GMT",
-      "media": []
+      "media": [
+        {
+          "uri": "https://ltho.s3.amazonaws.com/okcms-example/f2775199-d700-4b1f-951f-88fda599014e.png",
+          "caption": "",
+          "type": "image"
+        }
+      ]
     },
     {
       "id": "green",
diff --git a/examples/index.js b/examples/index.js
index 147750e..57bce4b 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -41,12 +41,10 @@ var app  = okcms.createApp({
       secret: process.env.S3_SECRET,
       bucket: process.env.S3_BUCKET,
       dirname: "okcms-example",
-      allowVideoUploads: true,
-      allowAudioUploads: true,
-      preserveFilenames: true,
-      maxsize: 200,
-      maxsizeVideo: 150000000,
-      maxsizeAudio: 150000000,
+      // TODO: maxbytes stuff isn't working, need to change underlying module
+      image: { preserveFilename: false, maxbytes: 20000 },
+      video: { preserveFilename: true, maxbytes: 0 },
+      audio: { preserveFilename: true, maxbytes: 150000000 },
     }
   },
 
diff --git a/package.json b/package.json
index c3a7280..5caef74 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.27",
+  "version": "0.1.26",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "OKFocus",
-  "license": "None",
+  "license": "LNT",
   "dependencies": {
     "dotenv": "^1.1.0",
     "express": "^4.12.3",
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index a12f517..59fc6ae 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -40,7 +40,8 @@ var OKAdmin = function(){
     var parent = this
     var uploader = new OKUpload ()
     uploader.bind( this )
-    uploader.add = function(url){
+    uploader.add = function(media){
+      var url = media.url
       var imageTemplate = $(".image-template", parent).html()
       var $el = $(imageTemplate)
       $el.find(".uri").val(url)
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index 6149424..44a34b5 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -1,8 +1,9 @@
 
 var OKUpload = function(){
-	this.action = this.imageAction = "/_services/s3/image"
-	this.videoAction = "/_services/s3/video"
-	this.audioAction = "/_services/s3/audio"
+  this.config = $("#uploadConfig").data()
+  this.imageAction = "/_services/s3/image"
+  this.videoAction = "/_services/s3/video"
+  this.audioAction = "/_services/s3/audio"
 }
 OKUpload.prototype.bind = function(rapper){
   var uploader = this
@@ -42,29 +43,47 @@ OKUpload.prototype.handleFileSelect = function(e) {
   var files = e.dataTransfer ? e.dataTransfer.files : e.target.files;
 
   for (var i = 0, f; f = files[i]; i++) {
-    if ( ! f.type.match('image.*') && ! f.type.match('video.*') ) {
-      continue;
-    }
     this.upload(f)
   }
 }
+OKUpload.prototype.largeFileError = function(file, maxSize) {
+  var your_bytes = bytesToString(file.size)
+  var max_bytes = bytesToString(maxSize)
+  alert("Sorry, your file is too big.\n\n" + file.name + "\n\nYour file: " + your_bytes + "\nMax size: " + max_bytes)
+  function bytesToString (n) {
+    if (n < 1024) return n + " bytes"
+    n /= 1024
+    if (n < 1024) return n.toFixed(1) + " kb"
+    n /= 1024
+    if (n < 1024) return n.toFixed(1) + " mb"
+  }
+}
 OKUpload.prototype.upload = function(f){
 
   var field, action
 
   if ( f.type.match('video.*') ) {
+    if (this.config.videoMaxbytes && f.size > this.config.videoMaxbytes) {
+      return this.largeFileError(f, this.config.videoMaxbytes)
+    }
     field = 'video'
     action = this.videoAction
   }
   else if ( f.type.match('audio.*') ) {
+    if (this.config.audioMaxbytes && f.size > this.config.audioMaxbytes) {
+      return this.largeFileError(f, this.config.audioMaxbytes)
+    }
     field = 'audio'
     action = this.audioAction
   }
   else {
+    if (this.config.imageMaxbytes && f.size > this.config.imageMaxbytes) {
+      return this.largeFileError(f, this.config.imageMaxbytes)
+    }
     field = 'image'
     action = this.imageAction || this.action
   }
-  
+
   this.xhrCount += 1
 
   this.$progress.addClass("loading")
@@ -109,11 +128,13 @@ OKUpload.prototype.upload = function(f){
     console.log(arguments, request)
   }
   function transferError (data) {
+    console.log("Transfer error")
     this.loadCount += 1
     this.hideUploadBars()
     console.log(arguments)
   }
   function transferAbort (data) {
+    console.log("Transfer aborted")
     this.loadCount += 1
     this.hideUploadBars()
     console.log(arguments)
@@ -147,6 +168,7 @@ OKUpload.prototype.success = function(data){
     return
   }
   var url = data[0].extra.Location.replace(/%2F/, '\/')
+  console.log(url)
   this.parse(url)
 }
 OKUpload.prototype.add = function(media){
diff --git a/themes/okadmin/templates/partials/head.liquid b/themes/okadmin/templates/partials/head.liquid
index 7ee4824..e9c27dc 100644
--- a/themes/okadmin/templates/partials/head.liquid
+++ b/themes/okadmin/templates/partials/head.liquid
@@ -10,4 +10,4 @@
       <span class="breadcrumb"><b>{{meta.project}}</b> Admin</span>
       <a class="site-link" href="/">View Site</a>
     </header>
-    <div class="container">
+    <div class="container">
\ No newline at end of file
diff --git a/themes/okadmin/templates/partials/tail.liquid b/themes/okadmin/templates/partials/tail.liquid
index 53823b0..522023b 100644
--- a/themes/okadmin/templates/partials/tail.liquid
+++ b/themes/okadmin/templates/partials/tail.liquid
@@ -1,5 +1,9 @@
     </div> {% comment %} closes container tag {% endcomment %}
     <div id="progress"></div>
+    <div id="uploadConfig"
+      data-image-maxbytes="{{meta.services.s3.image.maxbytes}}"
+      data-audio-maxbytes="{{meta.services.s3.audio.maxbytes}}"
+      data-video-maxbytes="{{meta.services.s3.video.maxbytes}}"></div>
   </body>
   <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/3.6.0/lodash.min.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 654053736a74aa8cd4344e9c4f5e5a7ebeefc33e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 6 Apr 2016 19:11:22 -0400
Subject: Store booleans as type boolean

---
 app/index.js                          |  2 +-
 app/node_modules/okadminview/index.js |  3 ++-
 app/node_modules/okschema/index.js    | 13 ++++++++-----
 examples/db.json                      |  3 ++-
 examples/index.js                     |  1 +
 5 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'examples')

diff --git a/app/index.js b/app/index.js
index d478a03..1a8f97e 100644
--- a/app/index.js
+++ b/app/index.js
@@ -151,7 +151,7 @@ OKCMS.prototype._createResources = function(resourceConfig, db, schemaCache) {
     var schema = schemaCache[type];
     if (!schema)
       throw new Error('Resource config references nonexistent schema ' + type);
-    var resource = OKResource({
+    var resource = new OKResource({
       type: type,
       db: db,
       schema: schema
diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index ec3cd86..b94c814 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -247,6 +247,7 @@ function OKAdminView(options) {
       if (!resource) {
         error(req, res, 400)(new Error('No such resource ' + type));
       } else {
+        var spec = resource.spec
         try {
           resource.assertValid(data);
           resource.update(id, data).then(function(updated) {
@@ -254,7 +255,7 @@ function OKAdminView(options) {
             res.redirect(303, '../' + resource.getID(updated));
           }).fail(error(req, res, 500));
         } catch (errors) {
-          var templateData = transformData(meta, resource, data);
+          var templateData = transformData(meta, spec, resource, data);
           view.renderResource(req, res, assign(templateData, {errors: errors}));
         }
       }
diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index 8162fd4..b3d4cc2 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -66,7 +66,7 @@ var types = {
     assertValid: function(spec, value) {}
   },
   'flag': {
-    parent: 'string',
+    parent: 'boolean',
     assertValid: function(spec, value) {}
   },
   'foreign-key': {
@@ -207,14 +207,17 @@ OKSchema.prototype.assertValid = function(data) {
   // Run through custom validators, they'll throw if invalid
   Object.keys(data).forEach(function(prop) {
     var type = spec[prop].type;
-    if (types[type]) {
-      types[type].assertValid(spec[prop], data[prop]);
-    // Also check if it's a number type and try to cast it
+
+    // Check if it's a number/boolean and try to cast it
     // otherwise pass and let mschema handle
-    } else if (type === 'number') {
+    if (type === 'number') {
       try {
         data[prop] = parseFloat(data[prop]);
       } catch (err) {}
+    } else if (type === 'flag') {
+      data[prop] = data[prop] == "true" ? true : false
+    } else if (types[type]) {
+      types[type].assertValid(spec[prop], data[prop]);
     }
   });
   var result = mschema.validate(data, this.toMschema());
diff --git a/examples/db.json b/examples/db.json
index da7c19a..8805342 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -207,7 +207,8 @@
           "title": "clouds35.mp3",
           "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png"
         }
-      ]
+      ],
+      "flagged": true
     }
   ]
 }
\ No newline at end of file
diff --git a/examples/index.js b/examples/index.js
index 57bce4b..fe37954 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -24,6 +24,7 @@ var app  = okcms.createApp({
     test: {
       id: {type: 'string', hidden: true},
       title: {type: 'string'},
+      flagged: {type: 'flag'},
       media: {type: 'media-list'},
     }
   },
-- 
cgit v1.2.3-70-g09d2


From 180cf3eaa829fd04f759488d76641c4656caa245 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 11 Apr 2016 14:20:33 -0400
Subject: rewrite file upload code to use knox directly

---
 app/node_modules/okserver/index.js            |   2 +
 app/node_modules/okservices/oks3/index.js     | 136 +++++++++++++++-----------
 app/node_modules/okservices/oks3/package.json |   5 +-
 app/node_modules/okservices/oks3/upload.js    |  80 +++++++++++++++
 examples/index.js                             |   7 +-
 themes/okadmin/public/js/upload.js            |   2 +-
 6 files changed, 166 insertions(+), 66 deletions(-)
 create mode 100644 app/node_modules/okservices/oks3/upload.js

(limited to 'examples')

diff --git a/app/node_modules/okserver/index.js b/app/node_modules/okserver/index.js
index 3428565..302911d 100644
--- a/app/node_modules/okserver/index.js
+++ b/app/node_modules/okserver/index.js
@@ -52,6 +52,8 @@ function OKServer(options) {
    * other middleware.
    */
 
+  // Disable silly express header
+  app.disable('x-powered-by')
   // Serve user static files
   app.use(express.static(root));
   // Serve admin interface static files
diff --git a/app/node_modules/okservices/oks3/index.js b/app/node_modules/okservices/oks3/index.js
index 34c5840..c636308 100644
--- a/app/node_modules/okservices/oks3/index.js
+++ b/app/node_modules/okservices/oks3/index.js
@@ -1,5 +1,5 @@
-var skipper = require('skipper');
-var skipperS3 = require('skipper-s3')
+var upload = require("./upload")
+var multer = require('multer')
 
 // Hack to prevent this god-forsaken module from crashing our shit
 var d = require('domain').create()
@@ -20,7 +20,6 @@ function OKS3(options) {
   if (!options.s3.audio) options.s3.audio = {}
   if (!options.s3.video) options.s3.video = {}
 
-/*
   // TODO: maxBytes property doesn't work - if you upload a large file,
   // it will just hang until you reload the browser, and then CRASH.
   
@@ -34,85 +33,104 @@ function OKS3(options) {
     if (! ('maxbytes' in options.s3.audio))
       options.s3.audio.maxbytes = options.s3.maxbytes
   }
-*/
-  if (options.s3.image.preserveFilename)
-    options.s3.image.preserveFilename = preserveFilename
-  if (options.s3.video.preserveFilename)
-    options.s3.video.preserveFilename = preserveFilename
-  if (options.s3.audio.preserveFilename)
-    options.s3.audio.preserveFilename = preserveFilename
+  if (typeof options.s3.image.allowed !== "boolean")
+    options.s3.image.allowed = true
+  if (typeof options.s3.video.allowed !== "boolean")
+    options.s3.video.allowed = false
+  if (typeof options.s3.audio.allowed !== "boolean")
+    options.s3.audio.allowed = false
+
+  upload.init({
+    key: options.s3.key,
+    secret: options.s3.secret,
+    bucket: options.s3.bucket,
+  })
 
   var express = options.express;
 
   var router = express.Router();
 
-  router.use(skipper());
+  var mult = multer()
 
-  // req should have a method `file` on it which is
-  // provided by skipper. Use that to do AWS stuff
-  router.post('/image', function(req, res) {
+  router.post('/image', mult.single('image'), function(req, res) {
     d.run(function () {
-      var skip = req.file('image').upload({
-        adapter: skipperS3,
-        key: options.s3.key,
-        secret: options.s3.secret,
-        bucket: options.s3.bucket,
+
+      if (! options.s3.image.allowed) {
+        return res.status(500).json({ error: "Image uploading not permitted" })
+      }
+
+      upload.put({
+        file: req.file,
+        preserveFilename: options.s3.image.preserveFilename,
         dirname: options.s3.dirname,
-        // maxBytes: options.s3.image.maxbytes,
-        saveAs: options.s3.image.preserveFilename,
-        headers: {
-          'x-amz-acl': 'public-read'
+        types: {
+          'image/gif': 'gif',
+          'image/jpeg': 'jpg',
+          'image/jpg': 'jpg',
+          'image/png': 'png',
+        },
+        unacceptable: function(err){
+          res.json({ error: err })
+        },
+        success: function(url){
+          res.json({ url: url })
         }
-      }, function (err, uploadedFiles) {
-        if (err) return res.status(500).send(err)
-        res.json(uploadedFiles);
-      });
+      })
+
    });
   });
 
-  router.post('/audio', function(req, res) {
+  router.post('/audio', mult.single('audio'), function(req, res) {
     d.run(function () {
-      if (! options.s3.allowAudioUploads) {
-        return res.status(500).json({ error: "audio uploading not permitted" })
+
+      if (! options.s3.image.allowed) {
+        return res.status(500).json({ error: "Audio uploading not permitted" })
       }
-      req.file('audio').upload({
-        adapter: skipperS3,
-        key: options.s3.key,
-        secret: options.s3.secret,
-        bucket: options.s3.bucket,
+
+      upload.put({
+        file: req.file,
+        preserveFilename: options.s3.audio.preserveFilename,
         dirname: options.s3.dirname,
-        // maxBytes: options.s3.audio.maxbytes,
-        saveAs: options.s3.audio.preserveFilename,
-        headers: {
-          'x-amz-acl': 'public-read'
+        types: {
+          'audio/mp3': 'mp3',
+          'audio/mpeg': 'mp3',
+          'audio/wav': 'wav',
+          'audio/flac': 'flac',
+        },
+        unacceptable: function(err){
+          res.json({ error: err })
+        },
+        success: function(url){
+          res.json({ url: url })
         }
-      }, function (err, uploadedFiles) {
-        if (err) res.status(500).send(err)
-        res.json(uploadedFiles);
-      });
+      })
+
     });
   });
 
-  router.post('/video', function(req, res) {
+  router.post('/video', mult.single('video'), function(req, res) {
     d.run(function () {
-      if (! options.s3.allowVideoUploads) {
-        return res.status(500).json({ error: "video uploading not permitted" })
+
+      if (! options.s3.image.allowed) {
+        return res.status(500).json({ error: "Video uploading not permitted" })
       }
-      req.file('video').upload({
-        adapter: skipperS3,
-        key: options.s3.key,
-        secret: options.s3.secret,
-        bucket: options.s3.bucket,
+
+      upload.put({
+        file: req.file,
+        preserveFilename: options.s3.video.preserveFilename,
         dirname: options.s3.dirname,
-        // maxBytes: options.s3.video.maxbytes,
-        saveAs: options.s3.video.preserveFilename,
-        headers: {
-          'x-amz-acl': 'public-read'
+        types: {
+          'video/mp4': 'mp4',
+          'video/webm': 'webm',
+        },
+        unacceptable: function(err){
+          res.json({ error: err })
+        },
+        success: function(url){
+          res.json({ url: url })
         }
-      }, function (err, uploadedFiles) {
-        if (err) res.status(500).send(err)
-        res.json(uploadedFiles);
-      });
+      })
+
     });
   });
   
diff --git a/app/node_modules/okservices/oks3/package.json b/app/node_modules/okservices/oks3/package.json
index 19a2d2a..35bb4ce 100644
--- a/app/node_modules/okservices/oks3/package.json
+++ b/app/node_modules/okservices/oks3/package.json
@@ -9,7 +9,8 @@
   "author": "OKFocus",
   "license": "None",
   "dependencies": {
-    "skipper": "^0.5.9",
-    "skipper-s3": "^0.5.6"
+    "knox": "^0.9.2",
+    "multer": "^1.1.0",
+    "node-uuid": "^1.4.7",
   }
 }
diff --git a/app/node_modules/okservices/oks3/upload.js b/app/node_modules/okservices/oks3/upload.js
new file mode 100644
index 0000000..6b16d61
--- /dev/null
+++ b/app/node_modules/okservices/oks3/upload.js
@@ -0,0 +1,80 @@
+
+var	knox = require('knox')
+var moment = require('moment')
+var uuid = require('node-uuid')
+
+var s3
+
+var acceptableuploadTypes = {
+	'image/gif': 'gif',
+	'image/jpeg': 'jpg',
+	'image/jpg': 'jpg',
+	'image/png': 'png',
+}
+
+module.exports = {}
+
+module.exports.init = function (opt){
+  s3 = knox.createClient({
+    key: opt.key,
+    secret: opt.secret,
+    bucket: opt.bucket,
+  })
+}
+
+module.exports.put = function (opt) {
+	var filename
+	var err
+	var now = new Date()
+
+	var file = opt.file
+
+  var types = opt.types || acceptableuploadTypes
+	var extension = types[file.mimetype]
+	
+	if (opt.preserveFilename) {
+	  filename = file.originalname
+	}
+	else {
+    filename = uuid.v1() + "." + extension;
+	}
+
+	var remote_path = "/" + opt.dirname + "/" + filename
+
+	if (! extension) {
+		err = "Unacceptable filetype."
+	}
+	else if (opt.maxSize && file.size > opt.maxSize) {
+		err = "File too large. Uploads can be a maximum of " + opt.maxSize + " bytes."
+	}
+
+	if (err) {
+		console.error(">>>", err)
+		opt.unacceptable && opt.unacceptable(err)
+		return
+	}
+
+	opt.acceptable && opt.acceptable(err)
+	
+	// console.log("upload >", remote_path)
+	s3.putBuffer(file.buffer, remote_path, {
+		'Content-Length': file.size,
+		'Content-Type': file.mimetype,
+		'x-amz-acl': 'public-read'
+	}, function(err, s3res) {
+		if (err || s3res.statusCode !== 200) {
+			console.error(err);
+			if (s3res && s3res.resume) {
+				s3res.resume()
+			}
+			return;
+		}
+
+		var file_url = s3res.url || s3res.req.url		
+
+		opt.success && opt.success(file_url)
+	}).on('error', function(err, s3res){
+		console.error(err)
+		s3res && s3res.resume && s3res.resume()
+	})
+}
diff --git a/examples/index.js b/examples/index.js
index fe37954..31ae8d2 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -42,10 +42,9 @@ var app  = okcms.createApp({
       secret: process.env.S3_SECRET,
       bucket: process.env.S3_BUCKET,
       dirname: "okcms-example",
-      // TODO: maxbytes stuff isn't working, need to change underlying module
-      image: { preserveFilename: false, maxbytes: 20000 },
-      video: { preserveFilename: true, maxbytes: 0 },
-      audio: { preserveFilename: true, maxbytes: 150000000 },
+      image: { allowed: true, preserveFilename: false, maxbytes: 2*1024*1024 },
+      video: { allowed: true, preserveFilename: true, maxbytes: 200*1024*1024 },
+      audio: { allowed: true, preserveFilename: true, maxbytes: 100*1024*1024 },
     }
   },
 
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index 44a34b5..da23b1b 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -167,7 +167,7 @@ OKUpload.prototype.success = function(data){
     console.log(data.error)
     return
   }
-  var url = data[0].extra.Location.replace(/%2F/, '\/')
+  var url = data.url
   console.log(url)
   this.parse(url)
 }
-- 
cgit v1.2.3-70-g09d2


From fa343212514f1e6f975e5cf5957e440555afb815 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 14 Apr 2016 14:14:34 -0400
Subject: example services

---
 examples/index.js                   |  9 +++++++
 examples/lib/okdumpfm/index.js      | 39 ++++++++++++++++++++++++++++++
 examples/lib/okdumpfm/package.json  | 14 +++++++++++
 examples/lib/okexample/index.js     | 48 +++++++++++++++++++++++++++++++++++++
 examples/lib/okexample/package.json | 11 +++++++++
 5 files changed, 121 insertions(+)
 create mode 100644 examples/lib/okdumpfm/index.js
 create mode 100644 examples/lib/okdumpfm/package.json
 create mode 100644 examples/lib/okexample/index.js
 create mode 100644 examples/lib/okexample/package.json

(limited to 'examples')

diff --git a/examples/index.js b/examples/index.js
index 31ae8d2..3bbed28 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -45,6 +45,15 @@ var app  = okcms.createApp({
       image: { allowed: true, preserveFilename: false, maxbytes: 2*1024*1024 },
       video: { allowed: true, preserveFilename: true, maxbytes: 200*1024*1024 },
       audio: { allowed: true, preserveFilename: true, maxbytes: 100*1024*1024 },
+    },
+    
+    example: {
+      lib: require("./lib/okexample"),
+      stuff: "things",
+    },
+    
+    dumpfm: {
+      lib: require("./lib/okdumpfm"),
     }
   },
 
diff --git a/examples/lib/okdumpfm/index.js b/examples/lib/okdumpfm/index.js
new file mode 100644
index 0000000..4dc5461
--- /dev/null
+++ b/examples/lib/okdumpfm/index.js
@@ -0,0 +1,39 @@
+var request = require('request')
+
+/**
+ * Example service which queries the Dump search.
+ */
+function OKDumpfm (options) {
+  if (!(this instanceof OKDumpfm)) return new OKDumpfm(options)
+  options = options || {}
+  if (!options.express)
+    throw new Error('Express not provided to OKDumpfm');
+
+  var express = options.express
+  var router = express.Router()
+
+  router.get('*', function (req, res) {
+    var query = req.query.q
+    request('http://dump.fm/cmd/search/' + query, function (err, response, body) {
+      if (err || response.statusCode !== 200) {
+        res.status(response.statusCode)
+        res.send(err)
+      } else {
+        res.set('Content-Type', 'application/json; charset=utf-8')
+        res.send(body)
+      }
+    })
+  })
+
+  router.post('*', function (req, res) {
+    throw new Error('OKDumpfm POST requests not implemented')
+  })
+
+  this._router = router
+}
+
+OKDumpfm.prototype.middleware = function () {
+  return this._router
+}
+
+module.exports = OKDumpfm
diff --git a/examples/lib/okdumpfm/package.json b/examples/lib/okdumpfm/package.json
new file mode 100644
index 0000000..17bcba2
--- /dev/null
+++ b/examples/lib/okdumpfm/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "okdumpfm",
+  "version": "1.0.0",
+  "description": "service to query the dump search API",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "okfocus <frontdesk@okfoc.us>",
+  "license": "LNT",
+  "dependencies": {
+    "request": "^2.71.0"
+  }
+}
diff --git a/examples/lib/okexample/index.js b/examples/lib/okexample/index.js
new file mode 100644
index 0000000..b614697
--- /dev/null
+++ b/examples/lib/okexample/index.js
@@ -0,0 +1,48 @@
+
+/**
+ * Example service to show how these things should be set up.
+ *
+ * Services should be added to index.js in the proper area,
+ * with any configuration parameters that you want passed in:
+ *
+ *   services: {
+ *     example: {
+ *       lib: require("./lib/okexample"),
+ *       stuff: "things",
+ *     }
+ *   },
+ *
+ * The service will be mounted on /_services/example
+ *
+ * This binds to route '*' but you can specify e.g. "/thing",
+ * and it will be mounted on /_services/example/thing
+ */
+
+function OKExample (options) {
+  if (!(this instanceof OKExample)) return new OKExample(options)
+  options = options || {}
+  if (!options.express)
+    throw new Error('Express not provided to OKDumpfm');
+  if (!options.config)
+    throw new Error('Configuration not provided to OKDumpfm');
+
+  var express = options.express
+  var router = express.Router()
+  var config = options.config
+
+  router.get('*', function (req, res) {
+    res.send(config.stuff)
+  })
+
+  router.post('*', function (req, res) {
+    throw new Error('OKExample POST requests not implemented')
+  })
+
+  this._router = router
+}
+
+OKExample.prototype.middleware = function () {
+  return this._router
+}
+
+module.exports = OKExample
diff --git a/examples/lib/okexample/package.json b/examples/lib/okexample/package.json
new file mode 100644
index 0000000..2b2a47c
--- /dev/null
+++ b/examples/lib/okexample/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "okexample",
+  "version": "1.0.0",
+  "description": "example service",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "okfocus <frontdesk@okfoc.us>",
+  "license": "LNT"
+}
-- 
cgit v1.2.3-70-g09d2


From c98560cca095ef27b909ac47baf843362bffb28d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 14 Apr 2016 20:32:08 -0400
Subject: OKWebhook module for receiving pushes from git

---
 app/index.js                                       |  7 ++
 app/node_modules/okservices/okwebhook/index.js     | 83 ++++++++++++++++++++++
 app/node_modules/okservices/okwebhook/package.json | 11 +++
 examples/index.js                                  | 11 ++-
 examples/lib/okexample/index.js                    |  5 +-
 5 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 app/node_modules/okservices/okwebhook/index.js
 create mode 100644 app/node_modules/okservices/okwebhook/package.json

(limited to 'examples')

diff --git a/app/index.js b/app/index.js
index 8c3abb9..48e713a 100644
--- a/app/index.js
+++ b/app/index.js
@@ -15,6 +15,7 @@ var OKServer = require('okserver');
 var OKSchema = require('okschema');
 var OKS3Service = require('okservices/oks3');
 var OKTwitterService = require('okservices/oktwitter')
+var OKWebhookService = require('okservices/okwebhook')
 
 require('dotenv').load();
 
@@ -110,6 +111,12 @@ function OKCMS(options) {
           credentials: config,
         });
         break
+      case 'webhook':
+        services.webhook = OKWebhookService({
+          express: express,
+          config: config,
+        });
+        break
       default:
         services[key] = config.lib({
           db: resourceCache,
diff --git a/app/node_modules/okservices/okwebhook/index.js b/app/node_modules/okservices/okwebhook/index.js
new file mode 100644
index 0000000..d04e662
--- /dev/null
+++ b/app/node_modules/okservices/okwebhook/index.js
@@ -0,0 +1,83 @@
+
+/**
+ * Service which will listen for a Github webhook, fired on push.
+ * This service can be used to rebuild / restart the app automatically
+ * when new code is pushed.
+ */
+
+var crypto = require('crypto')
+var exec = require('child_process').exec
+var path = require('path')
+
+function OKWebhook (options) {
+  if (!(this instanceof OKWebhook)) return new OKWebhook(options)
+  options = options || {}
+  if (!options.express)
+    throw new Error('Express not provided to OKWebhook');
+  if (!options.config)
+    throw new Error('Configuration not provided to OKWebhook');
+  if (options.config.active && !options.config.secret)
+    throw new Error('Github secret not provided to OKWebhook');
+  if (options.config.active && !options.config.command)
+    throw new Error('Build command not provided to OKWebhook');
+
+  var express = options.express
+  var router = express.Router()
+  var config = options.config
+  
+  var secret = config.secret
+  var command = config.command
+
+  router.get('/', function (req, res) {
+    res.send('GET not supported')
+  })
+
+  router.post('/', getBody, function (req, res) {
+    if (!config.active)
+      return
+    console.log("OKWebhook received push")
+    var event = req.headers['x-github-event']
+    if (event !== "push") {
+      return res.sendStatus(500)
+    }
+    var sig = req.headers['x-hub-signature'].split('=')[1]
+    var text = req.rawBody
+    var hash = crypto.createHmac('sha1', secret).update(text).digest('hex')
+    if (hash !== sig) {
+      return res.sendStatus(500)
+    }
+    res.sendStatus(200)
+    var cwd = path.dirname(command)
+    exec(command, { cwd: cwd }, function(err, stdout, stderr){
+      // may not fire if process was restarted..
+      console.log(process.env)
+      console.log(stdout)
+    })
+  })
+
+  function getBody (req, res, next) {
+    req.rawBody = ''
+    // req.setEncoding('utf8')
+
+    req.on('data', function(chunk) { 
+      req.rawBody += chunk
+    })
+
+    req.on('end', function() {
+      try {
+        req.body = JSON.parse(req.rawBody)
+      } catch (e) {
+        return res.sendStatus(500)
+      }
+      next()
+    })
+  }
+
+  this._router = router
+}
+
+OKWebhook.prototype.middleware = function () {
+  return this._router
+}
+
+module.exports = OKWebhook
diff --git a/app/node_modules/okservices/okwebhook/package.json b/app/node_modules/okservices/okwebhook/package.json
new file mode 100644
index 0000000..0436f01
--- /dev/null
+++ b/app/node_modules/okservices/okwebhook/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "okwebhook",
+  "version": "1.0.0",
+  "description": "webhook to receive pushes from github",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "okfocus <frontdesk@okfoc.us>",
+  "license": "LNT"
+}
diff --git a/examples/index.js b/examples/index.js
index 3bbed28..efbfc38 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -1,10 +1,13 @@
 var okcms = require('..');
 
+var isProduction = process.env.OK_PRODUCTION === 'true'
+
 var app  = okcms.createApp({
 
   root: 'public',
 
-  debug: true,
+  debug: !isProduction,
+  production: isProduction,
 
   schemas: {
     page: {
@@ -47,6 +50,12 @@ var app  = okcms.createApp({
       audio: { allowed: true, preserveFilename: true, maxbytes: 100*1024*1024 },
     },
     
+    webhook: {
+      active: false,
+      secret: 'test',
+      command: '/path/to/build.sh',
+    },
+    
     example: {
       lib: require("./lib/okexample"),
       stuff: "things",
diff --git a/examples/lib/okexample/index.js b/examples/lib/okexample/index.js
index b614697..04c5984 100644
--- a/examples/lib/okexample/index.js
+++ b/examples/lib/okexample/index.js
@@ -22,13 +22,14 @@ function OKExample (options) {
   if (!(this instanceof OKExample)) return new OKExample(options)
   options = options || {}
   if (!options.express)
-    throw new Error('Express not provided to OKDumpfm');
+    throw new Error('Express not provided to OKExample');
   if (!options.config)
-    throw new Error('Configuration not provided to OKDumpfm');
+    throw new Error('Configuration not provided to OKExample');
 
   var express = options.express
   var router = express.Router()
   var config = options.config
+  var db = options.db
 
   router.get('*', function (req, res) {
     res.send(config.stuff)
-- 
cgit v1.2.3-70-g09d2


From f76ec56f3d70da6359905e9b9666f581599edd4f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 21 Apr 2016 18:02:31 -0400
Subject: fix issue with single input fields, store image width/height

---
 examples/db.json                                | 24 ++++++++++++++++++++++-
 examples/index.js                               |  6 ++++++
 package.json                                    |  4 ++--
 themes/okadmin/public/css/main.css              |  4 +++-
 themes/okadmin/public/js/app.js                 | 26 ++++++++++++++++---------
 themes/okadmin/templates/partials/inputs.liquid | 18 +++++++++++++++--
 6 files changed, 67 insertions(+), 15 deletions(-)

(limited to 'examples')

diff --git a/examples/db.json b/examples/db.json
index 8805342..401bf26 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -153,6 +153,13 @@
       "id": "red",
       "title": "Red",
       "media": [
+        {
+          "uri": "https://ltho.s3.amazonaws.com/okcms-example/a91c4210-080c-11e6-8a7d-f30231d4ec26.png",
+          "width": "800",
+          "height": "800",
+          "caption": "",
+          "type": "image"
+        },
         {
           "uri": "http://asdf.us/",
           "caption": "ASDF",
@@ -160,7 +167,8 @@
         }
       ],
       "__index": 0,
-      "dateCreated": "Mon, 28 Mar 2016 23:02:45 GMT"
+      "dateCreated": "Mon, 28 Mar 2016 23:02:45 GMT",
+      "flagged": false
     },
     {
       "id": "blue",
@@ -210,5 +218,19 @@
       ],
       "flagged": true
     }
+  ],
+  "flour": [
+    {
+      "id": "test",
+      "title": "TEST",
+      "image": {
+        "uri": "https://ltho.s3.amazonaws.com/okcms-example/7be163d0-080b-11e6-8a7d-f30231d4ec26.png",
+        "caption": "",
+        "width": "800",
+        "height": "800"
+      },
+      "__index": 0,
+      "dateCreated": "Thu, 21 Apr 2016 21:52:44 GMT"
+    }
   ]
 }
\ No newline at end of file
diff --git a/examples/index.js b/examples/index.js
index efbfc38..341a50b 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -29,6 +29,11 @@ var app  = okcms.createApp({
       title: {type: 'string'},
       flagged: {type: 'flag'},
       media: {type: 'media-list'},
+    },
+    flour: {
+      id: {type: 'string', hidden: true},
+      title: {type: 'string'},
+      image: {type: 'image'},
     }
   },
 
@@ -37,6 +42,7 @@ var app  = okcms.createApp({
     { type: 'page', static: {id: 'contact'}},
     { type: 'bread' },
     { type: 'test' },
+    { type: 'flour' },
   ],
 
   services: {
diff --git a/package.json b/package.json
index 619b1c8..971efed 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "okcms",
-  "version": "0.1.33",
-  "description": "great",
+  "version": "0.1.34",
+  "description": "The dopest CMS on the planet.",
   "main": "app/index.js",
   "scripts": {
     "postinstall": "./install.sh",
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 15b8781..e539a71 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -291,7 +291,9 @@ button, input[type=submit] {
   height: 7em;
 }
 .main.resource form img {
-  width: 10em;
+  width: auto;
+  height: auto;
+  max-width: 10em;
   max-height: 6em;
   border: 0;
 }
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 59fc6ae..578d99f 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -9,8 +9,10 @@ var OKAdmin = function(){
       var url = media.url
       var imageTemplate = $(".image-template", parent).html()
       var $el = $(imageTemplate)
-      $el.find(".uri").val(url)
-      $el.find("img").attr("src", url)
+      $el.find(".uri").val(media.url)
+      $el.find(".image-width").val(media.width)
+      $el.find(".image-height").val(media.height)
+      $el.find("img").attr("src", media.url)
       $("ol", parent).prepend($el)
     }
   })
@@ -44,8 +46,10 @@ var OKAdmin = function(){
       var url = media.url
       var imageTemplate = $(".image-template", parent).html()
       var $el = $(imageTemplate)
-      $el.find(".uri").val(url)
-      $el.find("img").attr("src", url)
+      $el.find(".uri").val(media.url)
+      $el.find(".image-width").val(media.width)
+      $el.find(".image-height").val(media.height)
+      $el.find("img").attr("src", media.url)
       $("ol", parent).prepend($el)
     }
     uploader.addMedia = function(media){
@@ -103,11 +107,13 @@ var OKAdmin = function(){
     var $el = $(this)
     var uploader = new OKUpload ()
     uploader.bind( this )
-    uploader.add = function(url){
-      console.log(url)
-      $el.find(".uri").val(url)
+    uploader.add = function(media){
+      console.log(media)
+      $el.find(".uri").val(media.url)
       $el.find(".caption").val("")
-      $el.find("img").attr("src", url).show()
+      $el.find(".image-width").val(media.width)
+      $el.find(".image-height").val(media.height)
+      $el.find("img").attr("src", media.url).show()
       $el.addClass("loaded")
     }
   })
@@ -117,6 +123,8 @@ var OKAdmin = function(){
       var $el = $(this).closest(".image")
       $el.removeClass('loaded')
       $el.find(".uri").val("")
+      $el.find(".image-width").val("")
+      $el.find(".image-height").val("")
       $el.find(".caption").val("")
       $el.find("img").attr("src", "")
     }
@@ -141,7 +149,7 @@ var OKAdmin = function(){
       $el.parent().addClass("loaded")
       $el.parent().find(".video-type").val( media.type )
       $el.parent().find(".video-token").val( media.token )
-      $el.parent().find(".video-uri").val( media.uri )
+      $el.parent().find(".video-uri").val( media.url )
       $el.parent().find(".video-title").val( media.title )
       $el.parent().find(".video-thumb").val( media.thumbnail )
       $el.parent().find(".video-width").val( media.width )
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 373e580..e71f4ad 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -48,6 +48,8 @@
         <div class="image-element">
           <input class="uri" type="hidden" name="{{name}}[uri]" value="{{spec.value.uri}}">
           <textarea class="caption" name="{{name}}[caption]">{{spec.value.caption | escape}}</textarea>
+          <input type="hidden" name="{{name}}[width]" value="{{spec.value.width}}" class="image-width">
+          <input type="hidden" name="{{name}}[height]" value="{{spec.value.height}}" class="image-height">
           <img src="{{spec.value.uri}}" alt="{{spec.value.caption | escape}}">
           <button class="remove">x</button>
         </div>
@@ -154,6 +156,8 @@
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
             <textarea class="caption" name="{{name}}[][caption]"></textarea>
             <input type="hidden" name="{{name}}[][type]" value="image">
+            <input type="hidden" name="{{name}}[][width]" class="image-width" hidden>
+            <input type="hidden" name="{{name}}[][height]" class="image-height" hidden>
             <img>
             <button class="remove">x</button>
           </li>
@@ -165,8 +169,8 @@
             <input name="{{name}}[][type]" type="hidden" class="video-type" hidden>
             <input name="{{name}}[][token]" type="hidden" class="video-token" hidden>
             <input name="{{name}}[][uri]" type="hidden" class="video-uri" hidden>
-            <input name="{{name}}[][width]" value="{{image.width}}" type="hidden" class="video-width" hidden>
-            <input name="{{name}}[][height]" value="{{image.height}}" type="hidden" class="video-height" hidden>
+            <input name="{{name}}[][width]" type="hidden" class="video-width" hidden>
+            <input name="{{name}}[][height]" type="hidden" class="video-height" hidden>
             <label>Caption</label>
             <input name="{{name}}[][title]" type="text" class="video-title">
             <label>Thumbnail</label>
@@ -249,6 +253,8 @@
               <li class="image-element">
                 <label>Caption</label>
                 <input type="hidden" name="{{name}}[][uri]" value="{{image.uri}}">
+                <input name="{{name}}[{{forloop.index0}}][width]" value="{{image.width}}" type="hidden" class="image-width" hidden>
+                <input name="{{name}}[{{forloop.index0}}][height]" value="{{image.height}}" type="hidden" class="image-height" hidden>
                 <textarea class="caption" name="{{name}}[][caption]">{{image.caption | escape}}</textarea>
                 <input type="hidden" name="{{name}}[][type]" value="image">
                 <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
@@ -271,6 +277,8 @@
         <script type="text/html" class="image-template">
           <li class="image-element">
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
+            <input type="hidden" name="{{name}}[][width]" class="image-width" hidden>
+            <input type="hidden" name="{{name}}[][height]" class="image-height" hidden>
             <textarea class="caption" name="{{name}}[][caption]"></textarea>
             <img>
             <button class="remove">x</button>
@@ -281,6 +289,8 @@
           {% for image in spec.value %}
             <li class="image-element">
               <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
+              <input type="hidden" name="{{name}}[{{forloop.index0}}][width]" value="{{image.width}}" class="image-width">
+              <input type="hidden" name="{{name}}[{{forloop.index0}}][height]" value="{{image.height}}" class="image-height">
               <textarea class="caption" name="{{name}}[{{forloop.index0}}][caption]">{{image.caption | escape}}</textarea>
               <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
               <button class="remove">x</button>
@@ -303,6 +313,8 @@
             <img>
             <button class="remove">x</button>
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
+            <input type="hidden" name="{{name}}[][width]" class="image-width">
+            <input type="hidden" name="{{name}}[][height]" class="image-height">
             <input class="caption" name="{{name}}[][label]" placeholder="Name">
             <input class="caption" name="{{name}}[][caption]" placeholder="Email">
           </li>
@@ -314,6 +326,8 @@
               <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
               <button class="remove">x</button>
               <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
+              <input type="hidden" name="{{name}}[{{forloop.index0}}][width]" value="{{image.width}}" class="image-width">
+              <input type="hidden" name="{{name}}[{{forloop.index0}}][height]" value="{{image.height}}" class="image-height">
               <input class="caption" name="{{name}}[{{forloop.index0}}][label]" value="{{image.label | escape}}" placeholder="Name">
               <input class="caption" name="{{name}}[{{forloop.index0}}][caption]" value="{{image.caption | escape}}"  placeholder="Email">
             </li>
-- 
cgit v1.2.3-70-g09d2


From 210bbbc8d99685ee3b62e1086b5594144e7da0d6 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 17 Aug 2016 02:40:11 -0400
Subject: autoplay/loop checkbox on individual media fields

---
 examples/db.json                                |  6 ++++--
 themes/okadmin/public/css/main.css              | 19 +++++++++++++++++--
 themes/okadmin/public/js/parser.js              |  6 ++++++
 themes/okadmin/templates/partials/inputs.liquid |  8 ++++----
 4 files changed, 31 insertions(+), 8 deletions(-)

(limited to 'examples')

diff --git a/examples/db.json b/examples/db.json
index 401bf26..5fee377 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -196,7 +196,8 @@
           "width": "400",
           "height": "400",
           "title": "ee12b137-1c8a-400a-87e3-89cbee7b4da6.mp4",
-          "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png"
+          "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png",
+          "autoplay": "true"
         },
         {
           "type": "youtube",
@@ -205,7 +206,8 @@
           "width": "640",
           "height": "360",
           "title": "dëf lëöpär¨d¨¨¨¨<>~!@~#!:I!@",
-          "thumb": "http://i.ytimg.com/vi/y_35kXCQxN4/hqdefault.jpg"
+          "thumb": "http://i.ytimg.com/vi/y_35kXCQxN4/hqdefault.jpg",
+          "loop": "true"
         },
         {
           "type": "audio",
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 5fbb624..6a48e94 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -240,11 +240,26 @@ button, input[type=submit] {
   display: block;
   width: 25em;
 }
-.main.resource form .group.video .checkboxes label {
+.main.resource form .group .checkboxes,
+.main.resource form .group.loaded .checkboxes {
+  clear: left;
   display: block;
+  max-width: 250px;
+  padding-top: 5px;
+}
+.main.resource form .group .checkboxes input.flag,
+.main.resource form .group.loaded .checkboxes input.flag {
+  display: inline-block;
+  max-width: 20px;
+  float: none;
 }
-.main.resource form .group.video .checkboxes label {
+.main.resource form .group .checkboxes label,
+.main.resource form .group.loaded .checkboxes label {
   display: inline-block;
+  float: none;
+  width: 70px;
+  margin: 0;
+  text-align: left;
 }
 .main.resource form .group.loaded label {
   display: block;
diff --git a/themes/okadmin/public/js/parser.js b/themes/okadmin/public/js/parser.js
index 4ab9a6c..81bba2d 100644
--- a/themes/okadmin/public/js/parser.js
+++ b/themes/okadmin/public/js/parser.js
@@ -100,6 +100,8 @@ var Parser = {
 						token: id,
 						thumbnail: thumb,
 						title: res.snippet.title,
+						autoplay: false,
+						loop: false,
 						width: 640,
 						height: 360,
 					})
@@ -133,6 +135,8 @@ var Parser = {
 						title: res.title,
 						width: res.width,
 						height: res.height,
+						autoplay: false,
+						loop: false,
 					})
 				}
 			})
@@ -257,6 +261,8 @@ var Parser = {
                   title: stripHTML(post['video-caption']),
                   width: 640,
                   height: 360,
+                  autoplay: false,
+                  loop: false,
                 }
                 media_list.push(media)
               }
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index e83bec0..f093a0d 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -176,9 +176,9 @@
             <label>Thumbnail</label>
             <input name="{{name}}[][thumb]" type="text" class="video-thumb">
             <span class="checkboxes">
-              <input name="{{name}}[][autoplay]" value="{{image.autoplay}}" type="checkbox" class="video-autoplay">
+              <input name="{{name}}[][autoplay]" value="{{image.autoplay}}" type="checkbox" class="video-autoplay flag">
               <label>Autoplay</label>
-              <input name="{{name}}[][loop]" value="{{image.loop}}" type="checkbox" class="video-loop">
+              <input name="{{name}}[][loop]" value="{{image.loop}}" type="checkbox" class="video-loop flag">
               <label>Loop</label>
             </span>
             </div>
@@ -228,9 +228,9 @@
                 <label>Thumbnail</label>
                 <input name="{{name}}[{{forloop.index0}}][thumb]" value="{{image.thumb}}" type="text" class="video-thumb">
                 <span class="checkboxes">
-                  <input name="{{name}}[{{forloop.index0}}][autoplay]" value="{{image.autoplay}}" type="checkbox" class="video-autoplay">
+                  <input name="{{name}}[{{forloop.index0}}][autoplay]" value="true" {% if image.autoplay %}checked="true"{% endif %} type="checkbox" class="flag video-autoplay">
                   <label>Autoplay</label>
-                  <input name="{{name}}[{{forloop.index0}}][loop]" value="{{image.loop}}" type="checkbox" class="video-loop">
+                  <input name="{{name}}[{{forloop.index0}}][loop]" value="true" {% if image.loop %}checked="true"{% endif %} type="checkbox" class="flag video-loop">
                   <label>Loop</label>
                 </span>
                 </div>
-- 
cgit v1.2.3-70-g09d2


From f849c7dc08064eaa1ee1265b2d06a9c527adf66f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 17 Aug 2016 03:29:17 -0400
Subject: fix weird box ish

---
 examples/db.json                                |  4 +++-
 examples/index.js                               |  5 +++--
 themes/okadmin/public/js/app.js                 |  9 ++++-----
 themes/okadmin/templates/partials/inputs.liquid | 16 ++++++++--------
 4 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'examples')

diff --git a/examples/db.json b/examples/db.json
index 5fee377..5f65c21 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -197,7 +197,8 @@
           "height": "400",
           "title": "ee12b137-1c8a-400a-87e3-89cbee7b4da6.mp4",
           "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png",
-          "autoplay": "true"
+          "autoplay": "true",
+          "loop": "false"
         },
         {
           "type": "youtube",
@@ -207,6 +208,7 @@
           "height": "360",
           "title": "dëf lëöpär¨d¨¨¨¨<>~!@~#!:I!@",
           "thumb": "http://i.ytimg.com/vi/y_35kXCQxN4/hqdefault.jpg",
+          "autoplay": "false",
           "loop": "true"
         },
         {
diff --git a/examples/index.js b/examples/index.js
index 341a50b..fa3281e 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -1,6 +1,7 @@
 var okcms = require('..');
 
 var isProduction = process.env.OK_PRODUCTION === 'true'
+var port = process.env.PORT || 1337;
 
 var app  = okcms.createApp({
 
@@ -90,6 +91,6 @@ var app  = okcms.createApp({
     }
   }
 
-}).listen(1337);
+}).listen(port)
 
-console.log('Server listening at port 1337...');
+console.log('Server listening at port %d...', port);
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 578d99f..d65fcc6 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -232,12 +232,11 @@ var OKAdmin = function(){
 
     // Modify flags checkboxes such that unchecked ones return "false"
     // instead of nothing
-    $('.property .flag').each(function(i, el) {
-      var input = el.querySelector('input')
-      var checked = !!input.checked
+    $('.property input[type=checkbox]').each(function(i, el) {
+      var checked = !!el.checked
       if (!checked) {
-        $(input).attr('value', 'false')
-        input.checked = true
+        el.value = 'false'
+        el.setAttribute('checked', true)
       }
     })
     
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index f093a0d..bca397f 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -228,9 +228,9 @@
                 <label>Thumbnail</label>
                 <input name="{{name}}[{{forloop.index0}}][thumb]" value="{{image.thumb}}" type="text" class="video-thumb">
                 <span class="checkboxes">
-                  <input name="{{name}}[{{forloop.index0}}][autoplay]" value="true" {% if image.autoplay %}checked="true"{% endif %} type="checkbox" class="flag video-autoplay">
+                  <input name="{{name}}[{{forloop.index0}}][autoplay]" value="true" {% if image.autoplay == "true" %}checked="true"{% endif %} type="checkbox" class="flag video-autoplay">
                   <label>Autoplay</label>
-                  <input name="{{name}}[{{forloop.index0}}][loop]" value="true" {% if image.loop %}checked="true"{% endif %} type="checkbox" class="flag video-loop">
+                  <input name="{{name}}[{{forloop.index0}}][loop]" value="true" {% if image.loop == "true" %}checked="true"{% endif %} type="checkbox" class="flag video-loop">
                   <label>Loop</label>
                 </span>
                 </div>
@@ -254,19 +254,19 @@
               </li>
             {% elsif image.type and image.type == "link" %}
               <li class="link-element">
-                <input class="uri" type="text" name="{{name}}[][uri]" value="{{image.uri}}">
-                <textarea class="caption" name="{{name}}[][caption]" placeholder="Caption">{{image.caption | escape}}</textarea>
-                <input type="hidden" name="{{name}}[][type]" value="link">
+                <input class="uri" type="text" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
+                <textarea class="caption" name="{{name}}[{{forloop.index0}}][caption]" placeholder="Caption">{{image.caption | escape}}</textarea>
+                <input type="hidden" name="{{name}}[{{forloop.index0}}][type]" value="link">
                 <button class="remove">x</button>
               </li>
             {% else %}
               <li class="image-element">
                 <label>Caption</label>
-                <input type="hidden" name="{{name}}[][uri]" value="{{image.uri}}">
+                <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
                 <input name="{{name}}[{{forloop.index0}}][width]" value="{{image.width}}" type="hidden" class="image-width" hidden>
                 <input name="{{name}}[{{forloop.index0}}][height]" value="{{image.height}}" type="hidden" class="image-height" hidden>
-                <textarea class="caption" name="{{name}}[][caption]">{{image.caption | escape}}</textarea>
-                <input type="hidden" name="{{name}}[][type]" value="image">
+                <textarea class="caption" name="{{name}}[{{forloop.index0}}][caption]">{{image.caption | escape}}</textarea>
+                <input type="hidden" name="{{name}}[{{forloop.index0}}][type]" value="image">
                 <img src="{{image.uri}}" alt="{{image.caption | strip_html}}">
                 <button class="remove">x</button>
               </li>
-- 
cgit v1.2.3-70-g09d2


From a3fff2bf629b3d33d327b81f2e2699a1840a27bd Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 17 Aug 2016 03:40:36 -0400
Subject: js ish

---
 examples/db.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'examples')

diff --git a/examples/db.json b/examples/db.json
index 5f65c21..454db14 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -189,6 +189,16 @@
       "__index": 1,
       "dateCreated": "Tue, 05 Apr 2016 15:17:57 GMT",
       "media": [
+        {
+          "uri": "http://asdf.us/z/",
+          "caption": "",
+          "type": "link"
+        },
+        {
+          "uri": "http://asdf.us/",
+          "caption": "",
+          "type": "link"
+        },
         {
           "type": "video",
           "token": "https://ltho.s3.amazonaws.com/ee12b137-1c8a-400a-87e3-89cbee7b4da6.mp4",
-- 
cgit v1.2.3-70-g09d2


From ef64682b40be479ecff91c19d406fff10f9cc688 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 2 Sep 2016 11:29:01 -0400
Subject: rename captioned-image-list to gallery, closes #3

---
 app/node_modules/okschema/index.js              | 13 +++++++++++++
 examples/index.js                               |  4 ++--
 themes/okadmin/templates/partials/inputs.liquid |  4 ++--
 3 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'examples')

diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index b3d4cc2..0048fc5 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -48,6 +48,14 @@ var types = {
     }],
     assertValid: function(spec, value) {}
   },
+  'gallery': {
+    isArray: true,
+    parent: [{
+      uri: { type: 'string' }, // TODO Implement URI type
+      caption: { type: 'string' }
+    }],
+    assertValid: function(spec, value) {}
+  },
   // Special type for resource meta information
   'meta': {
     parent: 'string',
@@ -78,6 +86,11 @@ var types = {
     parent: [],
     assertValid: function(spec, value) {}
   },
+  'media': {
+    isArray: true,
+    parent: [],
+    assertValid: function(spec, value) {}
+  },
   'double-captioned-image-list': {
     isArray: true,
     parent: [],
diff --git a/examples/index.js b/examples/index.js
index fa3281e..711246a 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -23,13 +23,13 @@ var app  = okcms.createApp({
       description: {type: 'text'},
       color: {type: 'enum', options: ["red","blue","green"]},
       video: {type: 'video'},
-      images: {type: 'captioned-image-list'}
+      images: {type: 'gallery'}
     },
     test: {
       id: {type: 'string', hidden: true},
       title: {type: 'string'},
       flagged: {type: 'flag'},
-      media: {type: 'media-list'},
+      media: {type: 'media'},
     },
     flour: {
       id: {type: 'string', hidden: true},
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index bca397f..0fee61e 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -140,7 +140,7 @@
 
       </div>
 
-    {% elsif type == 'media-list' %}
+    {% elsif type == 'media-list' or type == 'media' %}
       <div class="media-list group loaded">
         <div class="fields">
           <div class="add-image-button">
@@ -274,7 +274,7 @@
           {% endfor %}
         </ol>
       </div>
-    {% elsif type == 'captioned-image-list' %}
+    {% elsif type == 'captioned-image-list' or type == 'gallery' %}
       <div class="image-list group loaded">
         <div class="fields">
           <div class="add-image-button">
-- 
cgit v1.2.3-70-g09d2


From 14094a0f9082e1eaf22d1864a52e21c69c965f3d Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 2 Sep 2016 12:40:37 -0400
Subject: show sort/+ buttons on groupby elements if resource is empty

---
 examples/db.json                      |  9 +++++++++
 examples/index.js                     | 22 ++++++++++++++++++++++
 themes/okadmin/templates/index.liquid |  4 +++-
 3 files changed, 34 insertions(+), 1 deletion(-)

(limited to 'examples')

diff --git a/examples/db.json b/examples/db.json
index 454db14..74f460f 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -246,5 +246,14 @@
       "__index": 0,
       "dateCreated": "Thu, 21 Apr 2016 21:52:44 GMT"
     }
+  ],
+  "card": [],
+  "stack": [
+    {
+      "id": "demo",
+      "title": "Demo",
+      "__index": 0,
+      "dateCreated": "Fri, 02 Sep 2016 16:20:27 GMT"
+    }
   ]
 }
\ No newline at end of file
diff --git a/examples/index.js b/examples/index.js
index 711246a..f1fabfa 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -10,6 +10,17 @@ var app  = okcms.createApp({
   debug: !isProduction,
   production: isProduction,
 
+  admin: {
+    dashboard: {
+      resources: {
+        card: {
+          groupBy: 'stack',
+          descending: true
+        }
+      }
+    },
+  },
+
   schemas: {
     page: {
       id: {type: 'string'},
@@ -35,6 +46,15 @@ var app  = okcms.createApp({
       id: {type: 'string', hidden: true},
       title: {type: 'string'},
       image: {type: 'image'},
+    },
+    card: {
+      id: {type: 'string', hidden: true},
+      title: {type: 'string'},
+      stack: {type: 'foreign-key', key: 'stack'},
+    },
+    stack: {
+      id: {type: 'string', hidden: true},
+      title: {type: 'string'},
     }
   },
 
@@ -44,6 +64,8 @@ var app  = okcms.createApp({
     { type: 'bread' },
     { type: 'test' },
     { type: 'flour' },
+    { type: 'card' },
+    { type: 'stack' },
   ],
 
   services: {
diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index c8c4aa5..ebb1bde 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -9,13 +9,15 @@
 
     <section class="resource-category root
         {% if resource.groupBy %} grouped {% endif %}
+        {% if resource.descending %} descending {% endif %}
         {{name}}">
       <form action="{{resource.type}}/__batch__/" method="POST">
         <header>
           <h2>{{name | capitalize}}</h2>
         </header>
         <input type="hidden" name="_method" value="PUT">
-        {% if resource.groupBy %}
+        {% assign resourceJSON = resource.data[0][resource.groupBy] | stringify %}
+        {% if resource.groupBy and resourceJSON != "{}" %}
           {% assign i = 0 %}
           {% for item in resource.data %}
             {% for pair in item[resource.groupBy] %}
-- 
cgit v1.2.3-70-g09d2


From 5052d51aa4c55eabc736b3c76a783db2f5208289 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 2 Sep 2016 12:48:43 -0400
Subject: fix sorting issue on groupBy elements

---
 app/node_modules/okadminview/index.js |  4 +++-
 examples/db.json                      | 44 ++++++++++++++++++++++++++++++++++-
 themes/okadmin/public/js/app.js       |  8 ++++++-
 3 files changed, 53 insertions(+), 3 deletions(-)

(limited to 'examples')

diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index bee1e1d..3a9056f 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -354,11 +354,13 @@ function fetchIndexTemplateData(meta, queries, dashboardConfig) {
           var spec = resource.spec;
           var dashConf = resourceConfig[resource.type] || {}
           var groupBy = dashConf.groupBy
+          var descending = dashConf.descending
           acc[key] = {
             type: resource.type,
             spec: spec,
             data: result,
-            groupBy: groupBy
+            groupBy: groupBy,
+            descending: descending,
           }
         }
         return acc
diff --git a/examples/db.json b/examples/db.json
index 74f460f..b6ab96b 100644
--- a/examples/db.json
+++ b/examples/db.json
@@ -247,13 +247,55 @@
       "dateCreated": "Thu, 21 Apr 2016 21:52:44 GMT"
     }
   ],
-  "card": [],
+  "card": [
+    {
+      "id": "1",
+      "title": "1",
+      "stack": "demo",
+      "__index": 5,
+      "dateCreated": "Fri, 02 Sep 2016 16:40:43 GMT"
+    },
+    {
+      "id": "2",
+      "title": "2",
+      "stack": "demo",
+      "__index": 4,
+      "dateCreated": "Fri, 02 Sep 2016 16:40:57 GMT"
+    },
+    {
+      "id": "3",
+      "title": "3",
+      "stack": "demo",
+      "__index": 3,
+      "dateCreated": "Fri, 02 Sep 2016 16:41:00 GMT"
+    },
+    {
+      "id": "4",
+      "title": "4",
+      "stack": "demo-2",
+      "__index": 1,
+      "dateCreated": "Fri, 02 Sep 2016 16:41:17 GMT"
+    },
+    {
+      "id": "5",
+      "title": "5",
+      "stack": "demo-2",
+      "__index": 2,
+      "dateCreated": "Fri, 02 Sep 2016 16:41:21 GMT"
+    }
+  ],
   "stack": [
     {
       "id": "demo",
       "title": "Demo",
       "__index": 0,
       "dateCreated": "Fri, 02 Sep 2016 16:20:27 GMT"
+    },
+    {
+      "id": "demo-2",
+      "title": "Demo #2",
+      "__index": 1,
+      "dateCreated": "Fri, 02 Sep 2016 16:41:10 GMT"
     }
   ]
 }
\ No newline at end of file
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index d65fcc6..9891298 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -303,10 +303,16 @@ var OKAdmin = function(){
   $(".resource-category.root").on("submit", "form", function(e) {
     var $parent = $(e.delegateTarget);
     var $resources = $parent.find(".resource-input")
+    var isDescending = $parent.hasClass("descending")
     $resources.each(function(index) {
       var $input = $(this);
       var parsed = JSON.parse($input.val());
-      parsed.__index = index;
+      if (isDescending) {
+        parsed.__index = $resources.length - index;
+      }
+      else {
+        parsed.__index = index;
+      }
       $input.val(JSON.stringify(parsed));
     })
   });
-- 
cgit v1.2.3-70-g09d2