From c4d8ee7c431b3511bf26da68e952808b51d663c7 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 9 Apr 2015 16:00:21 -0400
Subject: Add resource delete functionality to admin

---
 themes/okadmin/templates/resource.liquid | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/templates/resource.liquid b/themes/okadmin/templates/resource.liquid
index c0d348d..48e3ef2 100644
--- a/themes/okadmin/templates/resource.liquid
+++ b/themes/okadmin/templates/resource.liquid
@@ -14,6 +14,10 @@
     <label>&nbsp;</label><button type="submit">Save</button>
     <div class="clear"></div>
   </form>
+  <form action="." method="POST">
+    <input type="hidden" name="_method" value="DELETE">
+    <button type="submit">Delete</button>
+  </form>
 </section>
 
 {% include 'partials/tail' %}
-- 
cgit v1.2.3-70-g09d2


From c8eab703d468439a5b04dcfdeaf72db3eae4f966 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 9 Apr 2015 16:46:10 -0400
Subject: css and stuff

---
 install.sh                                    |  2 +-
 themes/okadmin/public/css/main.css            |  3 +++
 themes/okadmin/public/js/app.js               | 25 +++++++++++++++++--------
 themes/okadmin/public/js/upload.js            |  3 +--
 themes/okadmin/templates/partials/head.liquid |  4 ++--
 5 files changed, 24 insertions(+), 13 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/install.sh b/install.sh
index e0a43c4..15893aa 100755
--- a/install.sh
+++ b/install.sh
@@ -1,5 +1,5 @@
 cd app/node_modules ; for i in * ; do cd $i ; npm install; cd .. ; done ; cd ../..
 npm install
-cd examples
+cd site
 node index
 
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index a1e20a0..a01a85c 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -46,6 +46,9 @@ a:visited {
   color: rgba(0, 0, 0, 0.25);
   line-height: 50px;
 }
+.admin-header .breadcrumb b {
+  color: #333;
+}
 
 .admin-header .site-link {
   float: right;
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 4b8d98f..170b2ab 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -1,10 +1,20 @@
 var OKAdmin = function(){
   
-  OKUpload.bind()
+  // initialize our (single) ajax image uploader with an element and a template
+  OKUpload.bind( document.getElementById("file") )
   OKUpload.add = function(data){
     var url = data[0].extra.Location
     add_image(url)
   }
+
+  // also handle straight image urls
+  $("#add-image-url").keydown(pressEnter(function(e){
+    var url = $(this).val()
+    $(this).val("")
+    add_image(url)
+  })})
+
+  // clone and populate template
   function add_image(url){
     var imageTemplate = $("#captioned-image-template").html()
     var $el = $(imageTemplate)
@@ -12,21 +22,19 @@ var OKAdmin = function(){
     $el.find("img").attr("src", url)
     $(".captioned-image-list ol").append($el)
   }
+
+  // make the region sortable with drag-and-drop
   $(".captioned-image-list ol").sortable()
   $(".captioned-image-list ol").disableSelection()
-  
-  $("#add-image-url").keydown(pressEnter(function(e){
-    var url = $(this).val()
-    $(this).val("")
-    add_image(url)
-  })})
-  
+
+  // delete image
   $(document).on("click", ".remove-image", function(){
     if (confirm("Delete this image?")) {
       $(this).parent().remove()
     }
   })
   
+  // populate a video field with info from our url parser
   $(".video .url").keydown(pressEnter(function(){
     var $el = $(this)
     var url = $el.val()
@@ -40,6 +48,7 @@ var OKAdmin = function(){
     })
   }}))
   
