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

---
 site/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'site/index.js')

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'},
 }
 
-- 
cgit v1.2.3-70-g09d2


From 934a8ac8afdaa2afc2061542abbf3f4864a476b1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 27 Apr 2015 17:02:55 -0400
Subject: prev/next buttons

---
 site/db.json                           |  4 ++--
 site/index.js                          |  2 +-
 site/public/assets/javascripts/_env.js |  8 +++-----
 site/public/assets/style.css           |  1 +
 site/templates/project.liquid          | 11 ++++++-----
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'site/index.js')

diff --git a/site/db.json b/site/db.json
index c391558..66d905f 100644
--- a/site/db.json
+++ b/site/db.json
@@ -16,7 +16,7 @@
         "title": "",
         "thumb": ""
       },
-      "images": [
+      "media": [
         {
           "type": "vimeo",
           "token": "112498725",
@@ -74,7 +74,7 @@
         "title": "",
         "thumb": ""
       },
-      "images": [
+      "media": [
         {
           "uri": "https://ltho.s3.amazonaws.com/twohustlers%2Fefd9dcf8-03c1-42c3-b6cc-3472acf908e4.jpg",
           "caption": ""
diff --git a/site/index.js b/site/index.js
index a7b207a..3434742 100644
--- a/site/index.js
+++ b/site/index.js
@@ -5,7 +5,7 @@ var projectSchema = {
   title: {type: 'string'},
   menu: {type: 'string'},
   description: {type: 'text'},
-  images: {type: 'media-list'},
+  media: {type: 'media-list'},
   thumbnail: {type: 'image'},
 }
 
diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js
index 8c1270f..aae60b9 100644
--- a/site/public/assets/javascripts/_env.js
+++ b/site/public/assets/javascripts/_env.js
@@ -446,16 +446,14 @@ function build_gallery () {
       // load_video($el)
     }
     else {
-      next()
+      gallery.next()
     }
   })
-  // $next.on("click", next)
-  function next(){
-    gallery.next()
-  }
   gallery.loader.on("progress", function(imagesLoaded, loadingImage){
     $(loadingImage.img).addClass('loaded')
   })
+  $(".nextbutton").click(function(){ gallery.next() })
+  $(".prevbutton").click(function(){ gallery.previous() })
 }
 function resize_gallery () {
   if (! gallery) return;
diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index 9fb1a3a..8c7594d 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -446,6 +446,7 @@ nav .sub.active a {
 	padding: 20px 0px 0.6em 2px;
 	margin-bottom: 0.7em;
 	font-size: 1em;
+	text-transform: uppercase;
 }
 
 
diff --git a/site/templates/project.liquid b/site/templates/project.liquid
index 3d32c0d..0dc828c 100644
--- a/site/templates/project.liquid
+++ b/site/templates/project.liquid
@@ -6,11 +6,12 @@
 			<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>
-    {% endif %}
-    {% for image in project.images %}
-		  <div class="cell" data-caption="{{ image.caption }}"><img src="{{ image.uri }}"></div>
+    {% 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>
+      {% else %}
+        <div class="cell" data-caption="{{ media.caption }}"><img src="{{ media.uri }}"></div>
+      {% endif %}
     {% endfor %}
 		</div>
     <div class="caption"></div>
-- 
cgit v1.2.3-70-g09d2