summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--site/db.json37
-rw-r--r--site/index.js1
-rw-r--r--site/templates/project.liquid2
-rw-r--r--themes/okadmin/public/js/app.js1
-rw-r--r--themes/okadmin/templates/resource.liquid4
5 files changed, 40 insertions, 5 deletions
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 }}">