+  // fix post indexing in list-driven inputs
   $("form").submit(function(){
     $(".image-element").each(function(index){
       $(this).find("input,textarea").each(function(){
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index d9fd5ed..1c9094c 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -2,8 +2,7 @@
 var OKUpload = {
 	action: "/_services/image",
 	
-	bind: function(){
-	  var el = document.getElementById("file")
+	bind: function(el){
 	  if (! el) return
 		el.addEventListener("change", OKUpload.handleFileSelect)
 	},
diff --git a/themes/okadmin/templates/partials/head.liquid b/themes/okadmin/templates/partials/head.liquid
index 3af59fd..c423584 100644
--- a/themes/okadmin/templates/partials/head.liquid
+++ b/themes/okadmin/templates/partials/head.liquid
@@ -2,12 +2,12 @@
 <html>
   <head>
     <meta charset="utf8">
-    <title>{{meta.title}}</title>
+    <title>TwoHustlers Admin {{meta.title}}</title>
     <link rel="stylesheet" href="{{meta.static}}/css/main.css">
   </head>
   <body>
     <header class="admin-header">
-      <span class="breadcrumb"><b>{{meta.title}}</b> Admin</span>
+      <span class="breadcrumb"><b>TwoHustlers{{meta.title}}</b> Admin</span>
       <a class="site-link" href="/">View Site</a>
     </header>
     <div class="container">
-- 
cgit v1.2.3-70-g09d2


From 7b7ac014579bafdb16e91a98f995f4fa7f55b4f1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 9 Apr 2015 17:17:00 -0400
Subject: alert when deleting posts

---
 site/db.json                             | 20 ++++++++++++++++++++
 themes/okadmin/public/css/main.css       |  5 +++++
 themes/okadmin/public/js/app.js          |  9 +++++++++
 themes/okadmin/templates/resource.liquid |  2 +-
 4 files changed, 35 insertions(+), 1 deletion(-)

(limited to 'themes/okadmin/templates')

diff --git a/site/db.json b/site/db.json
index 8107c6d..07085d4 100644
--- a/site/db.json
+++ b/site/db.json
@@ -28,6 +28,26 @@
           "caption": "CURABITUR BLANDIT TEMPUS PORTTITOR 4"
         }
       ]
+    },
+    {
+      "id": "TEST",
+      "title": "",
+      "shortname": "",
+      "description": "",
+      "video": {
+        "url": "",
+        "type": "",
+        "token": "",
+        "title": "",
+        "thumb": ""
+      },
+      "category": "retail",
+      "images": [
+        {
+          "uri": "https://ltho.s3.amazonaws.com/cb2698ea-9927-4ca9-972b-f227d46d25f3.png",
+          "caption": ""
+        }
+      ]
     }
   ],
   "advertising": [],
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index d2a4418..ad940e8 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -248,10 +248,15 @@ label {
 li.image-element:hover .remove-image {
   display: block;
 }
+li.image-element .remove-image:hover {
+	color: red;
+}
 .remove-image {
   display: none;
 }
 
+#delete_form button:hover { color: red }
+
 .template {
   display: none;
 }
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 8c85663..441172f 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -59,6 +59,15 @@ var OKAdmin = function(){
     })
   })
   
+  $("#delete_form").submit(function(e){
+  	if (confirm("Are you sure you want to delete this record?")) {
+  		return
+  	}
+  	else {
+  		e.preventDefault()
+  	}
+  })
+  
   function pressEnter(fn){
     return function(e){
       if (e.keyCode && e.keyCode !== 13) return
diff --git a/themes/okadmin/templates/resource.liquid b/themes/okadmin/templates/resource.liquid
index 48e3ef2..c321e8a 100644
--- a/themes/okadmin/templates/resource.liquid
+++ b/themes/okadmin/templates/resource.liquid
@@ -14,7 +14,7 @@
     <label>&nbsp;</label><button type="submit">Save</button>
     <div class="clear"></div>
   </form>
-  <form action="." method="POST">
+  <form action="." method="POST" id="delete_form">
     <input type="hidden" name="_method" value="DELETE">
     <button type="submit">Delete</button>
   </form>
-- 
cgit v1.2.3-70-g09d2


From 669d6aec9f812e4151bffbaa4f8830cf5764ee1e Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 9 Apr 2015 20:05:14 -0400
Subject: Set inital array indices in templates

---
 themes/okadmin/public/js/app.js                 | 2 +-
 themes/okadmin/templates/partials/inputs.liquid | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 441172f..4d13bb2 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -53,7 +53,7 @@ var OKAdmin = function(){
   $("form").submit(function(){
     $(".image-element").each(function(index){
       $(this).find("input,textarea").each(function(){
-        var field = $(this).attr("name").replace(/\[\]/, "[" + index + "]")
+        var field = $(this).attr("name").replace(/\[[0-9]*\]/, "[" + index + "]")
         $(this).attr("name", field)
       })
     })
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 7d23c9e..7cede76 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -43,8 +43,8 @@
         <ol>
           {% for image in spec.value %}
             <li class="image-element">
-              <input type="hidden" name="{{name}}[][uri]" value="{{image.uri}}">
-              <textarea class="caption" name="{{name}}[][caption]">{{image.caption}}</textarea>
+              <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}}">
               <button class="remove-image">♲</button>
             </li>
-- 
cgit v1.2.3-70-g09d2


From 00fd19b33ead56842daeb6f6a24735a8687f7744 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 9 Apr 2015 20:58:32 -0400
Subject: Implement flash messaging for admin success/error stuff

---
 app/node_modules/okadminview/index.js           | 25 +++++++++++++++++++++++--
 app/node_modules/okadminview/package.json       |  2 ++
 themes/okadmin/templates/index.liquid           |  2 ++
 themes/okadmin/templates/partials/errors.liquid | 10 ----------
 themes/okadmin/templates/partials/flash.liquid  | 14 ++++++++++++++
 themes/okadmin/templates/resource.liquid        |  2 +-
 themes/okadmin/templates/resource_new.liquid    |  2 +-
 7 files changed, 43 insertions(+), 14 deletions(-)
 delete mode 100644 themes/okadmin/templates/partials/errors.liquid
 create mode 100644 themes/okadmin/templates/partials/flash.liquid

(limited to 'themes/okadmin/templates')

diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index 05e2251..9e9aacf 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -2,6 +2,8 @@ var assign = require('object-assign');
 var cloneDeep = require('lodash.clonedeep');
 var bodyParser = require('body-parser');
 var methodOverride = require('method-override');
+var session = require('express-session');
+var flash = require('connect-flash');
 var Q = require('q');
 var pluralize = require('pluralize');
 var OKQuery = require('okquery');
@@ -75,6 +77,14 @@ function OKAdminView(options) {
       strict: app.get('strict routing')
     });
 
+    // Enable basic sessions for flash messages
+    router.use(session({
+      secret: 'okadmin',
+      resave: false,
+      saveUninitialized: false
+    }));
+    // Enable flash messaging
+    router.use(flash());
     // Parse form data
     router.use(bodyParser.urlencoded({extended: true}));
     // HTML forms only support POST and GET methods
@@ -91,7 +101,10 @@ function OKAdminView(options) {
 
     router.get('/', function readIndex(req, res, next) {
       fetchIndexTemplateData(meta, indexQueries).then(function(data) {
-        view.renderIndex(req, res, data);
+        view.renderIndex(req, res, assign(data, {
+          success: req.flash('success'),
+          errors: req.flash('errors')
+        }));
       }).fail(errorHandler(req, res));
     });
 
@@ -103,6 +116,8 @@ function OKAdminView(options) {
       } else {
         meta.get().then(function(metadata) {
           view.renderResourceNew(req, res, {
+            success: req.flash('success'),
+            errors: req.flash('errors'),
             meta: metadata,
             resource: {
               type: resource.type,
@@ -129,7 +144,10 @@ function OKAdminView(options) {
               if (!data) {
                 resourceMissingHandler(req, res)()
               } else {
-                view.renderResource(req, res, data);
+                view.renderResource(req, res, assign(data, {
+                  success: req.flash('success'),
+                  errors: req.flash('errors')
+                }));
               }
             }).fail(errorHandler(req, res));
       }
@@ -147,6 +165,7 @@ function OKAdminView(options) {
           try {
             resource.assertValid(data);
             resource.create(data).then(function(created) {
+              req.flash('success', 'Created ' + type);
               res.redirect(303, data[resource.idField]);
             }).fail(errorHandler(req, res));
           } catch (errors) {
@@ -170,6 +189,7 @@ function OKAdminView(options) {
           try {
             resource.assertValid(data);
             resource.update(id, data).then(function(updated) {
+              req.flash('success', 'Updated ' + type);
               res.redirect(303, '../' + updated[resource.idField]);
             }).fail(errorHandler(req, res));
           } catch (errors) {
@@ -189,6 +209,7 @@ function OKAdminView(options) {
       } else {
         meta.get().then(function(metadata) {
           resource.destroy(id).then(function() {
+            req.flash('success', 'Deleted ' + type);
             res.redirect(303, '../..');
           }).fail(errorHandler(req, res));
         }).fail(errorHandler(req, res));
diff --git a/app/node_modules/okadminview/package.json b/app/node_modules/okadminview/package.json
index c428645..4c6d11c 100644
--- a/app/node_modules/okadminview/package.json
+++ b/app/node_modules/okadminview/package.json
@@ -10,6 +10,8 @@
   "license": "None",
   "dependencies": {
     "body-parser": "^1.12.2",
+    "connect-flash": "^0.1.1",
+    "express-session": "^1.11.1",
     "lodash.clonedeep": "^3.0.0",
     "method-override": "^2.3.2",
     "object-assign": "^2.0.0",
diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index 95c64dd..a5b27e5 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -1,5 +1,7 @@
 {% include 'partials/head' %}
 
+{% include 'partials/flash' %}
+
 <section class="index main">
   {% for pair in resources %}
   {% assign name = pair[0] %}
diff --git a/themes/okadmin/templates/partials/errors.liquid b/themes/okadmin/templates/partials/errors.liquid
deleted file mode 100644
index cdb0b25..0000000
--- a/themes/okadmin/templates/partials/errors.liquid
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="errors">
-  {% for error in errors %}
-    <div class="error">
-      <div class="message">{{error.message}}</div>
-      <div class="assertion">
-        Expected {{error.expected}} but got {{error.actual}}
-      </div>
-    </div>
-  {% endfor %}
-</div>
diff --git a/themes/okadmin/templates/partials/flash.liquid b/themes/okadmin/templates/partials/flash.liquid
new file mode 100644
index 0000000..33b621b
--- /dev/null
+++ b/themes/okadmin/templates/partials/flash.liquid
@@ -0,0 +1,14 @@
+{% if success %}
+  <div class="success">
+    {{success}}
+  </div>
+{% elsif errors %}
+  <div class="errors">
+    {% for error in errors %}
+      <div class="error">
+        <div class="message">{{error.message}}</div>
+      </div>
+    {% endfor %}
+  </div>
+{% endif %}
+
diff --git a/themes/okadmin/templates/resource.liquid b/themes/okadmin/templates/resource.liquid
index c321e8a..53cd83e 100644
--- a/themes/okadmin/templates/resource.liquid
+++ b/themes/okadmin/templates/resource.liquid
@@ -1,6 +1,6 @@
 {% include 'partials/head' %}
 
-{% include 'partials/errors' %}
+{% include 'partials/flash' %}
 
 <nav>
   <a href="../..">Back</a>
diff --git a/themes/okadmin/templates/resource_new.liquid b/themes/okadmin/templates/resource_new.liquid
index c57dd83..8e80171 100644
--- a/themes/okadmin/templates/resource_new.liquid
+++ b/themes/okadmin/templates/resource_new.liquid
@@ -1,6 +1,6 @@
 {% include 'partials/head' %}
 
-{% include 'partials/errors' %}
+{% include 'partials/flash' %}
 
 <nav>
   <a href="../..">Back</a>
-- 
cgit v1.2.3-70-g09d2


From 3e96d59bfad722c77a3665971d0880623471f8c4 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 9 Apr 2015 21:01:25 -0400
Subject: Let the client decide what message to display

---
 app/node_modules/okadminview/index.js          | 6 +++---
 themes/okadmin/templates/partials/flash.liquid | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index 9e9aacf..b8ade49 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -165,7 +165,7 @@ function OKAdminView(options) {
           try {
             resource.assertValid(data);
             resource.create(data).then(function(created) {
-              req.flash('success', 'Created ' + type);
+              req.flash('success', {action: 'create'});
               res.redirect(303, data[resource.idField]);
             }).fail(errorHandler(req, res));
           } catch (errors) {
@@ -189,7 +189,7 @@ function OKAdminView(options) {
           try {
             resource.assertValid(data);
             resource.update(id, data).then(function(updated) {
-              req.flash('success', 'Updated ' + type);
+              req.flash('success', {action: 'update'});
               res.redirect(303, '../' + updated[resource.idField]);
             }).fail(errorHandler(req, res));
           } catch (errors) {
@@ -209,7 +209,7 @@ function OKAdminView(options) {
       } else {
         meta.get().then(function(metadata) {
           resource.destroy(id).then(function() {
-            req.flash('success', 'Deleted ' + type);
+            req.flash('success', {action: 'delete'});
             res.redirect(303, '../..');
           }).fail(errorHandler(req, res));
         }).fail(errorHandler(req, res));
diff --git a/themes/okadmin/templates/partials/flash.liquid b/themes/okadmin/templates/partials/flash.liquid
index 33b621b..9cd5bac 100644
--- a/themes/okadmin/templates/partials/flash.liquid
+++ b/themes/okadmin/templates/partials/flash.liquid
@@ -1,6 +1,6 @@
 {% if success %}
   <div class="success">
-    {{success}}
+    {{success.action}}
   </div>
 {% elsif errors %}
   <div class="errors">
-- 
cgit v1.2.3-70-g09d2


From 005bab899ab3badc7796e00a2bff90e3be1209d1 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 9 Apr 2015 21:24:48 -0400
Subject: Fix flash message error

---
 themes/okadmin/templates/partials/flash.liquid | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/templates/partials/flash.liquid b/themes/okadmin/templates/partials/flash.liquid
index 9cd5bac..1980ab5 100644
--- a/themes/okadmin/templates/partials/flash.liquid
+++ b/themes/okadmin/templates/partials/flash.liquid
@@ -1,14 +1,13 @@
-{% if success %}
-  <div class="success">
-    {{success.action}}
-  </div>
-{% elsif errors %}
-  <div class="errors">
-    {% for error in errors %}
-      <div class="error">
-        <div class="message">{{error.message}}</div>
-      </div>
-    {% endfor %}
-  </div>
-{% endif %}
+<div class="success">
+  {% for info in success %}
+    <div class="message">{{info.action}}</div>
+  {% endfor %}
+</div>
+<div class="errors">
+  {% for error in errors %}
+    <div class="error">
+      <div class="message">{{error.message}}</div>
+    </div>
+  {% endfor %}
+</div>
 
-- 
cgit v1.2.3-70-g09d2


From ed9e472456f7bbfb9b38e4517ea08de156e267fa Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 9 Apr 2015 22:26:17 -0400
Subject: Baby step towards orderable top level resources

---
 themes/okadmin/templates/index.liquid | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index a5b27e5..830fb2e 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -6,20 +6,23 @@
   {% for pair in resources %}
   {% assign name = pair[0] %}
   {% assign resource = pair[1] %}
-  {% assign spec = resource.spec %}
 
     <section class="resource-category {{name}}">
-      <header>
-        <h2>{{name | capitalize}}</h2>
-      </header>
-      <ul class="resource-list">
-      {% for data in resource.data %}
-        <li><a href="{{resource.type}}/{{data.id}}/">{{data.id}}</a></li>
-      {% endfor %}
-      </ul>
-      <footer>
-        <a class="add-new" href="{{resource.type}}/new/">+</a>
-      </footer>
+      <form action="{{resource.type}}/batch/" method="POST">
+        <header>
+          <h2>{{name | capitalize}}</h2>
+        </header>
+          <input type="hidden" name="_method" value="PUT">
+          <ul class="resource-list">
+          {% for data in resource.data %}
+            <li><a href="{{resource.type}}/{{data.id}}/">{{data.id}}</a></li>
+            <input type="hidden" name="{{resource.type}}[{{forloop.index0}}]" value='{{data | stringify}}'>
+          {% endfor %}
+          </ul>
+        <footer>
+          <a class="add-new" href="{{resource.type}}/new/">+</a>
+        </footer>
+      </form>
     </section>
 
   {% endfor %}
-- 
cgit v1.2.3-70-g09d2


From 3f346a970dd0823816a5ad2b0dc2b7749e99845c Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Fri, 10 Apr 2015 22:34:39 -0400
Subject: Hide certain inputs in template

---
 app/node_modules/okadminview/index.js           | 19 ++++++++++---------
 themes/okadmin/public/css/main.css              |  4 ++++
 themes/okadmin/templates/partials/inputs.liquid | 20 +++++++++++++-------
 3 files changed, 27 insertions(+), 16 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index 1668900..884c4b8 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -116,15 +116,11 @@ function OKAdminView(options) {
         errorHandler(req, res)(new Error('No such resource ' + type));
       } else {
         meta.get().then(function(metadata) {
-          view.renderResourceNew(req, res, {
+          var templateData = getResourceTemplateData(metadata, resource, {});
+          view.renderResourceNew(req, res, assign(templateData, {
             success: req.flash('success'),
             errors: req.flash('errors'),
-            meta: metadata,
-            resource: {
-              type: resource.type,
-              spec: resource.spec
-            }
-          });
+          }));
         }).fail(errorHandler(req, res));
       }
     });
@@ -228,10 +224,15 @@ function getResourceTemplateData(meta, resource, data) {
   meta = meta || {};
   resource = resource || {};
   data = data || {};
-  // Decorate spec with actual resource values
   var spec = Object.keys(resource.spec).reduce(function(cache, prop) {
     var value = data[prop];
-    cache[prop].value = value;
+    var propSpec = cache[prop];
+    // Decorate spec with actual resource values
+    propSpec.value = value;
+    // Some fields should not be shown to the user
+    if (propSpec.type === 'meta' || propSpec.static) {
+      propSpec.hidden = true;
+    }
     return cache;
   }, resource.spec);
   return {
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index ad940e8..73f9735 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -278,3 +278,7 @@ li.image-element .remove-image:hover {
 .clear {
   clear: both;
 }
+
+.hidden {
+  display: none;
+}
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 7cede76..99258f3 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -4,24 +4,28 @@
   {% assign type = spec.type %}
 
   <div class="property {{type}}">
-    <label for="{{name}}">{{name | capitalize}}</label>
+    <label
+      {% if spec.hidden %}
+        class="hidden"
+      {% endif %}
+      for="{{name}}">{{name | capitalize}}</label>
 
     {% if type == 'string' %}
       <input
-        {% if spec.disabled %}
-          disabled="true"
+        {% if spec.hidden %}
+          class="hidden"
         {% endif %}
           name="{{name}}" type="text" value="{{spec.value}}">
     {% elsif type == 'text' %}
       <textarea
-        {% if spec.disabled %}
-          disabled="true"
+        {% if spec.hidden %}
+          class="hidden"
         {% endif %}
         name="{{name}}">{{spec.value}}</textarea>
     {% elsif type == 'enum' %}
       <select
-        {% if spec.disabled %}
-          disabled="true"
+        {% if spec.hidden %}
+          class="hidden"
         {% endif %}
         name="{{name}}">
         {% for option in spec.options %}
@@ -64,6 +68,8 @@
           </li>
         </script>
       </div>
+    {% elsif type == 'meta' %}
+      <input class="hidden" type="hidden" name="{{name}}" value="{{spec.value}}">
     {% else %}
       <p><pre style="color: red">Admin template doesn't support '{{type}}' properties!</pre></p>
     {% endif %}
-- 
cgit v1.2.3-70-g09d2


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 ++++++++++++++++++++++-----
 themes/okadmin/public/css/main.css           | 65 ++++++++++++++++++++++++----
 themes/okadmin/public/js/app.js              | 43 +++++++++++++++++-
 themes/okadmin/templates/index.liquid        | 20 ++++++---
 themes/okadmin/templates/resource.liquid     |  2 +-
 themes/okadmin/templates/resource_new.liquid |  2 +-
 6 files changed, 168 insertions(+), 27 deletions(-)

(limited to 'themes/okadmin/templates')

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
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 73f9735..3762fd4 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -14,11 +14,12 @@ html, body {
   background-attachment: scroll;
 }
 
-ul {
+ul, ol {
   padding: 0;
   list-style: none;
 }
 
+.main.index .resource-category button,
 a {
   color: #A200FF;
   text-decoration: none;
@@ -26,6 +27,7 @@ a {
   text-transform: uppercase;
 }
 
+.main.index .resource-category button:hover,
 a:hover {
   border-bottom: 1px solid #A200FF;
 }
@@ -65,7 +67,12 @@ a:visited {
   border: 2px solid #ddd;
 }
 
-nav {
+.main.index .resource-category.active li:before {
+  content: "፧";
+  margin-right: 1em;
+}
+
+.resource-nav {
   background: white;
   width: 10%;
   margin: 2.5em 1em;
@@ -89,21 +96,63 @@ h2 {
   transform: rotate(-1deg);
 }
 
-.main.index .resource-category a.add-new {
-  border-bottom: 3px solid rgba(0, 0, 0, 0);
+.main.index .resource-category nav {
   float: right;
-  font-size: 1.5em;
+}
+
+.main.index .resource-category.active ol {
+  cursor: -webkit-grab;
+  cursor: grab;
+}
+
+.main.index .resource-category.active li a {
+  pointer-events: none;
+}
+
+ /* Makes the button look like a link */
+.main.index .resource-category button {
+  background: none !important;
+  height: 1.5em;
+  border: none;
+  padding: 0 !important;
+  font: inherit;
+  cursor: pointer;
+}
+
+.main.index .resource-category .btn {
+  border-bottom: 3px solid rgba(0, 0, 0, 0);
   color: rgba(0, 0, 0, 0.25);
+  line-height: 20px;
 }
 
-.main.index .resource-category li {
-  margin: 1em 0;
+.main.index .resource-category .btn {
+  display: none;
+}
+
+.main.index .resource-category .btn.active {
+  display: inline;
 }
 
-.main.index .resource-category a.add-new:hover {
+.main.index .resource-category .btn:hover {
   border-bottom: 3px solid rgba(0, 0, 0, 0.25);
 }
 
+.main.index .resource-category .btn {
+  margin-right: 1em;
+}
+
+.main.index .resource-category .btn:last-child {
+  margin-right: 0;
+}
+.main.index .resource-category .add-btn {
+  font-size: 20px;
+}
+
+.main.index .resource-category li {
+  margin: 1em 0;
+}
+
+
 .main.resource {
   float: left;
   margin-top: 2em;
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 4d13bb2..1ab9956 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -50,7 +50,7 @@ var OKAdmin = function(){
   }))
   
   // fix post indexing in list-driven inputs
-  $("form").submit(function(){
+  $(".main.resource form").submit(function(){
     $(".image-element").each(function(index){
       $(this).find("input,textarea").each(function(){
         var field = $(this).attr("name").replace(/\[[0-9]*\]/, "[" + index + "]")
@@ -67,6 +67,47 @@ var OKAdmin = function(){
   		e.preventDefault()
   	}
   })
+
+  $(".resource-category").on("click", ".edit-btn", function(e) {
+    e.preventDefault();
+    var $parent = $(e.delegateTarget);
+    var $editBtn = $parent.find(".edit-btn");
+    var $cancelBtn = $parent.find(".cancel-btn");
+    var $saveBtn = $parent.find(".save-btn");
+    var $ol = $parent.find("ol");
+    var toggles = [$parent, $cancelBtn, $saveBtn, $editBtn];
+
+    $ol.sortable();
+    $ol.disableSelection();
+    toggle();
+
+    $cancelBtn.one("click", function(e) {
+      $ol.sortable("cancel");
+      $ol.enableSelection();
+      toggle();
+    });
+
+    $saveBtn.one("click", function(e) {
+      $ol.sortable();
+      toggle();
+    });
+
+    function toggle() {
+      toggles.forEach(function($el) {
+        $el.toggleClass('active');
+      })
+    }
+  });
+
+  $(".resource-category").on("submit", "form", function(e) {
+    var $parent = $(e.delegateTarget);
+    $parent.find(".resource-input").each(function(index) {
+      var $input = $(this);
+      var parsed = JSON.parse($input.val());
+      parsed.__index = index;
+      $input.val(JSON.stringify(parsed));
+    })
+  });
   
   function pressEnter(fn){
     return function(e){
diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index 830fb2e..0672613 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -8,19 +8,27 @@
   {% assign resource = pair[1] %}
 
     <section class="resource-category {{name}}">
-      <form action="{{resource.type}}/batch/" method="POST">
+      <form action="{{resource.type}}/__batch/" method="POST">
         <header>
           <h2>{{name | capitalize}}</h2>
         </header>
           <input type="hidden" name="_method" value="PUT">
-          <ul class="resource-list">
+          <ol class="resource-list">
           {% for data in resource.data %}
-            <li><a href="{{resource.type}}/{{data.id}}/">{{data.id}}</a></li>
-            <input type="hidden" name="{{resource.type}}[{{forloop.index0}}]" value='{{data | stringify}}'>
+            <li>
+              <a href="{{resource.type}}/{{data.id}}/">{{data.id}}</a>
+              <input class="resource-input" type="hidden" name="{{resource.type}}[{{forloop.index0}}]" value='{{data | stringify}}'>
+            </li>
           {% endfor %}
-          </ul>
+          </ol>
         <footer>
-          <a class="add-new" href="{{resource.type}}/new/">+</a>
+          <nav>
+            <a class="btn cancel-btn" href="#">cancel</a>
+            <button type="submit"
+                class="btn save-btn" href="#">save</button>
+            <a class="btn edit-btn active" href="#">edit</a>
+            <a class="btn add-btn active" href="{{resource.type}}/new/">+</a>
+          </nav>
         </footer>
       </form>
     </section>
diff --git a/themes/okadmin/templates/resource.liquid b/themes/okadmin/templates/resource.liquid
index 53cd83e..8078778 100644
--- a/themes/okadmin/templates/resource.liquid
+++ b/themes/okadmin/templates/resource.liquid
@@ -2,7 +2,7 @@
 
 {% include 'partials/flash' %}
 
-<nav>
+<nav class="resource-nav">
   <a href="../..">Back</a>
 </nav>
 
diff --git a/themes/okadmin/templates/resource_new.liquid b/themes/okadmin/templates/resource_new.liquid
index 8e80171..d059445 100644
--- a/themes/okadmin/templates/resource_new.liquid
+++ b/themes/okadmin/templates/resource_new.liquid
@@ -2,7 +2,7 @@
 
 {% include 'partials/flash' %}
 
-<nav>
+<nav class="resource-nav">
   <a href="../..">Back</a>
 </nav>
 
-- 
cgit v1.2.3-70-g09d2


From 90b27c7e5aac1b81aac471d07f8f42dccb90d90b Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 13 Apr 2015 12:34:50 -0400
Subject: styling/debugging

---
 site/db.json                                    |  4 +--
 site/index.js                                   |  8 ++---
 themes/okadmin/public/css/main.css              | 39 ++++++++++++++++++++-----
 themes/okadmin/public/js/app.js                 | 11 +++++--
 themes/okadmin/templates/index.liquid           |  2 +-
 themes/okadmin/templates/partials/flash.liquid  |  9 +++++-
 themes/okadmin/templates/partials/inputs.liquid |  4 +--
 themes/okadmin/templates/resource.liquid        |  2 +-
 8 files changed, 58 insertions(+), 21 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/site/db.json b/site/db.json
index c07e321..d2e882a 100644
--- a/site/db.json
+++ b/site/db.json
@@ -28,7 +28,7 @@
           "caption": "CURABITUR BLANDIT TEMPUS PORTTITOR 4"
         }
       ],
-      "__index": 1
+      "__index": "0"
     }
   ],
   "page": [
@@ -47,4 +47,4 @@
       "__index": 0
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/site/index.js b/site/index.js
index a59e74e..dace900 100644
--- a/site/index.js
+++ b/site/index.js
@@ -15,15 +15,15 @@ var app  = okcms.createApp({
       id: {type: 'string', id: true},
       title: {type: 'string'},
       shortname: {type: 'string'},
-      description: {type: 'text'},
-      video: {type: 'video'},
-      images: {type: 'captioned-image-list'},
       category: {type: 'enum', options: [
         'retail',
         'advertising',
         'experiential',
         'content']
-      }
+      },
+      description: {type: 'text'},
+      video: {type: 'video'},
+      images: {type: 'captioned-image-list'},
     }
   },
 
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 3762fd4..67271bc 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -109,7 +109,7 @@ h2 {
   pointer-events: none;
 }
 
- /* Makes the button look like a link */
+/* Makes the button look like a link */
 .main.index .resource-category button {
   background: none !important;
   height: 1.5em;
@@ -117,6 +117,8 @@ h2 {
   padding: 0 !important;
   font: inherit;
   cursor: pointer;
+  font-family: Monaco, monospace;
+  text-transform: uppercase;
 }
 
 .main.index .resource-category .btn {
@@ -134,7 +136,7 @@ h2 {
 }
 
 .main.index .resource-category .btn:hover {
-  border-bottom: 3px solid rgba(0, 0, 0, 0.25);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.25);
 }
 
 .main.index .resource-category .btn {
@@ -203,6 +205,12 @@ label {
   padding: 0 0.5em;
   margin-bottom: 1em;
 }
+.main.resource form input[name=id] {
+  width: 15em;
+}
+button, input[type=submit] {
+  cursor: pointer;
+}
 .main.resource form .group {
   display: block;
   float: left;
@@ -280,18 +288,26 @@ label {
   background: #ddd;
   clear: left;
   text-align: left;
-  padding: 10px;
-  width: 15em;
+  float: left;
+  margin-right: 1em;
   position: relative;
+  overflow: hidden;
+  cursor: pointer;
 }
 .add-image-button:hover {
   background: #def;
 }
+.main.resource form .add-image-button button {
+  margin: 0;
+  pointer-events: none;
+  width: 100%; height: 100%;
+}
 .add-image-button input[type=file] {
   opacity: 0;
   position: absolute;
   top: 0; left: 0;
   width: 100%; height: 100%;
+  margin: 0; padding: 0;
   cursor: pointer;
 }
 li.image-element:hover .remove-image {
@@ -314,13 +330,20 @@ li.image-element .remove-image:hover {
 }
 
 
-.errors {
+.success, .errors {
   background: white;
-  padding: 10px;
-  width: 100%;
+  padding: 9px 8px 7px;
+  width: 50%;
   line-height: 1.4em;
+  border: 1px solid;
+  margin: 1em;
+  border-radius: 2px;
+}
+
+.success {
+  color: green;
 }
-.errors .message {
+.errors  {
   color: red;
 }
 
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 1ab9956..91a8e1a 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -28,7 +28,7 @@ var OKAdmin = function(){
   $(".captioned-image-list ol").disableSelection()
 
   // delete image
-  $(document).on("click", ".remove-image", function(){
+  $(document).on("mousedown", ".remove-image", function(){
     if (confirm("Delete this image?")) {
       $(this).parent().remove()
     }
@@ -50,7 +50,14 @@ var OKAdmin = function(){
   }))
   
   // fix post indexing in list-driven inputs
-  $(".main.resource form").submit(function(){
+  $(".main.resource form").submit(function(e){
+    var $id = $("[name=id]")
+    if ($id.length && ! $id.val()) {
+      alert("Please enter an ID")
+      $id.focus()
+      e.preventDefault()
+      return
+    }
     $(".image-element").each(function(index){
       $(this).find("input,textarea").each(function(){
         var field = $(this).attr("name").replace(/\[[0-9]*\]/, "[" + index + "]")
diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index 0672613..10903b9 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -26,7 +26,7 @@
             <a class="btn cancel-btn" href="#">cancel</a>
             <button type="submit"
                 class="btn save-btn" href="#">save</button>
-            <a class="btn edit-btn active" href="#">edit</a>
+            <a class="btn edit-btn active" href="#">sort</a>
             <a class="btn add-btn active" href="{{resource.type}}/new/">+</a>
           </nav>
         </footer>
diff --git a/themes/okadmin/templates/partials/flash.liquid b/themes/okadmin/templates/partials/flash.liquid
index 1980ab5..e51a86b 100644
--- a/themes/okadmin/templates/partials/flash.liquid
+++ b/themes/okadmin/templates/partials/flash.liquid
@@ -1,8 +1,15 @@
+{% if success.length > 0 %}
 <div class="success">
+  <div class="message">Changes saved.</div>
+  <!--
   {% for info in success %}
     <div class="message">{{info.action}}</div>
   {% endfor %}
+  -->
 </div>
+{% endif %}
+
+{% if errors.length > 0 %}
 <div class="errors">
   {% for error in errors %}
     <div class="error">
@@ -10,4 +17,4 @@
     </div>
   {% endfor %}
 </div>
-
+{% endif %}
\ No newline at end of file
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 99258f3..b9cf7a3 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -29,7 +29,7 @@
         {% endif %}
         name="{{name}}">
         {% for option in spec.options %}
-          <option value="{{option}}" {% if option == spec.value %}selected{% endif %}>{{option}}</option>
+          <option value="{{option}}" {% if option == spec.value %}selected{% endif %}>{{option | capitalize}}</option>
         {% endfor %}
       </select>
     {% elsif type == 'video' %}
@@ -56,7 +56,7 @@
         </ol>
         <div class="add-image-button">
           <input id="file" type="file" accept="image/*" multiple>
-          <span>+ Add images</span>
+          <button>+ Add images</button>
         </div>
         <input id="add-image-url" type="text" placeholder="+ Add URL">
         <script type="text/html" id="captioned-image-template">
diff --git a/themes/okadmin/templates/resource.liquid b/themes/okadmin/templates/resource.liquid
index 8078778..abc59e9 100644
--- a/themes/okadmin/templates/resource.liquid
+++ b/themes/okadmin/templates/resource.liquid
@@ -16,7 +16,7 @@
   </form>
   <form action="." method="POST" id="delete_form">
     <input type="hidden" name="_method" value="DELETE">
-    <button type="submit">Delete</button>
+    <button type="submit">Delete Record</button>
   </form>
 </section>
 
-- 
cgit v1.2.3-70-g09d2


From 74c749554f46192b0d4424fe5371982d1e48f37c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 13 Apr 2015 12:38:53 -0400
Subject: put admin area on /admin

---
 Readme.md                                     | 1 +
 app/index.js                                  | 2 +-
 themes/okadmin/templates/partials/tail.liquid | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/Readme.md b/Readme.md
index a96860f..b9e5b2d 100644
--- a/Readme.md
+++ b/Readme.md
@@ -10,4 +10,5 @@
 * node index
 
 Server will be running on http://lvh.me:1337/
+Admin area available on http://lvh.me:1337/admin/
 
diff --git a/app/index.js b/app/index.js
index 708943c..719c424 100644
--- a/app/index.js
+++ b/app/index.js
@@ -32,7 +32,7 @@ function OKCMS(options) {
   var adminConfig = options.admin || {};
   var adminRoot = this._adminRoot = adminConfig.root ||
       path.join(__dirname, '../themes/okadmin/public');
-  var adminPath = this._adminPath = '/_admin';
+  var adminPath = this._adminPath = '/admin';
   var templateRoot = options.templateRoot || 'templates';
   var adminTemplateRoot = options.templateRoot ||
     path.join(__dirname, '../themes/okadmin/templates');
diff --git a/themes/okadmin/templates/partials/tail.liquid b/themes/okadmin/templates/partials/tail.liquid
index 88764a6..b3c575d 100644
--- a/themes/okadmin/templates/partials/tail.liquid
+++ b/themes/okadmin/templates/partials/tail.liquid
@@ -2,8 +2,8 @@
   </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>
-  <script src="/_admin/js/jqueryui-draggable.js"></script>
-  <script src="/_admin/js/upload.js"></script>
-  <script src="/_admin/js/parser.js"></script>
-  <script src="/_admin/js/app.js"></script>
+  <script src="/admin/js/jqueryui-draggable.js"></script>
+  <script src="/admin/js/upload.js"></script>
+  <script src="/admin/js/parser.js"></script>
+  <script src="/admin/js/app.js"></script>
 </html>
-- 
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 'themes/okadmin/templates')

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 ebb17679c64723dc1378079f9da0697673b21f5d Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Mon, 13 Apr 2015 13:51:02 -0400
Subject: Namespace special admin endpoints

---
 app/node_modules/okadminview/index.js | 4 ++--
 themes/okadmin/templates/index.liquid | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index 648487c..161a195 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -129,7 +129,7 @@ function OKAdminView(options) {
       }).fail(error(req, res, 500));
     });
 
-    router.get('/:type/new/', function createResourceView(req, res, next) {
+    router.get('/:type/__new__/', function createResourceView(req, res, next) {
       var type = req.params.type || '';
       var resource = resourceCache.get(type);
       if (!resource) {
@@ -194,7 +194,7 @@ function OKAdminView(options) {
       }
     });
 
-    router.put('/:type/__batch/', function putBatch(req, res, next) {
+    router.put('/:type/__batch__/', function putBatch(req, res, next) {
       var type = req.params.type;
       var body = req.body || {};
       var resourcesJSON = body[type];
diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index 10903b9..330ed89 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -8,7 +8,7 @@
   {% assign resource = pair[1] %}
 
     <section class="resource-category {{name}}">
-      <form action="{{resource.type}}/__batch/" method="POST">
+      <form action="{{resource.type}}/__batch__/" method="POST">
         <header>
           <h2>{{name | capitalize}}</h2>
         </header>
@@ -27,7 +27,7 @@
             <button type="submit"
                 class="btn save-btn" href="#">save</button>
             <a class="btn edit-btn active" href="#">sort</a>
-            <a class="btn add-btn active" href="{{resource.type}}/new/">+</a>
+            <a class="btn add-btn active" href="{{resource.type}}/__new__/">+</a>
           </nav>
         </footer>
       </form>
-- 
cgit v1.2.3-70-g09d2


From 29ee500db3cb317404cb2f050ee9bc75777e91ca Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 13 Apr 2015 17:57:24 -0400
Subject: delete button

---
 themes/okadmin/templates/partials/inputs.liquid | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index b9cf7a3..4d6372d 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -50,7 +50,7 @@
               <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}}">
-              <button class="remove-image">♲</button>
+              <button class="remove-image">x</button>
             </li>
           {% endfor %}
         </ol>
@@ -64,7 +64,7 @@
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
             <textarea class="caption" name="{{name}}[][caption]"></textarea>
             <img alt="{{image.caption}}">
-            <button class="remove-image">♲</button>
+            <button class="remove-image">x</button>
           </li>
         </script>
       </div>
-- 
cgit v1.2.3-70-g09d2


From d45f617dc74a07beb352d04537d47a77193f487f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 13 Apr 2015 18:19:41 -0400
Subject: hide id field

---
 site/index.js                                   |  4 ++--
 themes/okadmin/public/js/app.js                 | 16 ++++++++++++----
 themes/okadmin/templates/partials/inputs.liquid | 19 +++----------------
 3 files changed, 17 insertions(+), 22 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/site/index.js b/site/index.js
index 8eec697..d4f5cb4 100644
--- a/site/index.js
+++ b/site/index.js
@@ -1,7 +1,7 @@
 var okcms = require('..');
 
 var projectSchema = {
-  id: {type: 'string', id: true},
+  id: {type: 'string', id: true, hidden: true},
   title: {type: 'string'},
   shortname: {type: 'string'},
   description: {type: 'text'},
@@ -15,7 +15,7 @@ var app  = okcms.createApp({
 
   schemas: {
     page: {
-      id: {type: 'string'},
+      id: {type: 'string', hidden: true},
       title: {type: 'string'},
       body: {type: 'text'},
       image: {type: 'string'}
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 91a8e1a..009fe4c 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -51,13 +51,18 @@ var OKAdmin = function(){
   
   // fix post indexing in list-driven inputs
   $(".main.resource form").submit(function(e){
-    var $id = $("[name=id]")
-    if ($id.length && ! $id.val()) {
-      alert("Please enter an ID")
-      $id.focus()
+    var $id = $("[name=id]"), $title = $("[name=title]")
+
+    if ($title.length && ! $title.val()) {
+      alert("Please enter a title")
+      $title.focus()
       e.preventDefault()
       return
     }
+
+    var slug = slugify( $title.val() )
+    $id.val( slug )
+
     $(".image-element").each(function(index){
       $(this).find("input,textarea").each(function(){
         var field = $(this).attr("name").replace(/\[[0-9]*\]/, "[" + index + "]")
@@ -129,3 +134,6 @@ var OKAdmin = function(){
 $(function(){
   window.app = new OKAdmin ()
 })
+
+
+function slugify (s){ return (s || "").toLowerCase().replace(/\s/g,"-").replace(/[^-_a-zA-Z0-9]/g, '-').replace(/-+/g,"-") }
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 4d6372d..253b275 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -3,30 +3,17 @@
   {% assign spec = pair[1] %}
   {% assign type = spec.type %}
 
-  <div class="property {{type}}">
-    <label
-      {% if spec.hidden %}
-        class="hidden"
-      {% endif %}
-      for="{{name}}">{{name | capitalize}}</label>
+  <div class="property {{type}} {% if spec.hidden %}hidden{% endif %}">
+    <label for="{{name}}">{{name | capitalize}}</label>
 
     {% if type == 'string' %}
       <input
-        {% if spec.hidden %}
-          class="hidden"
-        {% endif %}
-          name="{{name}}" type="text" value="{{spec.value}}">
+        name="{{name}}" type="text" value="{{spec.value}}">
     {% elsif type == 'text' %}
       <textarea
-        {% if spec.hidden %}
-          class="hidden"
-        {% endif %}
         name="{{name}}">{{spec.value}}</textarea>
     {% elsif type == 'enum' %}
       <select
-        {% if spec.hidden %}
-          class="hidden"
-        {% endif %}
         name="{{name}}">
         {% for option in spec.options %}
           <option value="{{option}}" {% if option == spec.value %}selected{% endif %}>{{option | capitalize}}</option>
-- 
cgit v1.2.3-70-g09d2


From dee6b3e3fd32b6b002a465e5723d51860e763b20 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 13 Apr 2015 18:50:25 -0400
Subject: slugify id from title, patch static special cases for now

---
 site/db.json                             |  4 ++--
 themes/okadmin/public/js/app.js          | 13 ++++++++++---
 themes/okadmin/templates/index.liquid    |  2 +-
 themes/okadmin/templates/resource.liquid |  4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/site/db.json b/site/db.json
index 1eee2e0..6c598ab 100644
--- a/site/db.json
+++ b/site/db.json
@@ -36,14 +36,14 @@
       "title": "WHO WE ARE",
       "body": "WE ARE A COLLECTIVE OF DIGITAL NATIVES, INDUSTRY INFLUENCERS, TRENDSETTERS, MILLENNIAL COMMUNICATORS & UNORTHODOX STRATEGISTS – A NEW MEDIA CREATIVE LAB. TOGETHER WE CREATE LIVING, BREATHING, CONTENT DRIVEN EXPERIENCES THAT ENGAGE TODAY’S CONSUMER AUDIENCE. WE ARE WILD, PUNK, PROVOCATIVE, RADICAL, FEARLESS, SUBVERSIVE, BOISTEROUS, ANARCHIC, UNEXPECTED & DISRUPTIVE. MOST OF ALL WE ARE CURIOUS. WELCOME TO THE WORLD OF TWO HUSTLERS.",
       "image": "http://www.lansdowneresort.com/meetings/assets/images/masthead/meetings-team-building.jpg",
-      "__index": 1
+      "__index": "1"
     },
     {
       "id": "contact",
       "title": "CONTACT",
       "body": "TWOHUSTLERS\r\n50 WHITE STREET\r\nNEW YORK, NY 10013\r\n<a href=\"mailto:info@twohustlers.com\">INFO@TWOHUSTLERS.COM</a>\r\n+1 646 370-1180\r\nTWOHUSTLERS ©2014\r\nWEBSITE BY <a href=\"http://okfoc.us/\">OKFOCUS</a>",
       "image": "http://checkingintocollege.com/wp/wp-content/uploads/2014/08/angryphone.jpg",
-      "__index": 0
+      "__index": "0"
     }
   ],
   "advertising": [],
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index b53d21f..ab571f3 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -51,7 +51,8 @@ var OKAdmin = function(){
   
   // fix post indexing in list-driven inputs
   $(".main.resource form").submit(function(e){
-    var $id = $("[name=id]"), $title = $("[name=title]"), $shortname = $("[name=shortname]")
+    var $id = $("[name=id]"), $title = $("[name=title]"), $shortname = $("[name=shortname]"), $section = $(".resource.main")
+    var id = $section.data("id"), type = $section.data("type")
 
     if ($title.length && ! $title.val()) {
       alert("Please enter a title")
@@ -65,8 +66,14 @@ var OKAdmin = function(){
       return
     }
 
-    var slug = slugify( $title.val() )
-    $id.val( slug )
+    // TODO: pass through whether this page is static
+    if (type === "page" && (id == "contact" || id == "about")) {
+      ;
+    }
+    else {
+      var slug = slugify( $title.val() )
+      $id.val( slug )
+    }
 
     $(".image-element").each(function(index){
       $(this).find("input,textarea").each(function(){
diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index 330ed89..d25100f 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -16,7 +16,7 @@
           <ol class="resource-list">
           {% for data in resource.data %}
             <li>
-              <a href="{{resource.type}}/{{data.id}}/">{{data.id}}</a>
+              <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
               <input class="resource-input" type="hidden" name="{{resource.type}}[{{forloop.index0}}]" value='{{data | stringify}}'>
             </li>
           {% endfor %}
diff --git a/themes/okadmin/templates/resource.liquid b/themes/okadmin/templates/resource.liquid
index abc59e9..aa3efe0 100644
--- a/themes/okadmin/templates/resource.liquid
+++ b/themes/okadmin/templates/resource.liquid
@@ -6,8 +6,8 @@
   <a href="../..">Back</a>
 </nav>
 
-<section class="resource main">
-  <h2>EDIT {{ resource.type }} '{{ resource.id }}'</h2>
+<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">
     <input type="hidden" name="_method" value="PUT">
     {% include 'partials/inputs' %}
-- 
cgit v1.2.3-70-g09d2


From db3775794623ebbc63efb44e545b66f2accfd728 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 13 Apr 2015 19:28:42 -0400
Subject: testing stuff

---
 site/db.json                             | 37 ++++++++++++++++++++++++++++++--
 site/index.js                            |  1 +
 site/templates/project.liquid            |  2 +-
 themes/okadmin/public/js/app.js          |  1 -
 themes/okadmin/templates/resource.liquid |  4 +++-
 5 files changed, 40 insertions(+), 5 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/site/db.json b/site/db.json
index eb0265d..7681fd8 100644
--- a/site/db.json
+++ b/site/db.json
@@ -46,7 +46,40 @@
       "__index": "0"
     }
   ],
-  "advertising": [],
   "experiential": [],
-  "content": []
+  "content": [
+    {
+      "id": "stuff",
+      "title": "Stuff",
+      "menu": "Stuff",
+      "description": "Blablhablhalbhab",
+      "video": {
+        "url": "http://vimeo.com/112498725",
+        "type": "vimeo",
+        "token": "112498725",
+        "title": "FW14-2H-VIDEO-V4 2",
+        "thumb": "http://i.vimeocdn.com/video/497493142_640.jpg"
+      },
+      "images": [
+        {
+          "uri": "https://ltho.s3.amazonaws.com/aa5ab62c-a7f4-433e-8957-c059199de924.png",
+          "caption": "WHO"
+        },
+        {
+          "uri": "https://ltho.s3.amazonaws.com/888c06f0-32f4-4f7b-938f-fb9bf178a1dc.png",
+          "caption": "DARK"
+        },
+        {
+          "uri": "https://ltho.s3.amazonaws.com/525cd121-a436-472f-b201-7b2baffa804a.png",
+          "caption": "STUFF"
+        },
+        {
+          "uri": "https://ltho.s3.amazonaws.com/b2a607e6-1c60-42cd-8449-55737501ff9e.png",
+          "caption": "BLAH"
+        }
+      ],
+      "__index": "0"
+    }
+  ],
+  "advertising": []
 }
\ No newline at end of file
diff --git a/site/index.js b/site/index.js
index 189dfc4..b6dea48 100644
--- a/site/index.js
+++ b/site/index.js
@@ -81,6 +81,7 @@ var app  = okcms.createApp({
     '/advertising/:id': {
       data: {
         type: 'advertising',
+        as: 'project',
         query: {
           id: ':id'
         }
diff --git a/site/templates/project.liquid b/site/templates/project.liquid
index d21fed2..e087049 100644
--- a/site/templates/project.liquid
+++ b/site/templates/project.liquid
@@ -3,7 +3,7 @@
 		<span class="projectname">{{project.title}}</span>
 
 		<div class="gallery" id="okgallery">
-    {% if project.video %}
+    {% if project.video.token %}
 			<div class="cell video" style="background-image:url({{ project.video.thumb }})" data-video="https://player.vimeo.com/video/{{ project.video.token }}" data-caption="{{ project.video.title }}"></div>
     {% endif %}
     {% for image in project.images %}
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index aa8d0ad..990a75d 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -63,7 +63,6 @@ var OKAdmin = function(){
 
     if ($menu.length && ! $menu.val()) {
       $menu.val( $title.val() )
-      return
     }
 
     // TODO: pass through whether this page is static
diff --git a/themes/okadmin/templates/resource.liquid b/themes/okadmin/templates/resource.liquid
index aa3efe0..9454123 100644
--- a/themes/okadmin/templates/resource.liquid
+++ b/themes/okadmin/templates/resource.liquid
@@ -3,7 +3,9 @@
 {% include 'partials/flash' %}
 
 <nav class="resource-nav">
-  <a href="../..">Back</a>
+  <a href="../..">Back</a><br>
+  <br>
+  <a href="/admin/{{ resource.type }}/__new__/">ADD ANOTHER</a>
 </nav>
 
 <section class="resource main" data-type="{{ resource.type }}" data-id="{{ resource.id }}">
-- 
cgit v1.2.3-70-g09d2


From eb779beb83ed6e8d000fd0453c9ed5c404327ae4 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 16 Apr 2015 02:11:55 -0400
Subject: Take metadata from config and make synchronous

---
 app/index.js                                  | 35 +++-------
 app/node_modules/okadminview/index.js         | 96 +++++++++++----------------
 app/node_modules/okview/index.js              | 13 ++--
 site/index.js                                 |  6 ++
 themes/okadmin/templates/partials/head.liquid |  4 +-
 5 files changed, 63 insertions(+), 91 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/app/index.js b/app/index.js
index 01ea33b..d487bd7 100644
--- a/app/index.js
+++ b/app/index.js
@@ -38,33 +38,18 @@ function OKCMS(options) {
     path.join(__dirname, '../themes/okadmin/templates');
   var debug = options.debug || false;
 
-  // Set metadata defaults
-  // TODO Abstract this out somewhere else
-  var meta = {
-    type: 'meta',
-    get: function() {
-      return Q.promise(function(resolve, reject) {
-        db.getMeta().then(function(metadata) {
-          resolve(assign({}, {
-            static: ''
-          }, metadata));
-        }).fail(reject);
-      });
-    }
+  var metaUser = options.meta || {};
+  var metaDefault = {
+    project: 'OKCMS'
   };
 
-  var adminMeta ={
-    type: 'meta',
-    get: function() {
-      return Q.promise(function(resolve, reject) {
-        db.getMeta().then(function(metadata) {
-          resolve(assign({}, {
-            static: withoutTrailingSlash(adminPath)
-          }, metadata));
-        }).fail(reject);
-      });
-    }
-  };
+  var meta = assign({
+    static: ''
+  }, metaDefault, metaUser);
+
+  var adminMeta = assign({
+      static: withoutTrailingSlash(adminPath)
+  }, metaDefault, metaUser);
 
   var schemaConfig = options.schemas || {};
   var resourceConfig = options.resources || [];
diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index 161a195..82f364d 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -36,7 +36,7 @@ function OKAdminView(options) {
   if (!options.templateProvider)
     throw new Error('No templateProvider provided to OKAdminView');
   if (!options.meta)
-    throw new Error('No meta query provided to OKAdminView');
+    throw new Error('No metadata provided to OKAdminView');
   if (!options.errorHandler)
     throw new Error('No error handler provided to OKAdminView');
 
@@ -135,13 +135,11 @@ function OKAdminView(options) {
       if (!resource) {
         error(req, res, 404)(new Error('No such resource ' + type));
       } else {
-        meta.get().then(function(metadata) {
-          var templateData = transformData(metadata, resource, {});
-          view.renderResourceNew(req, res, assign(templateData, {
-            success: req.flash('success'),
-            errors: req.flash('errors'),
-          }));
-        }).fail(error(req, res, 500));
+        var templateData = transformData(meta, resource, {});
+        view.renderResourceNew(req, res, assign(templateData, {
+          success: req.flash('success'),
+          errors: req.flash('errors'),
+        }));
       }
     });
 
@@ -179,18 +177,16 @@ function OKAdminView(options) {
       if (!resource) {
         error(req, res, 400)(new Error('No such resource ' + type));
       } else {
-        meta.get().then(function(metadata) {
-          try {
-            resource.assertValid(data);
-            resource.create(data).then(function(created) {
-              req.flash('success', {action: 'create'});
-              res.redirect(303, resource.getID(data));
-            }).fail(error(req, res, 500));
-          } catch (errors) {
-            var templateData = transformData(metadata, resource, data);
-            view.renderResource(req, res, assign(templateData, {errors: errors}));
-          }
-        }).fail(error(req, res, 500));;
+        try {
+          resource.assertValid(data);
+          resource.create(data).then(function(created) {
+            req.flash('success', {action: 'create'});
+            res.redirect(303, resource.getID(data));
+          }).fail(error(req, res, 500));
+        } catch (errors) {
+          var templateData = transformData(meta, resource, data);
+          view.renderResource(req, res, assign(templateData, {errors: errors}));
+        }
       }
     });
 
@@ -215,11 +211,7 @@ function OKAdminView(options) {
            error(req, res, 500)(new Error('Resource batch contains invalid JSON'));
            return;
         }
-        Q.all([
-          meta.get(),
-          resource.updateBatch(ids, resourcesParsed),
-        ]).then(function(results) {
-          var metadata = results.shift();
+        resource.updateBatch(ids, resourcesParsed).then(function(results) {
           req.flash('success', {action: 'batch_update'});
           res.redirect(303, '../..');
         }).fail(error(req, res, 500));
@@ -234,19 +226,16 @@ function OKAdminView(options) {
       if (!resource) {
         error(req, res, 400)(new Error('No such resource ' + type));
       } else {
-        // TODO Prob should make metadata synchronous...
-        meta.get().then(function(metadata) {
-          try {
-            resource.assertValid(data);
-            resource.update(id, data).then(function(updated) {
-              req.flash('success', {action: 'update'});
-              res.redirect(303, '../' + resource.getID(updated));
-            }).fail(error(req, res, 500));
-          } catch (errors) {
-            var templateData = transformData(metadata, resource, data);
-            view.renderResource(req, res, assign(templateData, {errors: errors}));
-          }
-        }).fail(error(req, res, 500));
+        try {
+          resource.assertValid(data);
+          resource.update(id, data).then(function(updated) {
+            req.flash('success', {action: 'update'});
+            res.redirect(303, '../' + resource.getID(updated));
+          }).fail(error(req, res, 500));
+        } catch (errors) {
+          var templateData = transformData(meta, resource, data);
+          view.renderResource(req, res, assign(templateData, {errors: errors}));
+        }
       }
     });
 
@@ -257,11 +246,9 @@ function OKAdminView(options) {
       if (!resource) {
         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(error(req, res, 500));
+        resource.destroy(id).then(function() {
+          req.flash('success', {action: 'delete'});
+          res.redirect(303, '../..');
         }).fail(error(req, res, 500));
       }
     });
@@ -328,10 +315,9 @@ OKAdminView.prototype.renderResourceNew = function(req, res, data) {
  */
 function fetchIndexTemplateData(meta, queries) {
   return Q.promise(function(resolve, reject) {
-    Q.all([meta.get()].concat(queries.map(function(query) {
+    Q.all(queries.map(function(query) {
       return query.get();
-    }))).then(function(results) {
-      var meta = results.shift();
+    })).then(function(results) {
       var resources = results.reduce(function(cache, result, i) {
         if (!result)
           return cache;
@@ -376,16 +362,14 @@ function fetchIndexTemplateData(meta, queries) {
 function fetchResourceTemplateData(meta, query, fn) {
   fn = fn || function(m, r, d) { return {meta: m, resource: d}; };
   return Q.promise(function(resolve, reject) {
-    meta.get().then(function(metadata) {
-      query.get().then(function(data) {
-        if (!data) {
-          reject(new Error('No resource data'));
-        } else {
-          var resource = query.resource;
-          resolve(fn(metadata, resource, data));
-        }
-      }).fail(reject);
-    }).fail(reject)
+    query.get().then(function(data) {
+      if (!data) {
+        reject(new Error('No resource data'));
+      } else {
+        var resource = query.resource;
+        resolve(fn(meta, resource, data));
+      }
+    }).fail(reject);
   });
 }
 
diff --git a/app/node_modules/okview/index.js b/app/node_modules/okview/index.js
index 951261c..fba1c18 100644
--- a/app/node_modules/okview/index.js
+++ b/app/node_modules/okview/index.js
@@ -21,7 +21,7 @@ function OKView(options) {
   if (!options.template)
     throw new Error('No template provided to OKView.');
   if (!options.meta)
-    throw new Error('No meta resource provided to OKView');
+    throw new Error('No metadata provided to OKView');
   if (!options.route)
     throw new Error('No route provided to OKView');
   if (!options.errorHandler)
@@ -124,12 +124,9 @@ function fetchTemplateData(meta, queries, id) {
   // 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) {
-        return query.get(id);
-      })))
-    .then(function(results) {
-      var metadata = results.shift();
+    return Q.all(queries.map(function(query) {
+      return query.get(id);
+    })).then(function(results) {
       if (single && !results[0]) {
         reject(new Error('No resource found'));
       } else {
@@ -164,7 +161,7 @@ function fetchTemplateData(meta, queries, id) {
             cache[type] = result;
           }
           return cache;
-        }, {meta: metadata});
+        }, {meta: meta});
 
         resolve(normalized);
       }
diff --git a/site/index.js b/site/index.js
index 7457bbf..521b7d7 100644
--- a/site/index.js
+++ b/site/index.js
@@ -11,8 +11,14 @@ var projectSchema = {
 
 var app  = okcms.createApp({
 
+  meta: {
+    project: 'TwoHustlers'
+  },
+
   root: 'public',
 
+  debug: false,
+
   schemas: {
     page: {
       id: {type: 'string', hidden: true},
diff --git a/themes/okadmin/templates/partials/head.liquid b/themes/okadmin/templates/partials/head.liquid
index c423584..7ee4824 100644
--- a/themes/okadmin/templates/partials/head.liquid
+++ b/themes/okadmin/templates/partials/head.liquid
@@ -2,12 +2,12 @@
 <html>
   <head>
     <meta charset="utf8">
-    <title>TwoHustlers Admin {{meta.title}}</title>
+    <title>{{meta.project}} Admin</title>
     <link rel="stylesheet" href="{{meta.static}}/css/main.css">
   </head>
   <body>
     <header class="admin-header">
-      <span class="breadcrumb"><b>TwoHustlers{{meta.title}}</b> Admin</span>
+      <span class="breadcrumb"><b>{{meta.project}}</b> Admin</span>
       <a class="site-link" href="/">View Site</a>
     </header>
     <div class="container">
-- 
cgit v1.2.3-70-g09d2


From b51455df828fde90edbee3143bd8d49b00cc3f1a Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 16 Apr 2015 14:04:10 -0400
Subject: single image upload field, abstract upload class a bit

---
 site/db.json                                    |  6 +-
 site/index.js                                   |  1 +
 site/public/assets/style.css                    |  3 +-
 site/templates/index.liquid                     |  2 +
 themes/okadmin/public/css/main.css              | 25 +++++--
 themes/okadmin/public/js/app.js                 | 93 +++++++++++++++++--------
 themes/okadmin/public/js/upload.js              | 91 +++++++++++-------------
 themes/okadmin/templates/partials/inputs.liquid | 52 +++++++++-----
 8 files changed, 171 insertions(+), 102 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/site/db.json b/site/db.json
index d0624e8..12ccb38 100644
--- a/site/db.json
+++ b/site/db.json
@@ -27,7 +27,11 @@
           "caption": "CURABITUR BLANDIT TEMPUS PORTTITOR 4"
         }
       ],
-      "__index": "0"
+      "__index": "0",
+      "shape": {
+        "uri": "",
+        "caption": ""
+      }
     }
   ],
   "page": [
diff --git a/site/index.js b/site/index.js
index 521b7d7..30e4a76 100644
--- a/site/index.js
+++ b/site/index.js
@@ -7,6 +7,7 @@ var projectSchema = {
   description: {type: 'text'},
   video: {type: 'video'},
   images: {type: 'captioned-image-list'},
+  shape: {type: 'image'},
 }
 
 var app  = okcms.createApp({
diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index 3c2526b..28d0013 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -285,6 +285,7 @@ nav .middle {
 }
 
 nav .bottom {
+  height: 20%;
 	width: 100%;
 	background: #bbb;
 }
@@ -489,7 +490,7 @@ nav .sub.active a {
 }
 .entry span div.content.noline {
 	border-top: 0;
-	padding-top: 0px;
+	padding-top: 0;
 }
 .entry span div.content div {
 	width:50%;
diff --git a/site/templates/index.liquid b/site/templates/index.liquid
index afb5de3..d18098c 100644
--- a/site/templates/index.liquid
+++ b/site/templates/index.liquid
@@ -110,9 +110,11 @@ WEBSITE BY OKFOCUS, http://okfoc.us, Internet Legends.
       {% endfor %}
 		</div>
 	</div>
+<!-- 
 	<div class="middle">
 		<div class="cat index">VIEW ALL PROJECTS</div>
 	</div>
+ -->
 	<div class="bottom">
 		<div class="cat about">ABOUT</div>
 		<div class="cat contact">CONTACT</div>
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index ec426f9..685e368 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -228,7 +228,9 @@ button, input[type=submit] {
   border: 0;
   display: none;
 }
-.main.resource form .group.loaded input:first-child,
+.main.resource form .group.image input,
+.main.resource form .group.video input:first-child,
+.main.resource form .group.loaded.video input[type=text],
 .main.resource form .group input:first-child {
   display: block;
   width: 25em;
@@ -238,17 +240,24 @@ button, input[type=submit] {
 }
 .main.resource form .group.loaded input {
   display: block;
-  width: 20.05em;
 }
-.main.resource form .group input {
-  display: none;
+.main.resource form .group input[type=text] {
+  width: 20.05em;
   margin-bottom: 0.1em;
 }
+.main.resource form .group.image .image-element,
+.main.resource form .group.video input[type=text],
 .main.resource form .group.loaded input[hidden],
+.main.resource form .group.image.loaded .fields,
 .main.resource form input[hidden] {
   display: none;
 }
-
+.main.resource form .group.image.loaded .image-element {
+  display: block;
+}
+.main.resource form .fields {
+  height: 3em;
+}
 .main.resource form textarea {
   padding: 0.5em;
   height: 15em;
@@ -280,6 +289,8 @@ button, input[type=submit] {
   width: 10em;
   max-height: 10em;
   border: 0;
+}
+.main.resource form .images img {
   cursor: -webkit-grab;
   cursor: grab;
 }
@@ -313,10 +324,10 @@ button, input[type=submit] {
   margin: 0; padding: 0;
   cursor: pointer;
 }
-li.image-element:hover .remove-image {
+.image-element:hover .remove-image {
   display: block;
 }
-li.image-element .remove-image:hover {
+.image-element .remove-image:hover {
 	color: red;
 }
 .remove-image {
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 22317f3..baa4873 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -1,38 +1,75 @@
 var OKAdmin = function(){
   
-  // initialize our (single) ajax image uploader with an element and a template
-  OKUpload.bind( document.getElementById("file") )
-  OKUpload.add = function(data){
-    var url = data[0].extra.Location
-    add_image(url)
-  }
-
-  // also handle straight image urls
-  $("#add-image-url").keydown(pressEnter(function(e){
-    var url = $(this).val()
-    $(this).val("")
-    add_image(url)
-  }))
+  // initialize our multi-image uploader with an element and a template
+  $(".image-list").each(function(){
+    var uploader = new OKUpload ()
+    uploader.bind( $(".add-image-button input", this) )
+    uploader.add = function(data){
+      var url = data[0].extra.Location
+      add_image(url)
+    }
+    // also handle straight image urls
+    $(".add-image-url", this).keydown(pressEnter(function(e){
+      var url = $(this).val()
+      $(this).val("")
+      add_image(url)
+    }))
+
+    // clone and populate template
+    function add_image(url){
+      var imageTemplate = $("#captioned-image-template").html()
+      var $el = $(imageTemplate)
+      $el.find(".uri").val(url)
+      $el.find("img").attr("src", url)
+      $(".captioned-image-list ol").append($el)
+    }
+  })
+  // delete image from gallery
+  $(document).on("mousedown", ".image-list .remove-image", function(){
+    if (confirm("Delete this image?")) {
+      $(this).parent().remove()
+    }
+  })
 
-  // clone and populate template
-  function add_image(url){
-    var imageTemplate = $("#captioned-image-template").html()
-    var $el = $(imageTemplate)
-    $el.find(".uri").val(url)
-    $el.find("img").attr("src", url)
-    $(".captioned-image-list ol").append($el)
-  }
+  // initialize our single image uploader with existing DOM
+  $(".image").each(function(){
+    var $el = $(this)
+    
+    var uploader = new OKUpload ()
+    uploader.bind( $(".add-image-button input", this) )
+    uploader.add = function(data){
+      var url = data[0].extra.Location
+      add_image(url)
+    }
+    // also handle straight image urls
+    $(".add-image-url", this).keydown(pressEnter(function(e){
+      var url = $(this).val()
+      $(this).val("")
+      add_image(url)
+    }))
+
+    // clone and populate template
+    function add_image(url){
+      $el.find(".uri").val(url)
+      $el.find(".caption").val("")
+      $el.find("img").attr("src", url)
+      $el.addClass("loaded")
+    }
+  })
+  // delete image from single image entry
+  $(document).on("mousedown", ".image .remove-image", function(){
+    if (confirm("Delete this image?")) {
+      var $el = $(this).closest(".image")
+      $el.removeClass('loaded')
+      $el.find(".uri").val("")
+      $el.find(".caption").val("")
+      $el.find("img").attr("src", "")
+    }
+  })
 
   // make the region sortable with drag-and-drop
   $(".captioned-image-list ol").sortable()
   $(".captioned-image-list ol").disableSelection()
-
-  // delete image
-  $(document).on("mousedown", ".remove-image", function(){
-    if (confirm("Delete this image?")) {
-      $(this).parent().remove()
-    }
-  })
   
   // populate a video field with info from our url parser
   var last_url
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index 1c9094c..39f7427 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -1,55 +1,48 @@
 
-var OKUpload = {
-	action: "/_services/image",
-	
-	bind: function(el){
-	  if (! el) return
-		el.addEventListener("change", OKUpload.handleFileSelect)
-	},
-
-  handleFileSelect: function(e) {
-    e.stopPropagation();
-    e.preventDefault();
-
-    var files = e.dataTransfer ? e.dataTransfer.files : e.target.files;
-
-    for (var i = 0, f; f = files[i]; i++) {
-      if ( ! f.type.match('image.*')) {
-        continue;
-      }
-			OKUpload.upload(f)
-    }
-  },
+var OKUpload = function(){
+	this.action = "/_services/image"
+}
+OKUpload.prototype.bind = function(el){
+  if (el.length) el = el[0]
+  el.addEventListener("change", this.handleFileSelect.bind(this))
+}
+OKUpload.prototype.handleFileSelect = function(e) {
+  e.stopPropagation();
+  e.preventDefault();
 
-  upload: function(f){
-    var fd = new FormData()
-    fd.append('image', f)
+  var files = e.dataTransfer ? e.dataTransfer.files : e.target.files;
 
-    var request = $.ajax({
-      url: OKUpload.action,
-      type: "post",
-      data: fd,
-      dataType: "json",
-      processData: false,
-      contentType: false,
-    })
-    request.done(OKUpload.success)
-  },
-  
-  success: function(media){
-    if (media.error) {
-      console.log(media.error)
-      return
+  for (var i = 0, f; f = files[i]; i++) {
+    if ( ! f.type.match('image.*')) {
+      continue;
     }
-    OKUpload.add(media)
-  },
-  
-  add: function(media){
-    console.log(media)
-  },
-  
-  error: function(error){
-    throw error
-  },
+    this.upload(f)
+  }
+}
+OKUpload.prototype.upload = function(f){
+  var fd = new FormData()
+  fd.append('image', f)
 
+  var request = $.ajax({
+    url: this.action,
+    type: "post",
+    data: fd,
+    dataType: "json",
+    processData: false,
+    contentType: false,
+  })
+  request.done(this.success.bind(this))
+}
+OKUpload.prototype.success = function(media){
+  if (media.error) {
+    console.log(media.error)
+    return
+  }
+  this.add(media)
+}
+OKUpload.prototype.add = function(media){
+  console.log(media)
+}
+OKUpload.prototype.error = function(error){
+  throw error
 }
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 253b275..c9a4d92 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -22,15 +22,48 @@
     {% elsif type == 'video' %}
       <div class="video group {% if spec.value.url %}loaded{% endif %}">
         <input name="{{name}}[url]" type="text" value="{{spec.value.url}}" class="url" placeholder="Enter a video URL">
-        <input name="{{name}}[type]" type="text" value="{{spec.value.type}}" class="video-type" hidden>
-        <input name="{{name}}[token]" type="text" value="{{spec.value.token}}" class="video-token" hidden>
+        <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>
         <label>Title</label>
         <input name="{{name}}[title]" type="text" value="{{spec.value.title}}" class="video-title">
         <label>Thumbnail</label>
         <input name="{{name}}[thumb]" type="text" value="{{spec.value.thumb}}" class="video-thumb">
       </div>
+    {% elsif type == 'image' %}
+      <div class="image group {% if spec.value.uri %}loaded{% endif %}">
+        <div class="fields">
+          <div class="add-image-button">
+            <input type="file" accept="image/*">
+            <button>+ Add image</button>
+          </div>
+          <input class="add-image-url" type="text" placeholder="+ Add URL">
+        </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}}">
+          <button class="remove-image">x</button>
+        </div>
+      </div>
     {% elsif type == 'captioned-image-list' %}
-      <div class="image group loaded">
+      <div class="image-list group loaded">
+        <div class="fields">
+          <div class="add-image-button">
+            <input type="file" accept="image/*" multiple>
+            <button>+ Add images</button>
+          </div>
+          <input class="add-image-url" type="text" placeholder="+ Add URL">
+        </div>
+
+        <script type="text/html" id="captioned-image-template">
+          <li class="image-element">
+            <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
+            <textarea class="caption" name="{{name}}[][caption]"></textarea>
+            <img alt="{{image.caption}}">
+            <button class="remove-image">x</button>
+          </li>
+        </script>
+
         <ol>
           {% for image in spec.value %}
             <li class="image-element">
@@ -41,19 +74,6 @@
             </li>
           {% endfor %}
         </ol>
-        <div class="add-image-button">
-          <input id="file" type="file" accept="image/*" multiple>
-          <button>+ Add images</button>
-        </div>
-        <input id="add-image-url" type="text" placeholder="+ Add URL">
-        <script type="text/html" id="captioned-image-template">
-          <li class="image-element">
-            <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
-            <textarea class="caption" name="{{name}}[][caption]"></textarea>
-            <img alt="{{image.caption}}">
-            <button class="remove-image">x</button>
-          </li>
-        </script>
       </div>
     {% elsif type == 'meta' %}
       <input class="hidden" type="hidden" name="{{name}}" value="{{spec.value}}">
-- 
cgit v1.2.3-70-g09d2


From 43063c3242ccaf95e39fff240d501de38131f7c5 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 16 Apr 2015 23:38:16 -0400
Subject: Add number type support

---
 app/node_modules/okschema/index.js              | 12 +++++++++++-
 themes/okadmin/templates/partials/inputs.liquid |  4 ++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'themes/okadmin/templates')

diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index d53ed7b..c5a56c4 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -68,6 +68,9 @@ var types = {
  * OKSchema!
  * Meant as a thin wrapper around some existing schema validation
  * module, mostly to allow for the extension of types.
+ *
+ * NOTE: Currently just assumes spec is valid. If you give a bad spec
+ *       strange things may or may not happen
  */
 function OKSchema(spec) {
   if (!(this instanceof OKSchema)) return new OKSchema(spec);
@@ -138,11 +141,18 @@ OKSchema.prototype.assertValid = function(data) {
     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
+    // otherwise pass and let mschema handle
+    } else if (type === 'number') {
+      try {
+        data[prop] = parseFloat(data[prop]);
+      } catch (err) {}
     }
   });
   var result = mschema.validate(data, this.toMschema());
-  if (!result.valid)
+  if (!result.valid) {
     throw result.errors;
+  }
 };
 
 /**
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index c9a4d92..4d31413 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -12,6 +12,10 @@
     {% elsif type == 'text' %}
       <textarea
         name="{{name}}">{{spec.value}}</textarea>
+    {% elsif type == 'number' %}
+      <input
+        type="number"
+        name="{{name}}" value="{{spec.value}}">
     {% elsif type == 'enum' %}
       <select
         name="{{name}}">
-- 
cgit v1.2.3-70-g09d2


From 746ca86ca146dbc815959c90c6f60df05e6354a9 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Tue, 21 Apr 2015 13:05:46 -0400
Subject: Escape stringified JSON for use in HTML attr

---
 themes/okadmin/templates/index.liquid | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index d25100f..e9ad538 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -17,7 +17,8 @@
           {% for data in resource.data %}
             <li>
               <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
-              <input class="resource-input" type="hidden" name="{{resource.type}}[{{forloop.index0}}]" value='{{data | stringify}}'>
+              <input class="resource-input" type="hidden" name="{{resource.type}}[{{forloop.index0}}]"
+                  value='{{data | stringify | escape_once}}'>
             </li>
           {% endfor %}
           </ol>
-- 
cgit v1.2.3-70-g09d2


From 3e2d7e98230990ad954b33203e0611358c1fa915 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 27 Apr 2015 14:24:20 -0400
Subject: stubbing in videos

---
 app/node_modules/okadminview/index.js           |  1 +
 site/index.js                                   |  3 +-
 site/templates/project.liquid                   |  5 ++-
 themes/okadmin/public/css/main.css              | 17 +++++---
 themes/okadmin/public/js/app.js                 | 58 ++++++++++++++++++++-----
 themes/okadmin/public/js/upload.js              | 15 ++++++-
 themes/okadmin/templates/partials/inputs.liquid | 55 +++++++++++++++++++++--
 7 files changed, 130 insertions(+), 24 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index 82f364d..2a0fcd5 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -157,6 +157,7 @@ function OKAdminView(options) {
               resourceMissingHandler(req, res)()
             } else {
               view.renderResource(req, res, assign(data, {
+                JSON: JSON,
                 success: req.flash('success'),
                 errors: req.flash('errors')
               }));
diff --git a/site/index.js b/site/index.js
index 8bb4b4d..a7b207a 100644
--- a/site/index.js
+++ b/site/index.js
@@ -5,8 +5,7 @@ var projectSchema = {
   title: {type: 'string'},
   menu: {type: 'string'},
   description: {type: 'text'},
-  video: {type: 'video'},
-  images: {type: 'captioned-image-list'},
+  images: {type: 'media-list'},
   thumbnail: {type: 'image'},
 }
 
diff --git a/site/templates/project.liquid b/site/templates/project.liquid
index b54722d..3d32c0d 100644
--- a/site/templates/project.liquid
+++ b/site/templates/project.liquid
@@ -1,7 +1,10 @@
 <div class="entry">
 	<span>
 		<span class="postname">{{project.title}}</span>
-
+		<div class="galnav">
+			<span class="prevbutton">PREVIOUS ASSET</span>
+			<span class="nextbutton">NEXT ASSET</span>
+		</div>
 		<div class="gallery" id="okgallery">
     {% if project.video.token %}
 			<div class="cell video" style="background-image:url({{ project.video.thumb }})" data-video="https://player.vimeo.com/video/{{ project.video.token }}" data-caption="{{ project.video.title }}"></div>
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 747ec34..5dbd910 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -283,11 +283,11 @@ button, input[type=submit] {
   list-style-type: none;
   display: block;
   clear: both;
-  height: 10em;
+  height: 7em;
 }
 .main.resource form img {
   width: 10em;
-  max-height: 10em;
+  max-height: 6em;
   border: 0;
 }
 .main.resource form .images img {
@@ -296,7 +296,10 @@ button, input[type=submit] {
 }
 .main.resource form textarea.caption {
   width: 15em;
-  height: 9em;
+  height: 6em;
+}
+.main.resource form .video-element input[type=text] {
+  width: 15em;
 }
 .add-image-button {
   background: #ddd;
@@ -324,13 +327,15 @@ button, input[type=submit] {
   margin: 0; padding: 0;
   cursor: pointer;
 }
-.image-element:hover .remove-image {
+.video-element:hover .remove,
+.image-element:hover .remove {
   display: block;
 }
-.image-element .remove-image:hover {
+.video-element .remove:hover,
+.image-element .remove:hover {
 	color: red;
 }
-.remove-image {
+.remove {
   display: none;
 }
 
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index e981223..c46cea8 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -2,23 +2,56 @@ var OKAdmin = function(){
   
   // initialize our multi-image uploader with an element and a template
   $(".group.image-list").each(function(){
+    var parent = this
     var uploader = new OKUpload ()
     uploader.bind( this )
     uploader.add = function(url){
-      var imageTemplate = $("#captioned-image-template").html()
+      var imageTemplate = $(".image-template", parent).html()
       var $el = $(imageTemplate)
       $el.find(".uri").val(url)
       $el.find("img").attr("src", url)
-      $(".captioned-image-list ol").append($el)
+      $("ol", parent).append($el)
     }
   })
   // delete image from gallery
-  $(document).on("mousedown", ".image-list .remove-image", function(){
+  $(document).on("mousedown", ".image-list .remove", function(){
     if (confirm("Remove this image?")) {
       $(this).parent().remove()
     }
   })
 
+  // initialize our multimedia uploader with an element and a template
+  $(".group.media-list").each(function(){
+    var parent = this
+    var uploader = new OKUpload ()
+    uploader.bind( this )
+    uploader.add = function(url){
+      var imageTemplate = $(".image-template", parent).html()
+      var $el = $(imageTemplate)
+      $el.find(".uri").val(url)
+      $el.find("img").attr("src", url)
+      $("ol", parent).append($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).append($el)
+   }
+  })
+  // delete image from gallery
+  $(document).on("mousedown", ".media-list .remove", function(){
+    if (confirm("Remove this media?")) {
+      $(this).parent().remove()
+    }
+  })
+
   // initialize our single image uploader with existing DOM
   $(".group.image").each(function(){
     var $el = $(this)
@@ -35,7 +68,7 @@ var OKAdmin = function(){
     }
   })
   // delete image from single image entry
-  $(document).on("mousedown", ".image .remove-image", function(){
+  $(document).on("mousedown", ".image .remove", function(){
     if (confirm("Remove this image?")) {
       var $el = $(this).closest(".image")
       $el.removeClass('loaded')
@@ -46,8 +79,8 @@ var OKAdmin = function(){
   })
 
   // make the region sortable with drag-and-drop
-  $(".captioned-image-list ol").sortable()
-  $(".captioned-image-list ol").disableSelection()
+  $(".media-list ol, .image-list ol").sortable()
+  $(".media-list ol, .image-list ol").disableSelection()
   
   // populate a video field with info from our url parser
   var last_url
@@ -94,14 +127,17 @@ var OKAdmin = function(){
       $id.val( slug )
     }
 
-    $(".image-element").each(function(index){
-      $(this).find("input,textarea").each(function(){
-        var field = $(this).attr("name").replace(/\[[0-9]*\]/, "[" + index + "]")
-        $(this).attr("name", field)
+    $("ol").each(function(){
+      $("li", this).each(function(index){
+        $(this).find("input,textarea").each(function(){
+          var field = $(this).attr("name").replace(/\[[0-9]*\]/, "[" + index + "]")
+          $(this).attr("name", field)
+        })
       })
     })
   })
   
+  // delete individual records
   $("#delete_form").submit(function(e){
   	if (confirm("Are you sure you want to delete this record?")) {
   		return
@@ -111,6 +147,7 @@ var OKAdmin = function(){
   	}
   })
 
+  // reorder items in categories
   $(".resource-category").on("click", ".edit-btn", function(e) {
     e.preventDefault();
     var $parent = $(e.delegateTarget);
@@ -142,6 +179,7 @@ var OKAdmin = function(){
     }
   });
 
+  // save new category order
   $(".resource-category").on("submit", "form", function(e) {
     var $parent = $(e.delegateTarget);
     $parent.find(".resource-input").each(function(index) {
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index b4a0dfc..8d73dd5 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -5,11 +5,19 @@ var OKUpload = function(){
 OKUpload.prototype.bind = function(rapper){
   var uploader = this
   $(".add-image-button input", rapper).change( uploader.handleFileSelect.bind(uploader) )
-  $(".add-image-url", rapper).on("keydown blur", pressEnter( function(e){
+  $(".add-url", rapper).on("keydown blur", pressEnter( function(e){
     var url = $(this).val()
     $(this).val("")
     if (! url) return
-    uploader.add(url)
+    Parser.parse( url, function(media){
+      console.log(url, media)
+      if (media.type == "image") {
+        uploader.add(url)
+      }
+      else {
+        uploader.addVideo(media)
+      }
+    })
   }))
 }
 OKUpload.prototype.handleFileSelect = function(e) {
@@ -50,6 +58,9 @@ OKUpload.prototype.success = function(data){
 OKUpload.prototype.add = function(media){
   console.log(media)
 }
+OKUpload.prototype.addVideo = function(media){
+  console.log(media)
+}
 OKUpload.prototype.error = function(error){
   throw error
 }
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 4d31413..d5d8b66 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -40,7 +40,7 @@
             <input type="file" accept="image/*">
             <button>+ Add image</button>
           </div>
-          <input class="add-image-url" type="text" placeholder="+ Add URL">
+          <input class="add-url" type="text" placeholder="+ Add URL">
         </div>
         <div class="image-element">
           <input class="uri" type="hidden" name="{{name}}[uri]" value="{{spec.value.uri}}">
@@ -49,6 +49,55 @@
           <button class="remove-image">x</button>
         </div>
       </div>
+    {% elsif type == 'media-list' %}
+      <div class="media-list group loaded">
+        <div class="fields">
+          <div class="add-image-button">
+            <input type="file" accept="image/*" multiple>
+            <button>+ Add images</button>
+          </div>
+          <input class="add-url" type="text" placeholder="+ Add Image/Video URL">
+        </div>
+
+        <script type="text/html" class="image-template">
+          <li class="image-element">
+            <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
+            <textarea class="caption" name="{{name}}[][caption]"></textarea>
+            <img>
+            <button class="remove">x</button>
+          </li>
+        </script>
+
+        <script type="text/html" class="video-template">
+          <li class="video-element">
+            <input name="{{name}}[][type]" type="hidden" class="video-type" hidden>
+            <input name="{{name}}[][token]" type="hidden" class="video-token" hidden>
+            <label>Caption</label>
+            <input name="{{name}}[][title]" type="text" class="video-title">
+            <label>Thumbnail</label>
+            <input name="{{name}}[][thumb]" type="text" class="video-thumb">
+            <img>
+            <button class="remove">x</button>
+          </li>
+        </script>
+
+        <ol>
+          {% for image in spec.value %}
+            {% if image.token %}
+              <li class="video">
+                {{ JSON.stringify(spec.value) }}
+              </li>
+            {% else %}
+              <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}}">
+                <button class="remove-image">x</button>
+              </li>
+            {% endif %}
+          {% endfor %}
+        </ol>
+      </div>
     {% elsif type == 'captioned-image-list' %}
       <div class="image-list group loaded">
         <div class="fields">
@@ -56,10 +105,10 @@
             <input type="file" accept="image/*" multiple>
             <button>+ Add images</button>
           </div>
-          <input class="add-image-url" type="text" placeholder="+ Add URL">
+          <input class="add-url" type="text" placeholder="+ Add URL">
         </div>
 
-        <script type="text/html" id="captioned-image-template">
+        <script type="text/html" class="image-template">
           <li class="image-element">
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
             <textarea class="caption" name="{{name}}[][caption]"></textarea>
-- 
cgit v1.2.3-70-g09d2


From 03d2e95c057e1dcbcf9994c3f32d8e28e6b6af53 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 27 Apr 2015 16:58:09 -0400
Subject: save/update multimedia field

---
 site/db.json                                    |  6 ++++++
 themes/okadmin/public/js/app.js                 |  6 +++---
 themes/okadmin/templates/partials/inputs.liquid | 23 +++++++++++++++++------
 3 files changed, 26 insertions(+), 9 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/site/db.json b/site/db.json
index bf68d79..c391558 100644
--- a/site/db.json
+++ b/site/db.json
@@ -17,6 +17,12 @@
         "thumb": ""
       },
       "images": [
+        {
+          "type": "vimeo",
+          "token": "112498725",
+          "title": "FW14-2H-VIDEO-V4 2",
+          "thumb": "http://i.vimeocdn.com/video/497493142_640.jpg"
+        },
         {
           "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F1b55cd3c-eb7d-4ed6-bfe9-2bc53960987d.jpg",
           "caption": ""
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index c46cea8..1eb81dc 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -10,7 +10,7 @@ var OKAdmin = function(){
       var $el = $(imageTemplate)
       $el.find(".uri").val(url)
       $el.find("img").attr("src", url)
-      $("ol", parent).append($el)
+      $("ol", parent).prepend($el)
     }
   })
   // delete image from gallery
@@ -30,7 +30,7 @@ var OKAdmin = function(){
       var $el = $(imageTemplate)
       $el.find(".uri").val(url)
       $el.find("img").attr("src", url)
-      $("ol", parent).append($el)
+      $("ol", parent).prepend($el)
     }
     uploader.addVideo = function(media){
       console.log(media)
@@ -42,7 +42,7 @@ var OKAdmin = function(){
       $el.find(".video-title").val( media.title )
       $el.find(".video-thumb").val( media.thumbnail )
       $el.find("img").attr("src", media.thumbnail )
-      $("ol", parent).append($el)
+      $("ol", parent).prepend($el)
    }
   })
   // delete image from gallery
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index d5d8b66..1b8d6b4 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -46,7 +46,7 @@
           <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}}">
-          <button class="remove-image">x</button>
+          <button class="remove">x</button>
         </div>
       </div>
     {% elsif type == 'media-list' %}
@@ -70,12 +70,14 @@
 
         <script type="text/html" class="video-template">
           <li class="video-element">
+            <div style="float: left">
             <input name="{{name}}[][type]" type="hidden" class="video-type" hidden>
             <input name="{{name}}[][token]" type="hidden" class="video-token" hidden>
             <label>Caption</label>
             <input name="{{name}}[][title]" type="text" class="video-title">
             <label>Thumbnail</label>
             <input name="{{name}}[][thumb]" type="text" class="video-thumb">
+            </div>
             <img>
             <button class="remove">x</button>
           </li>
@@ -84,15 +86,24 @@
         <ol>
           {% for image in spec.value %}
             {% if image.token %}
-              <li class="video">
-                {{ JSON.stringify(spec.value) }}
+              <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>
+                <label>Caption</label>
+                <input name="{{name}}[][title]" value="{{image.title}}" type="text" class="video-title">
+                <label>Thumbnail</label>
+                <input name="{{name}}[][thumb]" value="{{image.thumb}}" type="text" class="video-thumb">
+                </div>
+                <img src="{{image.thumb}}">
+                <button class="remove">x</button>
               </li>
             {% else %}
               <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}}">
-                <button class="remove-image">x</button>
+                <button class="remove">x</button>
               </li>
             {% endif %}
           {% endfor %}
@@ -113,7 +124,7 @@
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
             <textarea class="caption" name="{{name}}[][caption]"></textarea>
             <img alt="{{image.caption}}">
-            <button class="remove-image">x</button>
+            <button class="remove">x</button>
           </li>
         </script>
 
@@ -123,7 +134,7 @@
               <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}}">
-              <button class="remove-image">x</button>
+              <button class="remove">x</button>
             </li>
           {% endfor %}
         </ol>
-- 
cgit v1.2.3-70-g09d2


From e75bc9e99c672d774e1e935b37c73970d7b6d2c8 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 1 May 2015 19:10:17 -0400
Subject: edits

---
 site/index.js                                   |   1 +
 site/public/assets/images/next.png              | Bin 563 -> 1063 bytes
 site/public/assets/images/prev.png              | Bin 0 -> 1069 bytes
 site/public/assets/javascripts/_env.js          |  33 +++++++++++++++++++---
 site/public/assets/style.css                    |  35 ++++++++++++++++++++----
 site/templates/page.liquid                      |   4 ---
 site/templates/project.liquid                   |   6 ++--
 themes/okadmin/templates/partials/inputs.liquid |   1 +
 8 files changed, 63 insertions(+), 17 deletions(-)
 create mode 100644 site/public/assets/images/prev.png

(limited to 'themes/okadmin/templates')

diff --git a/site/index.js b/site/index.js
index 3434742..50bd870 100644
--- a/site/index.js
+++ b/site/index.js
@@ -41,6 +41,7 @@ var app  = okcms.createApp({
     { type: 'page', static: {id: 'about'}},
     { type: 'page', static: {id: 'contact'}},
     { type: 'shape', static: {id: 'shape-images'}},
+    { type: 'shape', static: {id: 'about-images'}},
     { type: 'advertising' },
     { type: 'content' },
     { type: 'experiential' },
diff --git a/site/public/assets/images/next.png b/site/public/assets/images/next.png
index 7997259..b5782ed 100644
Binary files a/site/public/assets/images/next.png and b/site/public/assets/images/next.png differ
diff --git a/site/public/assets/images/prev.png b/site/public/assets/images/prev.png
new file mode 100644
index 0000000..82050a4
Binary files /dev/null and b/site/public/assets/images/prev.png differ
diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js
index 45d5231..3a72e13 100644
--- a/site/public/assets/javascripts/_env.js
+++ b/site/public/assets/javascripts/_env.js
@@ -286,6 +286,21 @@ function build_scene () {
     offset: 200,
   }) )
   
+  var wasPrev = false, navWidth
+  function resize_for_prev_next(){
+    navWidth = $("nav").width()
+  }
+  resize_for_prev_next()
+  $(window).resize(resize_for_prev_next)
+  $(window).mousemove(function(e){
+    if (! gallery) return
+    prev = ((e.pageX - navWidth) / window.innerWidth) < 0.39
+    if (prev !== wasPrev) {
+      wasPrev = prev
+      $("#okgallery").toggleClass("prev", prev)
+    }
+  })
+  
 	strips.forEach(function(strip){ strip.update(0) })
 	
 	scene.update()
@@ -416,9 +431,15 @@ function build_gallery () {
   })
 
   $("#okgallery .video").each(function(){
-    var $play = $('<div class="play"></div>')
     var $el = $(this)
+    if (! is_mobile) {
+      var $underlay = $('<div class="underlay"></div>')
+      $underlay.css("background-image", $el.css("background-image"))
+      $el.css("background-image", 'none')
+    }    
+    var $play = $('<div class="play"></div>')
     $el.append($play)
+    $el.append($underlay)
     if (is_desktop) {
       $play.on("click", function(e){
         e.stopPropagation()
@@ -454,7 +475,11 @@ function build_gallery () {
       // load_video($el)
     }
     else {
-      gallery.next()
+      if ($("#okgallery").hasClass("prev")) {
+        gallery.previous()
+      } else {
+        gallery.next()
+      }
     }
   })
   gallery.loader.on("progress", function(imagesLoaded, loadingImage){
@@ -484,8 +509,8 @@ function load_video ($el) {
   var $embed = $('<iframe src="https://player.vimeo.com/video/' + vimeo_id + '?autoplay=1&title=0&byline=0&portrait=0" width="500" height="281" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>')
   $el.append($embed)
   if (! is_mobile) {
-    var $mask = $('<div class="mask"></div>')
-    $el.append($mask)
+//     var $mask = $('<div class="mask"></div>')
+//     $el.append($mask)
   }
   var player = $f( $el.find("iframe")[0] )
   $el.data('player', player)
diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index 543a34a..6316159 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -337,7 +337,7 @@ nav .sub {
 
 nav .sub.active {
 	display: inline-block;
-	max-height:180px;
+	max-height: 450px;
 }
 
 nav .sub a {
@@ -519,12 +519,14 @@ nav .sub.active a {
 	-webkit-column-count: 3;
 	-moz-column-count: 3;
 	column-count: 3;
+  min-height: 130px;
 }
 .entry span div.content.noline {
 	border-top: 0;
 	padding-top: 0;
 }
 .entry span div.content div {
+  min-height: 130px;
 	width:50%;
 	-webkit-column-count: 3;
 	-moz-column-count: 3;
@@ -573,6 +575,10 @@ nav .sub.active a {
 	height:100%;
 	cursor: url(images/next.png), auto!important;
 }
+.gallery.prev,
+.gallery.prev .cell {
+	cursor: url(images/prev.png), auto!important;
+}
 .cell.video {
 	width: 80%;
 	background-size: cover;
@@ -613,12 +619,24 @@ nav .sub.active a {
 	-webkit-transition:0.4s opacity ease-in;
 	transition:0.4s opacity ease-in;
 	pointer-events: none; 
-}
-.cell iframe {
   height: 200%;
   -webkit-transform: translateY(-25%);
   transform: translateY(-25%);
 }
+.cell .underlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+	width: 100%;
+	height:100%;
+	opacity:0.2;
+	-webkit-transition:0.4s opacity ease-in;
+	transition:0.4s opacity ease-in;
+	pointer-events: none; 
+  background-size: cover;
+  background-position: center center;
+}
+
 .fullscreen {
 	text-align: right;
 }
@@ -679,22 +697,27 @@ nav .sub.active a {
 	opacity:0.0;
 	transition:0.4s opacity ease-in;
 }
+
 .cell img.loaded {
   opacity: 0.2;
 }
-.cell.is-selected img, .cell.is-selected iframe {
+.cell.is-selected .underlay, .cell.is-selected img, .cell.is-selected iframe {
 	opacity:1;
 	pointer-events: auto; 
 }
-.cell .mask {
+.cell .underlay {
 	z-index: 2;
 	width: 100%;
 	height: 100%;
 	position: absolute;
 	top: 0; left: 0;
 }
-.cell.playing .mask {
+.cell.loaded .underlay {
+  background-image: none !important;
+}
+.cell.playing .underlay {
 	pointer-events: none;
+	opacity: 0;
 }
 .logo {
 	position: fixed;
diff --git a/site/templates/page.liquid b/site/templates/page.liquid
index 5c3cabe..63f71f2 100644
--- a/site/templates/page.liquid
+++ b/site/templates/page.liquid
@@ -2,10 +2,6 @@
   <span>
 		{% if page.image %}
       <span class="postname">{{page.title}}</span>
-			<div class="galnav">
-				<span class="prevbutton">PREVIOUS ASSET</span>
-				<span class="nextbutton">NEXT ASSET</span>
-			</div>
 		  <img class="mainimg" src="{{page.image}}">
       <div class="content">
         {{page.body | newline_to_br}}
diff --git a/site/templates/project.liquid b/site/templates/project.liquid
index 0dc828c..8c9a26e 100644
--- a/site/templates/project.liquid
+++ b/site/templates/project.liquid
@@ -2,13 +2,13 @@
 	<span>
 		<span class="postname">{{project.title}}</span>
 		<div class="galnav">
-			<span class="prevbutton">PREVIOUS ASSET</span>
-			<span class="nextbutton">NEXT ASSET</span>
+			<span class="prevbutton">PREVIOUS</span>
+			<span class="nextbutton">NEXT</span>
 		</div>
 		<div class="gallery" id="okgallery">
     {% for media in project.media %}
       {% if media.token %}
-        <div class="cell video" style="background-image:url({{ media.thumb }})" data-video="https://player.vimeo.com/video/{{ media.token }}" data-caption="{{ media.title }}"></div>
+        <div class="cell video" style="background-image:url({{ media.thumb }})" data-video="https://player.vimeo.com/video/{{ media.token }}" data-caption=""></div>
       {% else %}
         <div class="cell" data-caption="{{ media.caption }}"><img src="{{ media.uri }}"></div>
       {% endif %}
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 1b8d6b4..b29a289 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -139,6 +139,7 @@
           {% endfor %}
         </ol>
       </div>
+
     {% elsif type == 'meta' %}
       <input class="hidden" type="hidden" name="{{name}}" value="{{spec.value}}">
     {% else %}
-- 
cgit v1.2.3-70-g09d2


From 22d12686d920414098394f0305e12a942807c150 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Sun, 17 May 2015 13:54:46 +0200
Subject: about page

---
 site/db.json                                    | 104 ++++++++++++++++--------
 site/index.js                                   |   3 +-
 site/public/assets/javascripts/app.js           |   6 ++
 site/public/assets/style.css                    |  70 ++++++++++++++--
 site/templates/about.liquid                     |  10 +--
 themes/okadmin/public/css/main.css              |   3 +
 themes/okadmin/templates/partials/inputs.liquid |  31 +++++++
 7 files changed, 182 insertions(+), 45 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/site/db.json b/site/db.json
index 9f6498a..ab95019 100644
--- a/site/db.json
+++ b/site/db.json
@@ -1251,9 +1251,11 @@
     {
       "id": "about",
       "title": "WHO WE ARE",
-      "body": "TWO HUSTLERS IS A CREATIVE COLLECTIVE OF RADICAL THINKERS, DESIGNERS AND STORYTELLERS.\r\n\r\nWE BUILD TRANSFORMATIVE EXPERIENCES FOR PASSIONATE BRANDS. \r\n\r\nWE ARE PLAYFUL. WE ARE REBELLIOUS. WE ARE OBSESSED. \r\n\r\n\r\n\r\nFOR BRANDS WHO WANT TO PLAY WITH US, <a href=\"mailto:collaborate@twohustlers.com?subject=SAY HELLO!\">SAY HELLO!</a>\r\n\r\nFOR ANYONE WHO WANTS TO JOIN OUR FAMILY, <a href=\"mailto:jobs@twohustlers.com?subject=JOIN THE FAMILY!\"> SHOW US WHAT YOU ARE MADE OF!</a>\r\n\r\nWEBSITE BY <a href=\"http://okfoc.us/\">OKFOCUS</a>",
+      "body": "TWO HUSTLERS IS A CREATIVE COLLECTIVE OF RADICAL THINKERS, DESIGNERS AND STORYTELLERS.\r\n\r\nWE BUILD TRANSFORMATIVE EXPERIENCES FOR PASSIONATE BRANDS. \r\n\r\nWE ARE PLAYFUL. WE ARE REBELLIOUS. WE ARE OBSESSED. ",
       "image": "http://www.lansdowneresort.com/meetings/assets/images/masthead/meetings-team-building.jpg",
-      "__index": "1"
+      "__index": "1",
+      "contact": "FOR BRANDS WHO WANT TO PLAY WITH US, <a href=\"mailto:collaborate@twohustlers.com?subject=SAY HELLO!\">SAY HELLO!</a>\r\n\r\nFOR ANYONE WHO WANTS TO JOIN OUR FAMILY, <a href=\"mailto:jobs@twohustlers.com?subject=JOIN THE FAMILY!\"> SHOW US WHAT YOU ARE MADE OF!</a>\r\n\r\nWEBSITE BY <a href=\"http://okfoc.us/\">OKFOCUS</a>",
+      "dateCreated": ""
     },
     {
       "id": "contact",
@@ -1337,66 +1339,102 @@
       "__index": "1",
       "images": [
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fc9b7ab94-a319-48b4-871b-6d1f0a91c55b.gif",
-          "caption": "Sara@nicopanda.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F3031754c-9295-4690-bb38-d1b21249f542.gif",
+          "caption": "",
+          "label": "Nicola Formichetti"
+        },
+        {
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F06a6a4c3-10ad-4b75-8351-85ffc0e74c98.gif",
+          "caption": "",
+          "label": "Kevin Kollenda"
+        },
+        {
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F5bece78f-bf0b-4422-abc6-d306f8fae700.gif",
+          "caption": "propersavage@gmail.com",
+          "label": "Devin Savage"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F9303920a-07a1-457f-a33d-8959f0acc240.gif",
-          "caption": "propersavage@gmail.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F71c71033-d36f-4375-bdd1-271db3b9e75c.gif",
+          "caption": "",
+          "label": "Zak Krevitt"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F085bc32f-f3fa-485f-8411-4b0e33c87c34.gif",
-          "caption": "Tracy@Twohustlers.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F742c60d2-9f3f-44bb-a445-71871ca28439.gif",
+          "caption": "",
+          "label": "Tyler Rose"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F3199e264-13d0-4331-9b3a-9f453e723d4e.gif",
-          "caption": "Kei@twohustlers.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F7eca88a2-94e1-4d41-ae77-af01a947ad44.gif",
+          "caption": "",
+          "label": "Tracy le Marquand"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fbe142c51-d613-41a9-9432-f96ce4493f01.gif",
-          "caption": "Steve@twohustlers.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fe85e3d1f-6191-496f-acca-f370687c69fe.gif",
+          "caption": "",
+          "label": "Max de Castro"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fc91b507a-9a1d-41d6-a500-138c14b8bed2.gif",
-          "caption": "Max@twohustlers.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F2b71ee1e-3de9-4a3d-9b39-a96065ae4ec1.gif",
+          "caption": "",
+          "label": "Ian Milan"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fb40d3a6d-1348-4861-a0ab-1280480d1c20.gif",
-          "caption": "tomorrowistheendoftheworld@gmail.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F17b0d9b9-cd22-43ac-9055-f8bc8cb54700.gif",
+          "caption": "Sara@nicopanda.com",
+          "label": "Sarah Kim"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F2306f2f9-e41b-46bb-9458-6d0624b8f6ba.gif",
-          "caption": "Tiffanie@twohustlers.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F343ae47e-8669-4c57-9975-e4c3fc5a02d4.gif",
+          "caption": "",
+          "label": "Steve Gershman"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fe4ee44a3-0b21-4767-8584-397425abb291.gif",
-          "caption": "kevin@twohustlers.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F55f0fef9-bc7c-4dbe-baa8-c0d74c9c9ab0.gif",
+          "caption": "",
+          "label": "Latif Newab"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fff60aa79-d4ad-43d2-915e-d8e253330ca4.gif",
-          "caption": "Latif@nicopanda.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F724e1ff5-7683-43cb-a637-9dae58214185.gif",
+          "caption": "",
+          "label": "Kei Furuichi"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fc8e8276c-3b7c-48e1-8e1f-de902ca1054d.gif",
-          "caption": "Ian@studioformichetti.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F70fffb9c-7fc9-4dd1-af65-e39ebd99e930.gif",
+          "caption": "dereklmurdock@gmail.com",
+          "label": "Derrick Murdock"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F4369b27f-095e-4e05-b7b8-3dc88f0a652f.gif",
-          "caption": "dereklmurdock@gmail.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F7655a0ec-e56c-4383-a22a-7e987949f52e.gif",
+          "caption": "Juan@nicopanda.com",
+          "label": "Juan Quiceno"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fa0eed5ee-1c19-41f4-be2e-d0655874be71.gif",
-          "caption": "Tyler@nicopanda.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F04b3e31f-b9ac-48c8-9c0c-7c88abe771b5.gif",
+          "caption": "",
+          "label": "Andreas Aresti"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F959c8f09-9562-4d43-8bfb-4f73b9f71dcc.gif",
-          "caption": "Daniel@studioformichetti.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fa547b434-b48d-43ff-986b-ed9c217b9257.gif",
+          "caption": "",
+          "label": "Tiffanie Baine"
         },
         {
-          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fe9743a0f-7c5e-411a-b59e-683e6ff9d407.gif",
-          "caption": "Juan@nicopanda.com"
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F97c09ed8-27d7-4a38-8877-c8712640cbd5.gif",
+          "caption": "",
+          "label": "Frankie The Pug"
+        },
+        {
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F4bd5a1e5-38b1-4dba-af04-48ce3f4bc74d.gif",
+          "caption": "",
+          "label": "Daniel Cingari"
+        },
+        {
+          "uri": "https://ltho.s3.amazonaws.com/twohustlers%2F7ee0e3d4-4312-41dc-8fff-943b68ae6171.gif",
+          "caption": "",
+          "label": "Angelo Balassone"
         }
-      ]
+      ],
+      "dateCreated": ""
     }
   ]
 }
\ No newline at end of file
diff --git a/site/index.js b/site/index.js
index 4c5c2ca..04d2455 100644
--- a/site/index.js
+++ b/site/index.js
@@ -24,6 +24,7 @@ var app  = okcms.createApp({
       id: {type: 'string', hidden: true},
       title: {type: 'string'},
       body: {type: 'text'},
+      contact: {type: 'text'},
       image: {type: 'string'}
     },
     advertising: projectSchema,
@@ -33,7 +34,7 @@ var app  = okcms.createApp({
     shape: {
       id: {type: 'string', id: true, hidden: true},
       title: {type: 'string'},    
-      images: {type: 'captioned-image-list'},
+      images: {type: 'double-captioned-image-list'},
     }
   },
 
diff --git a/site/public/assets/javascripts/app.js b/site/public/assets/javascripts/app.js
index 0d51a3f..4e00f30 100644
--- a/site/public/assets/javascripts/app.js
+++ b/site/public/assets/javascripts/app.js
@@ -19,6 +19,12 @@ app.init = function () {
 
 app.launch = function () {
   // if ($.browser.msie || ! has3d()) { return app.fallback() }
+  if ($.browser.msie) {
+    $("html").addClass("msie")
+  }
+  else {
+    $("html").addClass("notmsie")
+  }
   
 	scene = new MX.Scene().addTo('#scene')
 
diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index fe08fed..2d0bd5a 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -713,6 +713,9 @@ nav .sub.active a {
 	opacity: 1.0;
 	cursor:pointer;
 }
+.msie .entry .caption {
+  display: none;
+}
 .desktop .caption:hover {
 	background:#222;
 	color:#222;
@@ -824,16 +827,36 @@ nav .sub.active a {
 	top:0;
 }
 
+.entry .brady {
+  width: 72vw;
+}
 .brady {
   display: block;
-  max-width: 1001px;
 }
-.brady a, .brady img {
-  width: 200px; height: 200px;
+.brady > a {
+  width: 18vw; height: 18vw;
+  background-size: cover;
+  background-position: center center;
+  position: relative;
+  display: block;
+  float: left;
+}
+.brady div {
+  width: 17vw;
+  height: 16w;
   position: relative;
-  display: inline-block;
+  display: block;
+  float: left;
+  padding: 1vw;
+  font-size: 0.8vw;
+  line-height: 1.4vw;
+  border: 1px solid black;
+  margin: 0.5vw 0.5vw 0 0.5vw;
 }
-.desktop .brady a:hover:after {
+.brady > a:nth-child(3) {
+  margin-right: 1vw;
+}
+.desktop .brady > a:hover:after {
   content: 'SAY HELLO!';
   position: absolute;
   top: 40%;
@@ -843,6 +866,25 @@ nav .sub.active a {
   font-size: 22px;
   width: 100%;
 }
+.brady span {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  background: white;
+  opacity: 0;
+  color: black;
+  margin-top: -4px;
+  font-size: 1vw;
+  padding: 2px 0 1px 2px;
+  
+	transition: 0.1s opacity ease-in;
+  display: block;
+  text-overflow: ellipsis;
+  text-transform: uppercase;
+}
+.desktop .brady > a:hover span {
+  opacity: 1;
+}
 
 .project {
   float: left;
@@ -860,6 +902,9 @@ nav .sub.active a {
 .desktop .ready .project:hover {
 	opacity: 1.0;
 }
+.msie .project {
+  opacity: 1.0 !important;
+}
 .entry.hover .project { opacity: 0.5 }
 .entry.hover .project.hover { opacity: 1.0 }
 
@@ -884,7 +929,8 @@ nav .sub.active a {
   text-transform: uppercase;
 }
 .mobile .project span,
-.desktop .project:hover span {
+.desktop .project:hover span,
+.msie .project span {
   opacity: 1;
 }
 .undone .project:nth-child(1) { transition-delay:0.05s; }
@@ -1044,6 +1090,18 @@ nav .sub.active a {
 	  font-size: 0.6em;
 	  width: 120px;
 	}
+	nav .bottom {
+    height: 27%;
+  }
+  nav .sub.active a {
+    padding: 2px 0 4px 20px;
+  }
+  nav .cat {
+    padding: 2px 0 2px 10px;
+  }
+  .contact {
+    margin-top: 6px;
+  }
 	.menuActive #entry_container .entry.all {
     width:65%;
 	}
diff --git a/site/templates/about.liquid b/site/templates/about.liquid
index 6c762b2..c693b61 100644
--- a/site/templates/about.liquid
+++ b/site/templates/about.liquid
@@ -1,9 +1,9 @@
 <div class="entry page">
   <span>
-    <span class="postname">{{page.title}}</span>
-    <span class="brady">{% for image in shape.images %}<a href="mailto:{{image.caption}}?subject=SAY HELLO!"><img src="{{ image.uri }}"></a>{% endfor %}</span>
-    <div class="content">
-      {{page.body | newline_to_br}}
-    </div>
+    <span class="brady">
+      <div class="aboutcontent">{{page.body | newline_to_br}}</div>
+      {% for image in shape.images %}<a href="mailto:{{image.caption}}?subject=SAY HELLO!" style="background-image:url({{ image.uri }})"><span>{{ image.label }}</span></a>{% endfor %}
+      <div class="contactcontent">{{page.contact | newline_to_br}}</div>
+    </span>
   </span>
 </div>
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 5dbd910..e5af10c 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -335,9 +335,12 @@ button, input[type=submit] {
 .image-element .remove:hover {
 	color: red;
 }
+
+/* 
 .remove {
   display: none;
 }
+ */
 
 #delete_form button:hover { color: red }
 
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index b29a289..1ddbffd 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -139,7 +139,38 @@
           {% endfor %}
         </ol>
       </div>
+    {% elsif type == 'double-captioned-image-list' %}
+      <div class="image-list group loaded">
+        <div class="fields">
+          <div class="add-image-button">
+            <input type="file" accept="image/*" multiple>
+            <button>+ Add images</button>
+          </div>
+          <input class="add-url" type="text" placeholder="+ Add URL">
+        </div>
+
+        <script type="text/html" class="image-template">
+          <li class="image-element">
+            <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
+            <input class="caption" name="{{name}}[][caption]">
+            <input class="caption" name="{{name}}[][label]">
+            <img alt="{{image.caption}}">
+            <button class="remove">x</button>
+          </li>
+        </script>
 
+        <ol>
+          {% for image in spec.value %}
+            <li class="image-element">
+              <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
+              <input class="caption" name="{{name}}[{{forloop.index0}}][caption]" value="{{image.caption}}">
+              <input class="caption" name="{{name}}[{{forloop.index0}}][label]" value="{{image.label}}">
+              <img src="{{image.uri}}" alt="{{image.caption}}">
+              <button class="remove">x</button>
+            </li>
+          {% endfor %}
+        </ol>
+      </div>
     {% elsif type == 'meta' %}
       <input class="hidden" type="hidden" name="{{name}}" value="{{spec.value}}">
     {% else %}
-- 
cgit v1.2.3-70-g09d2


From d595b5447a40245d33ac2263f01123b7ea835119 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Sun, 17 May 2015 14:08:58 +0200
Subject: blah

---
 themes/okadmin/templates/partials/inputs.liquid | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 1ddbffd..deaf260 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -151,22 +151,22 @@
 
         <script type="text/html" class="image-template">
           <li class="image-element">
-            <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
-            <input class="caption" name="{{name}}[][caption]">
-            <input class="caption" name="{{name}}[][label]">
             <img alt="{{image.caption}}">
             <button class="remove">x</button>
+            <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
+            <input class="caption" name="{{name}}[][label]">
+            <input class="caption" name="{{name}}[][caption]">
           </li>
         </script>
 
         <ol>
           {% for image in spec.value %}
             <li class="image-element">
-              <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
-              <input class="caption" name="{{name}}[{{forloop.index0}}][caption]" value="{{image.caption}}">
-              <input class="caption" name="{{name}}[{{forloop.index0}}][label]" value="{{image.label}}">
               <img src="{{image.uri}}" alt="{{image.caption}}">
               <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}}">
+              <input class="caption" name="{{name}}[{{forloop.index0}}][caption]" value="{{image.caption}}">
             </li>
           {% endfor %}
         </ol>
-- 
cgit v1.2.3-70-g09d2


From fdb5ca9b53d640bacced7ce9f1c5cb2043fabd75 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Sun, 17 May 2015 14:09:45 +0200
Subject: being very nice

---
 themes/okadmin/templates/partials/inputs.liquid | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index deaf260..6eb1e43 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -154,8 +154,8 @@
             <img alt="{{image.caption}}">
             <button class="remove">x</button>
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
-            <input class="caption" name="{{name}}[][label]">
-            <input class="caption" name="{{name}}[][caption]">
+            <input class="caption" name="{{name}}[][label]" placeholder="Name">
+            <input class="caption" name="{{name}}[][caption]" placeholder="Email">
           </li>
         </script>
 
@@ -165,8 +165,8 @@
               <img src="{{image.uri}}" alt="{{image.caption}}">
               <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}}">
-              <input class="caption" name="{{name}}[{{forloop.index0}}][caption]" value="{{image.caption}}">
+              <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">
             </li>
           {% endfor %}
         </ol>
-- 
cgit v1.2.3-70-g09d2


From 7e40774959e67f48035da8653b666dd05f35c497 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Tue, 26 May 2015 17:11:45 -0400
Subject: Add tag-list input type

---
 app/node_modules/okschema/index.js              | 4 ++++
 themes/okadmin/templates/partials/inputs.liquid | 5 +++++
 2 files changed, 9 insertions(+)

(limited to 'themes/okadmin/templates')

diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index c5a56c4..0079f51 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -61,6 +61,10 @@ var types = {
   'meta': {
     parent: 'string',
     assertValid: function(spec, value) {}
+  },
+  'tag-list': {
+    parent: 'string',
+    assertValid: function(spec, value) {}
   }
 }
 
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 6eb1e43..25ad197 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -49,6 +49,11 @@
           <button class="remove">x</button>
         </div>
       </div>
+    {% elsif type == 'tag-list' %}
+      <div class="tag-list">
+        <input id="{{name}}-input" name="{{name}}" value="{{spec.value}}"
+            placeholder="Enter a comma separated list of tags.">
+      </div>
     {% elsif type == 'media-list' %}
       <div class="media-list group loaded">
         <div class="fields">
-- 
cgit v1.2.3-70-g09d2


From e923cb0e5e1efac4fba534aba87f6b6e9d95d3f0 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Tue, 2 Jun 2015 15:55:45 -0400
Subject: Add link-list field type

---
 themes/okadmin/public/css/main.css              |  6 ++++
 themes/okadmin/public/js/app.js                 | 39 ++++++++++++++++++++++++-
 themes/okadmin/templates/partials/inputs.liquid | 25 +++++++++++++++-
 3 files changed, 68 insertions(+), 2 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index e5af10c..094e66b 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -301,6 +301,12 @@ button, input[type=submit] {
 .main.resource form .video-element input[type=text] {
   width: 15em;
 }
+.main .link-list .add-link-btn,
+.main .link-list .remove-link-btn {
+  margin: 0;
+  height: 2em;
+  line-height: 1em;
+}
 .add-image-button {
   background: #ddd;
   clear: left;
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 2667ce6..f989c7b 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -99,7 +99,44 @@ var OKAdmin = function(){
       $el.parent().find(".video-thumb").val( media.thumbnail )
     })
   }))
-  
+
+  // Add a new link to the list
+  $('.link-list').on('click', '.add-link-btn', function(e) {
+    e.preventDefault()
+    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('')
+  })
+
+  // 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()
+  })
+
   // fix post indexing in list-driven inputs
   $(".main.resource form").submit(function(e){
     var $id = $("[name=id]"), $title = $("[name=title]"), $menu = $("[name=menu]"), $section = $(".resource.main")
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 25ad197..0d5321b 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -3,7 +3,8 @@
   {% assign spec = pair[1] %}
   {% assign type = spec.type %}
 
-  <div class="property {{type}} {% if spec.hidden %}hidden{% endif %}">
+  <div class="property {{type}} {% if spec.hidden %}hidden{% endif %}"
+       data-name="{{name}}">
     <label for="{{name}}">{{name | capitalize}}</label>
 
     {% if type == 'string' %}
@@ -54,6 +55,28 @@
         <input id="{{name}}-input" name="{{name}}" value="{{spec.value}}"
             placeholder="Enter a comma separated list of tags.">
       </div>
+    {% 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>
+          {% endfor %}
+        </div>
+        <input type="text"
+               class="link-input-new"
+               placeholder="http://www.example.com">
+        <button class="add-link-btn">+</button>
+      </div>
+
     {% elsif type == 'media-list' %}
       <div class="media-list group loaded">
         <div class="fields">
-- 
cgit v1.2.3-70-g09d2


From bcca89ebfd9ea93356d934edd5218335430746b6 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Tue, 2 Jun 2015 17:29:57 -0400
Subject: Add 'date' field type

---
 app/node_modules/okschema/index.js              |  4 ++++
 themes/okadmin/public/css/main.css              |  4 ++++
 themes/okadmin/public/js/app.js                 | 19 +++++++++++++++++++
 themes/okadmin/templates/partials/inputs.liquid | 17 +++++++++++++++--
 4 files changed, 42 insertions(+), 2 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index 0079f51..67f6e42 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -65,6 +65,10 @@ var types = {
   'tag-list': {
     parent: 'string',
     assertValid: function(spec, value) {}
+  },
+  'date': {
+    parent: 'string',
+    assertValid: function(spec, value) {}
   }
 }
 
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 094e66b..a5fbdeb 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -211,6 +211,10 @@ label {
 button, input[type=submit] {
   cursor: pointer;
 }
+.main.resource .date input {
+  /* date inputs need font family override */
+  font-family: "Helvetica", sans-serif;
+}
 .main.resource form .group {
   display: block;
   float: left;
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index f989c7b..d58cb2a 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -162,6 +162,25 @@ var OKAdmin = function(){
       $id.val( slug )
     }
 
+    // Parse date input
+    $('.property .date').each(function(i, el) {
+      var name = $(el).parent('.property').data('name')
+      var $input = $(el).find('input')
+      var date = new Date($input.val())
+      // Set to middle of day so it is the same date
+      // for all locales
+      date.setUTCHours(12)
+      var dateString = date.toUTCString()
+      var normalizedInput = document.createElement('input')
+      $(normalizedInput).attr({
+        name: name,
+        type: 'text',
+        value: dateString
+      })
+      $input.remove()
+      $(el).append(normalizedInput)
+    })
+
     $("ol").each(function(){
       $("li", this).each(function(index){
         $(this).find("input,textarea").each(function(){
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 0d5321b..e766558 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -50,10 +50,23 @@
           <button class="remove">x</button>
         </div>
       </div>
+
+    {% elsif type =='date' %}
+
+      <div class="date">
+        <input name="{{name}}"
+               type="date"
+               {% if spec.value %}
+                 value="{{spec.value | date: '%Y-%m-%d'}}"
+               {% endif %}
+               >
+      </div>
+
     {% elsif type == 'tag-list' %}
       <div class="tag-list">
-        <input id="{{name}}-input" name="{{name}}" value="{{spec.value}}"
-            placeholder="Enter a comma separated list of tags.">
+        <input name="{{name}}"
+               value="{{spec.value}}"
+               placeholder="Enter a comma separated list of tags.">
       </div>
     {% elsif type == 'link-list' %}
 
-- 
cgit v1.2.3-70-g09d2


From 27abfdd15714895894565124bcc660b9d6774494 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Fri, 19 Jun 2015 15:29:19 -0400
Subject: Add 'flag' data type

---
 app/node_modules/okschema/index.js              |  4 ++++
 package.json                                    |  2 +-
 themes/okadmin/public/js/app.js                 | 11 +++++++++++
 themes/okadmin/templates/partials/inputs.liquid | 13 ++++++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index 67f6e42..89b59cc 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -69,6 +69,10 @@ var types = {
   'date': {
     parent: 'string',
     assertValid: function(spec, value) {}
+  },
+  'flag': {
+    parent: 'string',
+    assertValid: function(spec, value) {}
   }
 }
 
diff --git a/package.json b/package.json
index a8a602f..50ec3e6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.0",
+  "version": "0.1.10",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index d58cb2a..4be0afc 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -181,6 +181,17 @@ var OKAdmin = function(){
       $(el).append(normalizedInput)
     })
 
+    // 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
+      if (!checked) {
+        $(input).attr('value', 'false')
+        input.checked = true
+      }
+    })
+
     $("ol").each(function(){
       $("li", this).each(function(index){
         $(this).find("input,textarea").each(function(){
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index e766558..9c1a26b 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -51,7 +51,7 @@
         </div>
       </div>
 
-    {% elsif type =='date' %}
+    {% elsif type == 'date' %}
 
       <div class="date">
         <input name="{{name}}"
@@ -62,6 +62,17 @@
                >
       </div>
 
+    {% elsif type == 'flag' %}
+
+      <div class="flag">
+        <input name="{{name}}"
+               type="checkbox"
+               {% if spec.value == 'true' %}
+                checked="true"
+               {% endif %}
+               value="true">
+      </div>
+
     {% elsif type == 'tag-list' %}
       <div class="tag-list">
         <input name="{{name}}"
-- 
cgit v1.2.3-70-g09d2


From 42fe17f3e52be163a506bf9a3953aa8adb5fd64f Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 9 Jul 2015 16:58:02 -0400
Subject: Implement groupBy queries + admin interface

---
 app/index.js                          | 14 ++++---
 app/node_modules/okadminview/index.js | 42 +++++++++------------
 app/node_modules/okquery/index.js     | 43 ++++++++++++++++++++-
 app/node_modules/okview/index.js      | 26 +++++++------
 themes/okadmin/public/js/app.js       | 12 +++---
 themes/okadmin/templates/index.liquid | 71 +++++++++++++++++++++++++----------
 6 files changed, 140 insertions(+), 68 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/app/index.js b/app/index.js
index 1c77728..d514f10 100644
--- a/app/index.js
+++ b/app/index.js
@@ -60,6 +60,7 @@ function OKCMS(options) {
     '/': { template: 'index' }
   };
   var serviceConfig = options.services || {};
+  var adminConfig = options.admin || {}
 
   var templateProvider = this._templateProvider = new OKTemplate({
     root: templateRoot,
@@ -84,7 +85,7 @@ function OKCMS(options) {
       this._createViews(viewConfig, db, meta, resourceCache, templateProvider,
           errorHandler);
   var adminViews = this._adminViews =
-      this._createAdminViews(adminPath, app, express, resourceConfig,
+      this._createAdminViews(adminConfig, adminPath, app, express, resourceConfig,
           resourceCache, adminTemplateProvider, adminMeta,
           errorHandler);
 
@@ -194,9 +195,8 @@ OKCMS.prototype._createViews = function(viewConfig, db,
   }
 };
 
-OKCMS.prototype._createAdminViews = function(path, app, express,
-  resourceConfig, resourceCache, templateProvider, meta,
-  errorHandler) {
+OKCMS.prototype._createAdminViews = function(adminConfig, path, app, express,
+  resourceConfig, resourceCache, templateProvider, meta, errorHandler) {
   var views = {};
   var withTrail = withTrailingSlash(path);
   var withoutTrail = withoutTrailingSlash(path);
@@ -221,7 +221,8 @@ OKCMS.prototype._createAdminViews = function(path, app, express,
     resourceCache: resourceCache,
     templateProvider: templateProvider,
     meta: meta,
-    errorHandler: errorHandler
+    errorHandler: errorHandler,
+    dashboardConfig: adminConfig.dashboard || {}
   });
   return views;
 };
@@ -243,7 +244,8 @@ OKCMS.prototype._createQueries = function(queryConfig, resourceCache) {
       query: query,
       as: config.as,
       sortBy: config.sortBy,
-      descending: config.descending
+      descending: config.descending,
+      groupBy: config.groupBy
     });
   });
 };
diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index f6a7cdb..924f5a5 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -40,6 +40,8 @@ function OKAdminView(options) {
   if (!options.errorHandler)
     throw new Error('No error handler provided to OKAdminView');
 
+  var dashboardConfig = options.dashboardConfig || {}
+  var dashboardResourceConfig = dashboardConfig.resources || {}
   var app = options.app;
   var express = options.express;
   var meta = options.meta;
@@ -79,10 +81,12 @@ function OKAdminView(options) {
     var id = resource.getID(staticData);
     // Check to see if there's a more specific instance
     resource = resourceCache.get(type, id) || resource;
+    var resourceOptions = dashboardResourceConfig[type] || {}
+    var groupBy = resourceOptions.groupBy
     if (resource.bound) {
-      return OKQuery({resource: resource});;
+      return OKQuery({resource: resource, groupBy: groupBy})
     } else {
-      return OKQuery({resource: resource, query: config.query})
+      return OKQuery({resource: resource, query: config.query, groupBy: groupBy})
     }
   });
 
@@ -123,7 +127,7 @@ function OKAdminView(options) {
     }));
 
     router.get('/', function readIndex(req, res, next) {
-      fetchIndexTemplateData(meta, indexQueries).then(function(data) {
+      fetchIndexTemplateData(meta, indexQueries, dashboardConfig).then(function(data) {
         view.renderIndex(req, res, assign(data, {
           success: req.flash('success'),
           errors: req.flash('errors')
@@ -316,7 +320,9 @@ OKAdminView.prototype.renderResourceNew = function(req, res, data) {
 /**
  * Annotate template data with schema info
  */
-function fetchIndexTemplateData(meta, queries) {
+function fetchIndexTemplateData(meta, queries, dashboardConfig) {
+  var resourceConfig = dashboardConfig.resources
+
   return Q.promise(function(resolve, reject) {
     Q.all(queries.map(function(query) {
       return query.get();
@@ -327,27 +333,15 @@ function fetchIndexTemplateData(meta, queries) {
         var resource = queries[i].resource;
         // We want the raw object spec
         var spec = resource.spec;
-        var key = pluralize(resource.type);
-        if (!cache[key]) {
-          cache[key] = {
-            type: resource.type,
-            spec: spec,
-            data: []
-          };
-        }
-
-        if (result.length) {
-          result.forEach(addData)
-        } else {
-          addData(result);
+        var dashConf = resourceConfig[resource.type] || {}
+        var groupBy = dashConf.groupBy
+        var key = pluralize(resource.type)
+        cache[key] = {
+          type: resource.type,
+          spec: spec,
+          data: result,
+          groupBy: groupBy
         }
-
-        function addData(data) {
-          // Report id to template under standard name
-          data.id = resource.getID(data);
-          cache[key].data.push(data);
-        }
-
         return cache;
       }, {});
 
diff --git a/app/node_modules/okquery/index.js b/app/node_modules/okquery/index.js
index 4051f95..09d867d 100644
--- a/app/node_modules/okquery/index.js
+++ b/app/node_modules/okquery/index.js
@@ -43,10 +43,17 @@ function OKQuery(options) {
     enumerable: true
   });
 
+  Object.defineProperty(this, 'groupBy', {
+    value: options.groupBy,
+    writable: false,
+    enumerable: true
+  })
+
   this.get = createQuery(resource, query, {
     default: options.default,
     sortField: sortField,
-    descending : descending
+    descending : descending,
+    groupBy: options.groupBy
   });
 }
 
@@ -66,6 +73,9 @@ function createQuery(resource, query, options) {
   if (options.default) {
     query = withDefault(query, options.default);
   }
+  if (options.groupBy) {
+    query = withGrouping(query, options.groupBy)
+  }
   return query;
 }
 
@@ -124,6 +134,37 @@ function queryBound(resource) {
   };
 }
 
+/**
+ * Transform the query such that the results are grouped by the
+ * given field
+ */
+function withGrouping(queryFn, groupField) {
+  return function() {
+    return Q.Promise(function(resolve, reject) {
+      queryFn().then(function(data) {
+        data = data || []
+        if (typeof data.length === 'undefined') {
+          data = [data]
+        }
+        var result = {}
+        result[groupField] = data.reduce(reduceToGroups, {})
+        resolve(result)
+      }, reject)
+    })
+  }
+
+  function reduceToGroups(acc, data) {
+    var groupName = data[groupField]
+    if (groupName) {
+      if (!acc[groupName]) {
+        acc[groupName] = []
+      }
+      acc[groupName].push(data)
+    }
+    return acc
+  }
+}
+
 function withDefault(queryFn, resultDefault) {
   return function() {
     return Q.Promise(function(resolve, reject) {
diff --git a/app/node_modules/okview/index.js b/app/node_modules/okview/index.js
index fba1c18..5f99d59 100644
--- a/app/node_modules/okview/index.js
+++ b/app/node_modules/okview/index.js
@@ -135,25 +135,28 @@ function fetchTemplateData(meta, queries, id) {
           if (!result) {
             return cache;
           }
-          var resource = queries[i].resource;
-          var type = queries[i].as || queries[i].type;
+          var query = queries[i]
+          var resource = query.resource;
+          var type = query.as || query.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)});
-          }
+          var groupBy = query.groupBy
           // 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) {
+          if (cache[type] || manyResult || groupBy) {
             var plural = pluralize(type);
             delete cache[type];
             cache[plural] = [];
+            // Pluralize grouped field
+            if (query.groupBy) {
+              result = Object.keys(result).reduce(function(acc, key) {
+                acc[pluralize(key)] = result[key]
+                return acc
+              }, {})
+            }
             if (manyResult) {
               cache[plural] = cache[plural].concat(result);
+            } else if (groupBy) {
+              cache[plural] = result
             } else {
               cache[plural].push(result);
             }
@@ -162,7 +165,6 @@ function fetchTemplateData(meta, queries, id) {
           }
           return cache;
         }, {meta: meta});
-
         resolve(normalized);
       }
     }).fail(reject);
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 4be0afc..8a827ff 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -1,5 +1,5 @@
 var OKAdmin = function(){
-  
+
   // initialize our multi-image uploader with an element and a template
   $(".group.image-list").each(function(){
     var parent = this
@@ -79,7 +79,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").disableSelection()
-  
+
   // populate a video field with info from our url parser
   var last_url
   $(".video .url").on("focus", function(){
@@ -201,7 +201,7 @@ var OKAdmin = function(){
       })
     })
   })
-  
+
   // delete individual records
   $("#delete_form").submit(function(e){
   	if (confirm("Are you sure you want to delete this record?")) {
@@ -213,9 +213,9 @@ var OKAdmin = function(){
   })
 
   // reorder items in categories
-  $(".resource-category").on("click", ".edit-btn", function(e) {
+  $(".resource-category:not(.grouped)").on("click", ".edit-btn", function(e) {
     e.preventDefault();
-    var $parent = $(e.delegateTarget);
+    var $parent = $(e.delegateTarget)
     var $editBtn = $parent.find(".edit-btn");
     var $cancelBtn = $parent.find(".cancel-btn");
     var $saveBtn = $parent.find(".save-btn");
@@ -245,7 +245,7 @@ var OKAdmin = function(){
   });
 
   // save new category order
-  $(".resource-category").on("submit", "form", function(e) {
+  $(".resource-category.root").on("submit", "form", function(e) {
     var $parent = $(e.delegateTarget);
     $parent.find(".resource-input").each(function(index) {
       var $input = $(this);
diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index e9ad538..7af84b6 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -7,33 +7,66 @@
   {% assign name = pair[0] %}
   {% assign resource = pair[1] %}
 
-    <section class="resource-category {{name}}">
+    <section class="resource-category root
+        {% if resource.groupBy %} grouped {% endif %}
+        {{name}}">
       <form action="{{resource.type}}/__batch__/" method="POST">
         <header>
           <h2>{{name | capitalize}}</h2>
         </header>
-          <input type="hidden" name="_method" value="PUT">
-          <ol class="resource-list">
-          {% for data in resource.data %}
-            <li>
-              <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
-              <input class="resource-input" type="hidden" name="{{resource.type}}[{{forloop.index0}}]"
-                  value='{{data | stringify | escape_once}}'>
-            </li>
+        <input type="hidden" name="_method" value="PUT">
+        {% if resource.groupBy %}
+          {% assign i = 0 %}
+          {% for pair in resource.data[resource.groupBy] %}
+          {% assign group = pair[0] %}
+          {% assign members = pair[1] %}
+            <section class="resource-category {{group}}">
+              <header>
+                <h2>{{group | capitalize}}</h2>
+              </header>
+              <ol class="resource-list">
+                {% for data in members %}
+                  <li>
+                    <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
+                    <input class="resource-input" type="hidden" name="{{resource.type}}[{{i}}]"
+                        value='{{data | stringify | escape_once}}'>
+                  </li>
+                  {% assign i = i | plus: 1 %}
+                {% endfor %}
+              </ol>
+              <footer>
+                <nav>
+                  <a class="btn cancel-btn" href="#">cancel</a>
+                  <button type="submit"
+                      class="btn save-btn" href="#">save</button>
+                  <a class="btn edit-btn active" href="#">sort</a>
+                  <a class="btn add-btn active" href="{{resource.type}}/__new__/">+</a>
+                </nav>
+              </footer>
+            </section>
           {% endfor %}
+        {% else %}
+          <ol class="resource-list">
+            {% for data in resource.data %}
+              <li>
+                <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
+                <input class="resource-input" type="hidden" name="{{resource.type}}[{{forloop.index0}}]"
+                    value='{{data | stringify | escape_once}}'>
+              </li>
+            {% endfor %}
           </ol>
-        <footer>
-          <nav>
-            <a class="btn cancel-btn" href="#">cancel</a>
-            <button type="submit"
-                class="btn save-btn" href="#">save</button>
-            <a class="btn edit-btn active" href="#">sort</a>
-            <a class="btn add-btn active" href="{{resource.type}}/__new__/">+</a>
-          </nav>
-        </footer>
+          <footer>
+            <nav>
+              <a class="btn cancel-btn" href="#">cancel</a>
+              <button type="submit"
+                  class="btn save-btn" href="#">save</button>
+              <a class="btn edit-btn active" href="#">sort</a>
+              <a class="btn add-btn active" href="{{resource.type}}/__new__/">+</a>
+            </nav>
+          </footer>
+        {% endif %}
       </form>
     </section>
-
   {% endfor %}
 </section>
 
-- 
cgit v1.2.3-70-g09d2


From fb5605bdee9f527ffeefd0b59af01534b4d3b8ac Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Fri, 10 Jul 2015 15:20:03 -0400
Subject: Strikethrough disabled resources on admin index

---
 themes/okadmin/templates/index.liquid | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index 7af84b6..ae30bc8 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -27,7 +27,9 @@
               <ol class="resource-list">
                 {% for data in members %}
                   <li>
-                    <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
+                    {% if data.disabled == 'true' %} <del> {% endif %}
+                      <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
+                    {% if data.disabled == 'true' %} </del> {% endif %}
                     <input class="resource-input" type="hidden" name="{{resource.type}}[{{i}}]"
                         value='{{data | stringify | escape_once}}'>
                   </li>
@@ -49,7 +51,9 @@
           <ol class="resource-list">
             {% for data in resource.data %}
               <li>
-                <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
+                {% if data.disabled == 'true' %} <del> {% endif %}
+                  <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
+                {% if data.disabled == 'true' %} </del> {% endif %}
                 <input class="resource-input" type="hidden" name="{{resource.type}}[{{forloop.index0}}]"
                     value='{{data | stringify | escape_once}}'>
               </li>
-- 
cgit v1.2.3-70-g09d2


From 7249dc10568091194a77990513fa2b77fdbd088a Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Fri, 10 Jul 2015 17:31:40 -0400
Subject: Implement basic foreign key support

---
 app/index.js                                    |  23 ++++++
 app/node_modules/okadminview/index.js           | 100 ++++++++++++++++++------
 app/node_modules/okquery/index.js               |   1 +
 app/node_modules/okresource/index.js            |  66 ++++++++++++++++
 app/node_modules/okschema/index.js              |   4 +
 themes/okadmin/templates/partials/inputs.liquid |   2 +-
 6 files changed, 169 insertions(+), 27 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/app/index.js b/app/index.js
index d514f10..2507dd2 100644
--- a/app/index.js
+++ b/app/index.js
@@ -78,6 +78,7 @@ function OKCMS(options) {
   });
   var resourceCache = this._resourceCache =
       this._createResources(resourceConfig, db, schemas);
+  this._resolveForeignKeys(resourceCache)
   var errorHandler = createErrorHandlerProducer(
       templateProvider, adminTemplateProvider, debug);
   // Create view instances from config
@@ -154,6 +155,21 @@ OKCMS.prototype._createResources = function(resourceConfig, db, schemaCache) {
   return ResourceCache(resources);
 };
 
+OKCMS.prototype._resolveForeignKeys = function(resourceCache) {
+  resourceCache.forEach(function(resource) {
+    Object.keys(resource.foreignKeys).forEach(function(field) {
+      var foreignKeyType = resource.foreignKeys[field]
+      var keyedResource = resourceCache.get(foreignKeyType)
+      if (!keyedResource) {
+        throw new Error(format(
+            "Foreign key field '%s' in '%s' resource references unknown" +
+            "resource of type '%s'", field, resource.type, foreignKeyType))
+      }
+      resource._linkForeignKey(field, resourceCache.get(foreignKeyType))
+    })
+  })
+}
+
 OKCMS.prototype._createViews = function(viewConfig, db,
     meta, resourceCache, templateProvider, errorHandler) {
   viewConfig = viewConfig || {};
@@ -279,6 +295,13 @@ ResourceCache.prototype.get = function(type, id) {
   }
 };
 
+ResourceCache.prototype.forEach = function(cb) {
+  cb = cb || function() {}
+  Object.keys(this._cache).forEach(function(key) {
+    cb(this._cache[key])
+  }.bind(this))
+}
+
 /**
  * Higher order function implementing customizable error handling
  */
diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index 273d541..06656dc 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -154,11 +154,12 @@ function OKAdminView(options) {
       if (!resource) {
         error(req, res, 404)(new Error('No such resource ' + type));
       } else {
-        var templateData = transformData(meta, resource, {});
-        view.renderResourceNew(req, res, assign(templateData, {
-          success: req.flash('success'),
-          errors: req.flash('errors'),
-        }));
+        fetchNewTemplateData(meta, resource, transformData).then(function(data) {
+          view.renderResourceNew(req, res, assign(data, {
+            success: req.flash('success'),
+            errors: req.flash('errors'),
+          }))
+        }).fail(error(req, res, 500))
       }
     });
 
@@ -280,11 +281,11 @@ function OKAdminView(options) {
 /**
  * Yields formatted template data for a single resource
  */
-function transformData(meta, resource, data) {
+function transformData(meta, spec, resource, data) {
   meta = meta || {};
   resource = resource || {};
   data = data || {};
-  var spec = Object.keys(resource.spec).reduce(function(cache, prop) {
+  var spec = Object.keys(spec).reduce(function(cache, prop) {
     var value = data[prop];
     var propSpec = cache[prop];
     // Decorate spec with actual resource values
@@ -294,7 +295,7 @@ function transformData(meta, resource, data) {
       propSpec.hidden = true;
     }
     return cache;
-  }, resource.spec);
+  }, spec);
   return {
     meta: meta,
     resource: {
@@ -340,47 +341,94 @@ function fetchIndexTemplateData(meta, queries, dashboardConfig) {
     Q.all(queries.map(function(query) {
       return query.get();
     })).then(function(results) {
-      var resources = results.reduce(function(cache, result, i) {
-        if (!result)
-          return cache;
+      var templateData = results.reduce(function(acc, result, i) {
         var resource = queries[i].resource;
         // We want the raw object spec
         var spec = resource.spec;
         var dashConf = resourceConfig[resource.type] || {}
         var groupBy = dashConf.groupBy
         var key = pluralize(resource.type)
-        cache[key] = {
+        acc[key] = {
           type: resource.type,
           spec: spec,
           data: result,
           groupBy: groupBy
         }
-        return cache;
-      }, {});
-
+        return acc
+      }, {})
       resolve({
         meta: meta,
-        resources: resources
-      });
-    }).fail(reject);
+        resources: templateData
+      })
+    }).fail(reject)
   });
 }
 
+function fetchNewTemplateData(meta, resource, transformFn) {
+  return Q.promise(function(resolve, reject) {
+    if (!resource.hasForeignKey) {
+      done({spec: resource.spec, resource: resource})
+    } else {
+      fetchForeignKeyOptions(resource).then(done).fail(reject)
+    }
+
+    function done(results) {
+      resolve(transformFn(meta, results.spec, results.resource, {}))
+    }
+  })
+}
+
 /**
  * Annotate template data with schema info
  */
-function fetchResourceTemplateData(meta, query, fn) {
-  fn = fn || function(m, r, d) { return {meta: m, resource: d}; };
+function fetchResourceTemplateData(meta, query, transformFn) {
   return Q.promise(function(resolve, reject) {
     query.get().then(function(data) {
-      if (!data) {
-        reject(new Error('No resource data'));
+      if (!data)
+        return reject(new Error('No resource data'))
+
+      var resource = query.resource
+
+      if (resource.hasForeignKey) {
+        fetchForeignKeyOptions(resource).then(done).fail(reject)
       } else {
-        var resource = query.resource;
-        resolve(fn(meta, resource, data));
+        done({spec: resource.spec, resource: resource})
       }
-    }).fail(reject);
-  });
+
+      function done(results) {
+        resolve(transformFn(meta, results.spec, results.resource, data))
+      }
+    }).fail(reject)
+  })
+}
+
+function fetchForeignKeyOptions(resource) {
+  var promises = Object.keys(resource.foreignKeys)
+      .map(fetchOptionsForKey)
+  var spec = resource.spec
+
+  return Q.all(promises).then(done)
+
+  function done() {
+    return Q.promise(function(resolve, reject) {
+      resolve({spec: spec, resource: resource})
+    })
+  }
+
+  function fetchOptionsForKey(field) {
+    var relatedResourceType = resource.foreignKeys[field]
+    return resource.related(relatedResourceType).then(fillOptions)
+
+    function fillOptions(results) {
+      return Q.promise(function(resolve, reject) {
+        spec[field].options = results.map(function(result) {
+          return result.id
+        })
+        resolve()
+      })
+    }
+  }
 }
 
+
 module.exports = OKAdminView;
diff --git a/app/node_modules/okquery/index.js b/app/node_modules/okquery/index.js
index 09d867d..d4cb905 100644
--- a/app/node_modules/okquery/index.js
+++ b/app/node_modules/okquery/index.js
@@ -23,6 +23,7 @@ function OKQuery(options) {
 
   // Queries are ordered by index by default
   var sortField = options.sortBy || '__index';
+  // TODO Make descending by default
   var descending = options.descending || false;
 
   Object.defineProperty(this, 'resource', {
diff --git a/app/node_modules/okresource/index.js b/app/node_modules/okresource/index.js
index c3f9adb..c1f2509 100644
--- a/app/node_modules/okresource/index.js
+++ b/app/node_modules/okresource/index.js
@@ -1,3 +1,4 @@
+var format = require('util').format
 var assign = require('object-assign');
 var cloneDeep = require('lodash.clonedeep');
 var Q = require('q');
@@ -22,10 +23,36 @@ function OKResource(options) {
   var spec = schema.spec;
 
   var type = options.type;
+  var hasForeignKey = false
   this._db = options.db;
   this._schema = schema;
 
+  var foreignKeys = Object.keys(spec).reduce(function(acc, field) {
+    var fieldSpec = spec[field]
+    if (fieldSpec.type === 'foreign-key') {
+      hasForeignKey = true
+      acc[field] = fieldSpec.key
+    }
+    return acc
+  }, {})
+
+  // Will store references to other resources referenced via foreign keys
+  this._foreignKeyedResources = {}
+
   // Define properties which are part of the API
+  
+  // Should be treated as read-only
+  Object.defineProperty(this, 'foreignKeys', {
+    get: function() {
+      return foreignKeys
+    }
+  })
+
+  Object.defineProperty(this, 'hasForeignKey', {
+    get: function() {
+      return hasForeignKey
+    }
+  })
 
   Object.defineProperty(this, 'spec', {
     get: function() {
@@ -49,6 +76,30 @@ function OKResource(options) {
   });
 }
 
+OKResource.prototype._linkForeignKey = function(field, resource) {
+  this._foreignKeyedResources[field] = resource
+}
+
+/**
+ * Fetch all related resources for the given field
+ */
+OKResource.prototype.related = function(field) {
+  var resource = this._foreignKeyedResources[field]
+  return Q.promise(function(resolve, reject) {
+    if (!resource) {
+      return error(reject, new Error(format(
+          "No related resource for field '%s'", field)))
+    }
+    resource.all().then(resolve).fail(reject)
+  })
+
+  function error(reject, err) {
+    setTimeout(function() {
+      reject(err)
+    }, 0)
+  }
+}
+
 /**
  * Throws an error if data does not conform to schema
  */
@@ -180,6 +231,9 @@ OKResource.prototype.instance = function(options) {
   });
 };
 
+/**
+ * TODO This class is such bullshit. Refactor out
+ */
 function OKResourceInstance(resource, options) {
   if (!(this instanceof OKResourceInstance)) return new OKResourceInstance(options);
   // Only support static data instances for now
@@ -279,6 +333,18 @@ function OKResourceInstance(resource, options) {
     resource.assertValid(data);
   };
 
+  Object.defineProperty(this, 'foreignKeys', {
+    get: function() {
+      return []
+    }
+  })
+
+  Object.defineProperty(this, 'hasForeignKey', {
+    get: function() {
+      return false
+    }
+  })
+
   Object.defineProperty(this, 'parent', {
     value: resource,
     writable: false,
diff --git a/app/node_modules/okschema/index.js b/app/node_modules/okschema/index.js
index 89b59cc..330ad6b 100644
--- a/app/node_modules/okschema/index.js
+++ b/app/node_modules/okschema/index.js
@@ -73,6 +73,10 @@ var types = {
   'flag': {
     parent: 'string',
     assertValid: function(spec, value) {}
+  },
+  'foreign-key': {
+    parent: 'enum',
+    assertValid: function(spec, value) {}
   }
 }
 
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 9c1a26b..c6efc68 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -17,7 +17,7 @@
       <input
         type="number"
         name="{{name}}" value="{{spec.value}}">
-    {% elsif type == 'enum' %}
+    {% elsif type == 'enum' or type == 'foreign-key' %}
       <select
         name="{{name}}">
         {% for option in spec.options %}
-- 
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 'themes/okadmin/templates')

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 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 'themes/okadmin/templates')

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 'themes/okadmin/templates')

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 3062f3541d2579a5c313286e6d5cc1400e1c6500 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 29 Mar 2016 16:45:21 -0400
Subject: make sure images in media list have type

---
 themes/okadmin/templates/partials/inputs.liquid | 1 +
 1 file changed, 1 insertion(+)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 77ee7a4..ba4459c 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -153,6 +153,7 @@
             <label>Caption</label>
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
             <textarea class="caption" name="{{name}}[][caption]"></textarea>
+            <input type="hidden" name="media[][type]" value="image">
             <img>
             <button class="remove">x</button>
           </li>
-- 
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 'themes/okadmin/templates')

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 'themes/okadmin/templates')

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 'themes/okadmin/templates')

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 'themes/okadmin/templates')

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 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 'themes/okadmin/templates')

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 d9d01a57708e3bf21833992c518f5f08e83f0d53 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 7 Apr 2016 17:26:33 -0400
Subject: Fix disabled check in index page

---
 themes/okadmin/templates/index.liquid | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index ae30bc8..8255d99 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -27,9 +27,9 @@
               <ol class="resource-list">
                 {% for data in members %}
                   <li>
-                    {% if data.disabled == 'true' %} <del> {% endif %}
+                    {% if data.disabled %} <del> {% endif %}
                       <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
-                    {% if data.disabled == 'true' %} </del> {% endif %}
+                    {% if data.disabled %} </del> {% endif %}
                     <input class="resource-input" type="hidden" name="{{resource.type}}[{{i}}]"
                         value='{{data | stringify | escape_once}}'>
                   </li>
@@ -51,9 +51,9 @@
           <ol class="resource-list">
             {% for data in resource.data %}
               <li>
-                {% if data.disabled == 'true' %} <del> {% endif %}
+                {% if data.disabled %} <del> {% endif %}
                   <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
-                {% if data.disabled == 'true' %} </del> {% endif %}
+                {% if data.disabled %} </del> {% endif %}
                 <input class="resource-input" type="hidden" name="{{resource.type}}[{{forloop.index0}}]"
                     value='{{data | stringify | escape_once}}'>
               </li>
-- 
cgit v1.2.3-70-g09d2


From 7f999404650488dc5929384250e86117f5109c9a Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 11 Apr 2016 13:12:32 -0400
Subject: fix typo

---
 themes/okadmin/templates/partials/inputs.liquid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 0cd7f6b..de134c3 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -153,7 +153,7 @@
             <label>Caption</label>
             <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
             <textarea class="caption" name="{{name}}[][caption]"></textarea>
-            <input type="hidden" name="media[][type]" value="image">
+            <input type="hidden" name="{{name}}[][type]" value="image">
             <img>
             <button class="remove">x</button>
           </li>
-- 
cgit v1.2.3-70-g09d2


From 21b7769c2a57d7e9c62318e911a45a6edebc0912 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 14 Apr 2016 15:55:11 -0400
Subject: fix checkbox issue

---
 themes/okadmin/templates/partials/inputs.liquid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index de134c3..373e580 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -69,7 +69,7 @@
       <div class="flag">
         <input name="{{name}}"
                type="checkbox"
-               {% if spec.value == 'true' %}
+               {% if spec.value %}
                 checked="true"
                {% endif %}
                value="true">
-- 
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 'themes/okadmin/templates')

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 6ca70643c18df738fbad5a4e13b1c48fab9ea430 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Sun, 24 Apr 2016 11:06:48 -0400
Subject: Fix groupBy data not showing up in admin template

---
 package.json                          |  2 +-
 themes/okadmin/templates/index.liquid | 59 ++++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 30 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/package.json b/package.json
index 971efed..c78669a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "The dopest CMS on the planet.",
   "main": "app/index.js",
   "scripts": {
diff --git a/themes/okadmin/templates/index.liquid b/themes/okadmin/templates/index.liquid
index 8255d99..c8c4aa5 100644
--- a/themes/okadmin/templates/index.liquid
+++ b/themes/okadmin/templates/index.liquid
@@ -17,35 +17,36 @@
         <input type="hidden" name="_method" value="PUT">
         {% if resource.groupBy %}
           {% assign i = 0 %}
-          {% for pair in resource.data[resource.groupBy] %}
-          {% assign group = pair[0] %}
-          {% assign members = pair[1] %}
-            <section class="resource-category {{group}}">
-              <header>
-                <h2>{{group | capitalize}}</h2>
-              </header>
-              <ol class="resource-list">
-                {% for data in members %}
-                  <li>
-                    {% if data.disabled %} <del> {% endif %}
-                      <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
-                    {% if data.disabled %} </del> {% endif %}
-                    <input class="resource-input" type="hidden" name="{{resource.type}}[{{i}}]"
-                        value='{{data | stringify | escape_once}}'>
-                  </li>
-                  {% assign i = i | plus: 1 %}
-                {% endfor %}
-              </ol>
-              <footer>
-                <nav>
-                  <a class="btn cancel-btn" href="#">cancel</a>
-                  <button type="submit"
-                      class="btn save-btn" href="#">save</button>
-                  <a class="btn edit-btn active" href="#">sort</a>
-                  <a class="btn add-btn active" href="{{resource.type}}/__new__/">+</a>
-                </nav>
-              </footer>
-            </section>
+          {% for item in resource.data %}
+            {% for pair in item[resource.groupBy] %}
+              {% assign group = pair[0] %}
+              {% assign members = pair[1] %}
+              <section class="resource-category {{group}}">
+                <header>
+                  <h2>{{group | capitalize}}</h2>
+                </header>
+                <ol class="resource-list">
+                  {% for data in members %}
+                    <li>
+                      {% if data.disabled %} <del> {% endif %}
+                        <a href="{{resource.type}}/{{data.id}}/">{{data.title}}</a>
+                      {% if data.disabled %} </del> {% endif %}
+                      <input class="resource-input" type="hidden" name="{{resource.type}}[{{increment i}}]"
+                          value='{{data | stringify | escape_once}}'>
+                    </li>
+                  {% endfor %}
+                </ol>
+                <footer>
+                  <nav>
+                    <a class="btn cancel-btn" href="#">cancel</a>
+                    <button type="submit"
+                        class="btn save-btn" href="#">save</button>
+                    <a class="btn edit-btn active" href="#">sort</a>
+                    <a class="btn add-btn active" href="{{resource.type}}/__new__/">+</a>
+                  </nav>
+                </footer>
+              </section>
+            {% endfor %}
           {% endfor %}
         {% else %}
           <ol class="resource-list">
-- 
cgit v1.2.3-70-g09d2


From 071fdf9d53becb08b6a54c8c49effcb6c1a23e98 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 17 Aug 2016 02:18:40 -0400
Subject: add autoplay fields in media items

---
 themes/okadmin/public/css/main.css              |  6 ++++++
 themes/okadmin/templates/partials/inputs.liquid | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'themes/okadmin/templates')

diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 15b8781..9e0c26f 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -240,6 +240,12 @@ button, input[type=submit] {
   display: block;
   width: 25em;
 }
+.main.resource form .group.video .checkboxes label {
+  display: block;
+}
+.main.resource form .group.video .checkboxes label {
+  display: inline-block;
+}
 .main.resource form .group.loaded label {
   display: block;
 }
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index 0cd7f6b..28b422e 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -171,6 +171,12 @@
             <input name="{{name}}[][title]" type="text" class="video-title">
             <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">
+              <label>Autoplay</label>
+              <input name="{{name}}[][loop]" value="{{image.loop}}" type="checkbox" class="video-loop">
+              <label>Loop</label>
+            </span>
             </div>
             <img>
             <button class="remove">x</button>
@@ -217,6 +223,12 @@
                 <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">
+                <span class="checkboxes">
+                  <input name="{{name}}[{{forloop.index0}}][autoplay]" value="{{image.autoplay}}" type="checkbox" class="video-autoplay">
+                  <label>Autoplay</label>
+                  <input name="{{name}}[{{forloop.index0}}][loop]" value="{{image.loop}}" type="checkbox" class="video-loop">
+                  <label>Loop</label>
+                </span>
                 </div>
                 <img src="{{image.thumb}}">
                 <button class="remove">x</button>
@@ -238,9 +250,7 @@
               </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 | escape}}</textarea>
                 <input type="hidden" name="{{name}}[][type]" value="link">
                 <button class="remove">x</button>
-- 
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 'themes/okadmin/templates')

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 'themes/okadmin/templates')

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 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 'themes/okadmin/templates')

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 'themes/okadmin/templates')

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