From 7838302656af124f1eb736ab9ecb731c6f2f3c7c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 27 Apr 2015 13:31:56 -0400
Subject: gallery

---
 site/public/assets/style.css | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'site')

diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index f018d8d..7a5ccbb 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -444,7 +444,7 @@ nav .sub.active a {
 .postname {
 	border-bottom: 1px solid #999;
 	padding: 20px 0px 0.6em 2px;
-	margin-bottom: 1em;
+	margin-bottom: 0.7em;
 	font-size: 1em;
 }
 
@@ -587,6 +587,29 @@ nav .sub.active a {
 	text-align: right;
 }
 
+.galnav {
+	display: inline-block;
+  width: 100%;
+  float: left;
+  clear: both;
+} 		 
+.galnav span{
+  width: 50%;
+  background: #999;
+  color: white;
+  padding: 2px;
+  font-size: 11px;
+	transition:0.2s background;
+}
+.galnav .nextbutton{
+	text-align: right;
+  background: #888;
+	cursor:pointer;
+}
+.galnav span:hover {
+	background:black;
+}
+
 :-webkit-full-screen #okgallery {
   width: 100%;
   height: 100%;
-- 
cgit v1.2.3-70-g09d2


From 28490413b2a108f11ffef4f6d9f560c516546cec Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Mon, 27 Apr 2015 13:33:10 -0400
Subject: adding stuff

---
 site/public/assets/style.css | 34 +++++++++++++++++++++++++++++-----
 site/templates/page.liquid   |  4 ++++
 2 files changed, 33 insertions(+), 5 deletions(-)

(limited to 'site')

diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index f018d8d..090c8f1 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -405,7 +405,7 @@ nav .sub.active a {
 	height:auto;
 	position:relative;
 	width:100%;
-	max-height:40px;
+	max-height:50px;
 	padding: 3px 0 5px 20px;
 	opacity:1;
 	-webkit-transform:translateY(0)scale(1)skew(0deg);
@@ -442,13 +442,37 @@ nav .sub.active a {
 }
 
 .postname {
-	border-bottom: 1px solid #999;
-	padding: 20px 0px 0.6em 2px;
-	margin-bottom: 1em;
-	font-size: 1em;
+  border-bottom: 1px solid #999;
+  padding: 20px 0px 0.6em 2px;
+  margin-bottom: 0.7em;
+  font-size: 1em;
 }
 
 
+.galnav {
+	display: inline-block;
+  width: 100%;
+  float: left;
+  clear: both;
+}
+
+.galnav span{
+  width: 50%;
+  background: #999;
+  color: white;
+  padding: 2px;
+  font-size: 11px;
+	transition:0.2s background;
+}
+.galnav .nextbutton{
+	text-align: right;
+  background: #888;
+	cursor:pointer;
+}
+.galnav span:hover {
+	background:black;
+}
+
 .credit {
 	margin: 4em 0px 0px 0px;
 	padding: 11px 0px;
diff --git a/site/templates/page.liquid b/site/templates/page.liquid
index 63f71f2..5c3cabe 100644
--- a/site/templates/page.liquid
+++ b/site/templates/page.liquid
@@ -2,6 +2,10 @@
   <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}}
-- 
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 'site')

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 'site')

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 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')

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