moving assets

50 files changed, 9 insertions, 7 deletions

diff --git a/site/index.js b/site/index.js
index c7638fa..d36778f 100644
--- a/site/index.js
+++ b/site/index.js
@@ -3,6 +3,7 @@ var okcms = require('..');
 var projectSchema = {
   id: {type: 'string', id: true},
   title: {type: 'string'},
+  shortname: {type: 'string'},
   description: {type: 'text'},
   video: {type: 'video'},
   images: {type: 'captioned-image-list'}
@@ -16,7 +17,8 @@ var app  = okcms.createApp({
     page: {
       id: {type: 'string'},
       title: {type: 'string'},
-      body: {type: 'text'}
+      body: {type: 'text'},
+      image: {type: 'string'}
     },
     retail: projectSchema,
 		advertising: projectSchema,
diff --git a/site/public/fonts/BellGotBol.eot b/site/public/assets/fonts/BellGotBol.eot
index 692ae3c..692ae3c 100644
--- a/site/public/fonts/BellGotBol.eot
+++ b/site/public/assets/fonts/BellGotBol.eot
diff --git a/site/public/fonts/BellGotBol.svg b/site/public/assets/fonts/BellGotBol.svg
index 030d10c..030d10c 100644
--- a/site/public/fonts/BellGotBol.svg
+++ b/site/public/assets/fonts/BellGotBol.svg
diff --git a/site/public/fonts/BellGotBol.woff b/site/public/assets/fonts/BellGotBol.woff
index 1faa8f6..1faa8f6 100644
--- a/site/public/fonts/BellGotBol.woff
+++ b/site/public/assets/fonts/BellGotBol.woff
diff --git a/site/public/fonts/BellGotLig.eot b/site/public/assets/fonts/BellGotLig.eot
index d31ca29..d31ca29 100644
--- a/site/public/fonts/BellGotLig.eot
+++ b/site/public/assets/fonts/BellGotLig.eot
diff --git a/site/public/fonts/BellGotLig.svg b/site/public/assets/fonts/BellGotLig.svg
index a609f5a..a609f5a 100644
--- a/site/public/fonts/BellGotLig.svg
+++ b/site/public/assets/fonts/BellGotLig.svg
diff --git a/site/public/fonts/BellGotLig.woff b/site/public/assets/fonts/BellGotLig.woff
index ac68156..ac68156 100644
--- a/site/public/fonts/BellGotLig.woff
+++ b/site/public/assets/fonts/BellGotLig.woff
diff --git a/site/public/images/2H_LOGOMARK.png b/site/public/assets/images/2H_LOGOMARK.png
index 0ecbe64..0ecbe64 100644
--- a/site/public/images/2H_LOGOMARK.png
+++ b/site/public/assets/images/2H_LOGOMARK.png
diff --git a/site/public/images/2H_WORDMARK.png b/site/public/assets/images/2H_WORDMARK.png
index 63ed42e..63ed42e 100644
--- a/site/public/images/2H_WORDMARK.png
+++ b/site/public/assets/images/2H_WORDMARK.png
diff --git a/site/public/images/dither.gif b/site/public/assets/images/dither.gif
index 670df08..670df08 100644
--- a/site/public/images/dither.gif
+++ b/site/public/assets/images/dither.gif
diff --git a/site/public/images/favicon.ico b/site/public/assets/images/favicon.ico
index 8cd6850..8cd6850 100644
--- a/site/public/images/favicon.ico
+++ b/site/public/assets/images/favicon.ico
diff --git a/site/public/images/fb.png b/site/public/assets/images/fb.png
index 713d588..713d588 100755
--- a/site/public/images/fb.png
+++ b/site/public/assets/images/fb.png
diff --git a/site/public/images/fb2.png b/site/public/assets/images/fb2.png
index 713d588..713d588 100755
--- a/site/public/images/fb2.png
+++ b/site/public/assets/images/fb2.png
diff --git a/site/public/images/full.png b/site/public/assets/images/full.png
index dc24646..dc24646 100755
--- a/site/public/images/full.png
+++ b/site/public/assets/images/full.png
diff --git a/site/public/images/next.png b/site/public/assets/images/next.png
index 7997259..7997259 100644
--- a/site/public/images/next.png
+++ b/site/public/assets/images/next.png
diff --git a/site/public/images/noise.png b/site/public/assets/images/noise.png
index 585ef73..585ef73 100644
--- a/site/public/images/noise.png
+++ b/site/public/assets/images/noise.png
diff --git a/site/public/images/play-button.png b/site/public/assets/images/play-button.png
index e642874..e642874 100644
--- a/site/public/images/play-button.png
+++ b/site/public/assets/images/play-button.png
diff --git a/site/public/images/play-button2.png b/site/public/assets/images/play-button2.png
index dfce7b0..dfce7b0 100644
--- a/site/public/images/play-button2.png
+++ b/site/public/assets/images/play-button2.png
diff --git a/site/public/images/tw.png b/site/public/assets/images/tw.png
index d51cf9f..d51cf9f 100755
--- a/site/public/images/tw.png
+++ b/site/public/assets/images/tw.png
diff --git a/site/public/images/tw2.png b/site/public/assets/images/tw2.png
index 4fd4b90..4fd4b90 100755
--- a/site/public/images/tw2.png
+++ b/site/public/assets/images/tw2.png
diff --git a/site/public/javascripts/_env.js b/site/public/assets/javascripts/_env.js
index 4a4d71b..3badf41 100644
--- a/site/public/javascripts/_env.js
+++ b/site/public/assets/javascripts/_env.js
@@ -75,7 +75,7 @@ environment.ready = function(){
 	  
     $("#entry_container").removeClass("visible")
     var $loader = $("<div>")
-    $loader.load("about.html .entry", function(){
+    $loader.load("about .entry", function(){
       display_entry($loader.children()[0])
     })
 	})	
@@ -90,7 +90,7 @@ environment.ready = function(){
 
     $("#entry_container").removeClass("visible")
     var $loader = $("<div>")
-    $loader.load("contact.html .entry", function(){
+    $loader.load("contact .entry", function(){
       display_entry($loader.children()[0])
     })
 	})	
@@ -105,7 +105,7 @@ environment.ready = function(){
 	  
     $("#entry_container").removeClass("visible")
     var $loader = $("<div>")
-    $loader.load("all.html .entry", function(){
+    $loader.load("all .entry", function(){
       display_entry($loader.children()[0])
     })
 	})	
diff --git a/site/public/javascripts/app.js b/site/public/assets/javascripts/app.js
index dd68726..dd68726 100644
--- a/site/public/javascripts/app.js
+++ b/site/public/assets/javascripts/app.js
diff --git a/site/public/javascripts/mx/extensions/mx.movements.js b/site/public/assets/javascripts/mx/extensions/mx.movements.js
index 9af2c8d..9af2c8d 100644
--- a/site/public/javascripts/mx/extensions/mx.movements.js
+++ b/site/public/assets/javascripts/mx/extensions/mx.movements.js
diff --git a/site/public/javascripts/mx/extensions/mx.movementsMobile.js b/site/public/assets/javascripts/mx/extensions/mx.movementsMobile.js
index 95b61d1..95b61d1 100644
--- a/site/public/javascripts/mx/extensions/mx.movementsMobile.js
+++ b/site/public/assets/javascripts/mx/extensions/mx.movementsMobile.js
diff --git a/site/public/javascripts/mx/extensions/mx.orbitCamera.js b/site/public/assets/javascripts/mx/extensions/mx.orbitCamera.js
index 6603ff4..6603ff4 100644
--- a/site/public/javascripts/mx/extensions/mx.orbitCamera.js
+++ b/site/public/assets/javascripts/mx/extensions/mx.orbitCamera.js
diff --git a/site/public/javascripts/mx/extensions/mx.rotationControl.js b/site/public/assets/javascripts/mx/extensions/mx.rotationControl.js
index 9adb627..9adb627 100644
--- a/site/public/javascripts/mx/extensions/mx.rotationControl.js
+++ b/site/public/assets/javascripts/mx/extensions/mx.rotationControl.js
diff --git a/site/public/javascripts/mx/extensions/mx.scene.js b/site/public/assets/javascripts/mx/extensions/mx.scene.js
index 8f11fb0..8f11fb0 100644
--- a/site/public/javascripts/mx/extensions/mx.scene.js
+++ b/site/public/assets/javascripts/mx/extensions/mx.scene.js
diff --git a/site/public/javascripts/mx/extensions/mx.scrubber.js b/site/public/assets/javascripts/mx/extensions/mx.scrubber.js
index 54612f2..54612f2 100644
--- a/site/public/javascripts/mx/extensions/mx.scrubber.js
+++ b/site/public/assets/javascripts/mx/extensions/mx.scrubber.js
diff --git a/site/public/javascripts/mx/extensions/mx.unclampedOrbitCamera.js b/site/public/assets/javascripts/mx/extensions/mx.unclampedOrbitCamera.js
index 28b1aac..28b1aac 100644
--- a/site/public/javascripts/mx/extensions/mx.unclampedOrbitCamera.js
+++ b/site/public/assets/javascripts/mx/extensions/mx.unclampedOrbitCamera.js
diff --git a/site/public/javascripts/mx/mx.js b/site/public/assets/javascripts/mx/mx.js
index 1ce7cda..1ce7cda 100644
--- a/site/public/javascripts/mx/mx.js
+++ b/site/public/assets/javascripts/mx/mx.js
diff --git a/site/public/javascripts/mx/mx.min.js b/site/public/assets/javascripts/mx/mx.min.js
index b0f0cdd..b0f0cdd 100644
--- a/site/public/javascripts/mx/mx.min.js
+++ b/site/public/assets/javascripts/mx/mx.min.js
diff --git a/site/public/javascripts/mx/mx.quaternion.js b/site/public/assets/javascripts/mx/mx.quaternion.js
index 783f887..783f887 100644
--- a/site/public/javascripts/mx/mx.quaternion.js
+++ b/site/public/assets/javascripts/mx/mx.quaternion.js
diff --git a/site/public/javascripts/mx/mx.skew.js b/site/public/assets/javascripts/mx/mx.skew.js
index 73296bd..73296bd 100644
--- a/site/public/javascripts/mx/mx.skew.js
+++ b/site/public/assets/javascripts/mx/mx.skew.js
diff --git a/site/public/javascripts/mx/primitives/mx.image.js b/site/public/assets/javascripts/mx/primitives/mx.image.js
index 39bb0b5..39bb0b5 100644
--- a/site/public/javascripts/mx/primitives/mx.image.js
+++ b/site/public/assets/javascripts/mx/primitives/mx.image.js
diff --git a/site/public/javascripts/mx/primitives/mx.soundcloud.js b/site/public/assets/javascripts/mx/primitives/mx.soundcloud.js
index 75286d9..75286d9 100644
--- a/site/public/javascripts/mx/primitives/mx.soundcloud.js
+++ b/site/public/assets/javascripts/mx/primitives/mx.soundcloud.js
diff --git a/site/public/javascripts/mx/primitives/mx.text.js b/site/public/assets/javascripts/mx/primitives/mx.text.js
index 6b5681b..6b5681b 100644
--- a/site/public/javascripts/mx/primitives/mx.text.js
+++ b/site/public/assets/javascripts/mx/primitives/mx.text.js
diff --git a/site/public/javascripts/mx/primitives/mx.video.js b/site/public/assets/javascripts/mx/primitives/mx.video.js
index c281f02..c281f02 100644
--- a/site/public/javascripts/mx/primitives/mx.video.js
+++ b/site/public/assets/javascripts/mx/primitives/mx.video.js
diff --git a/site/public/javascripts/mx/primitives/mx.vimeo.js b/site/public/assets/javascripts/mx/primitives/mx.vimeo.js
index fe5ce86..fe5ce86 100644
--- a/site/public/javascripts/mx/primitives/mx.vimeo.js
+++ b/site/public/assets/javascripts/mx/primitives/mx.vimeo.js
diff --git a/site/public/javascripts/mx/primitives/mx.youtube.js b/site/public/assets/javascripts/mx/primitives/mx.youtube.js
index 5c92378..5c92378 100644
--- a/site/public/javascripts/mx/primitives/mx.youtube.js
+++ b/site/public/assets/javascripts/mx/primitives/mx.youtube.js
diff --git a/site/public/javascripts/vendor/flickity.pkgd.js b/site/public/assets/javascripts/vendor/flickity.pkgd.js
index 6389014..6389014 100644
--- a/site/public/javascripts/vendor/flickity.pkgd.js
+++ b/site/public/assets/javascripts/vendor/flickity.pkgd.js
diff --git a/site/public/javascripts/vendor/froogaloop.js b/site/public/assets/javascripts/vendor/froogaloop.js
index c9330e6..c9330e6 100644
--- a/site/public/javascripts/vendor/froogaloop.js
+++ b/site/public/assets/javascripts/vendor/froogaloop.js
diff --git a/site/public/javascripts/vendor/jquery.min.js b/site/public/assets/javascripts/vendor/jquery.min.js
index ee1b7d4..ee1b7d4 100644
--- a/site/public/javascripts/vendor/jquery.min.js
+++ b/site/public/assets/javascripts/vendor/jquery.min.js
diff --git a/site/public/javascripts/vendor/jquery.min.map b/site/public/assets/javascripts/vendor/jquery.min.map
index ece3005..ece3005 100644
--- a/site/public/javascripts/vendor/jquery.min.map
+++ b/site/public/assets/javascripts/vendor/jquery.min.map
diff --git a/site/public/javascripts/vendor/loader.js b/site/public/assets/javascripts/vendor/loader.js
index 4c1c8cd..4c1c8cd 100644
--- a/site/public/javascripts/vendor/loader.js
+++ b/site/public/assets/javascripts/vendor/loader.js
diff --git a/site/public/javascripts/vendor/polyfill.js b/site/public/assets/javascripts/vendor/polyfill.js
index 411d90f..411d90f 100644
--- a/site/public/javascripts/vendor/polyfill.js
+++ b/site/public/assets/javascripts/vendor/polyfill.js
diff --git a/site/public/javascripts/vendor/tween.js b/site/public/assets/javascripts/vendor/tween.js
index 14127b8..14127b8 100755
--- a/site/public/javascripts/vendor/tween.js
+++ b/site/public/assets/javascripts/vendor/tween.js
diff --git a/site/public/javascripts/vendor/util.js b/site/public/assets/javascripts/vendor/util.js
index 0f5c6ed..0f5c6ed 100644
--- a/site/public/javascripts/vendor/util.js
+++ b/site/public/assets/javascripts/vendor/util.js
diff --git a/site/public/javascripts/vendor/wheel.js b/site/public/assets/javascripts/vendor/wheel.js
index 4a4d757..4a4d757 100644
--- a/site/public/javascripts/vendor/wheel.js
+++ b/site/public/assets/javascripts/vendor/wheel.js
diff --git a/site/public/style.css b/site/public/assets/style.css
index 2ca71b4..2ca71b4 100644
--- a/site/public/style.css
+++ b/site/public/assets/style.css
diff --git a/site/templates/index.liquid b/site/templates/index.liquid
index 618f163..c5348c5 100644
--- a/site/templates/index.liquid
+++ b/site/templates/index.liquid
@@ -94,19 +94,19 @@ WEBSITE BY OKFOCUS, http://okfoc.us, Internet Legends.
 		<div class="cat">advertising</div>
 		<div class="sub">
 		  {% for project in advertising %}
-			<a href="/advertising/{{ project.id }}">{{ project.shortname }}</a>
+			<a href="/advertising/{{ project.id }}">{{ project.shortname || project.title }}</a>
       {% endfor %}
 		</div>
 		<div class="cat">experiential</div>
 		<div class="sub">
 		  {% for project in experiential %}
-			<a href="/experiential/{{ project.id }}">{{ project.shortname }}</a>
+			<a href="/experiential/{{ project.id }}">{{ project.shortname || project.title }}</a>
       {% endfor %}
 		</div>
 		<div class="cat">content</div>
 		<div class="sub">
 		  {% for project in content %}
-			<a href="/content/{{ project.id }}">{{ project.shortname }}</a>
+			<a href="/content/{{ project.id }}">{{ project.shortname || project.title }}</a>
       {% endfor %}
 		</div>
 	</div>