Merge branch 'twohustlers' of github.com:okfocus/okcms into twohustlers

3 files changed, 20 insertions, 20 deletions

diff --git a/site/index.js b/site/index.js
index 6d34b89..3283b82 100644
--- a/site/index.js
+++ b/site/index.js
@@ -27,10 +27,10 @@ var app  = okcms.createApp({
       body: {type: 'text'},
       image: {type: 'string'}
     },
-    retail: projectSchema,
     advertising: projectSchema,
-    experiential: projectSchema,
     content: projectSchema,
+    experiential: projectSchema,
+    retail: projectSchema,
     shape: {
       id: {type: 'string', id: true, hidden: true},
       title: {type: 'string'},    
@@ -42,10 +42,10 @@ var app  = okcms.createApp({
     { type: 'page', static: {id: 'about'}},
     { type: 'page', static: {id: 'contact'}},
     { type: 'shape', static: {id: 'shape-images'}},
-    { type: 'retail' },
     { type: 'advertising' },
+    { type: 'content' },
     { type: 'experiential' },
-    { type: 'content' }
+    { type: 'retail' },
   ],
 
   services: {
diff --git a/site/templates/all.liquid b/site/templates/all.liquid
index e6f39bf..1ee66ff 100644
--- a/site/templates/all.liquid
+++ b/site/templates/all.liquid
@@ -1,12 +1,12 @@
 <div class="entry all">
-  {% for project in retails %}
-    <div class="project" data-id="{{ project.id }}" data-type="retail">
+  {% for project in advertisings %}
+    <div class="project" data-id="{{ project.id }}" data-type="advertising">
       <img src="{{ project.images[0].uri }}">
       <span>{{ project.title }}</span>
     </div>
   {% endfor %}
-  {% for project in advertisings %}
-    <div class="project" data-id="{{ project.id }}" data-type="advertising">
+  {% for project in contents %}
+    <div class="project" data-id="{{ project.id }}" data-type="content">
       <img src="{{ project.images[0].uri }}">
       <span>{{ project.title }}</span>
     </div>
@@ -17,8 +17,8 @@
       <span>{{ project.title }}</span>
     </div>
   {% endfor %}
-  {% for project in contents %}
-    <div class="project" data-id="{{ project.id }}" data-type="content">
+  {% for project in retails %}
+    <div class="project" data-id="{{ project.id }}" data-type="retail">
       <img src="{{ project.images[0].uri }}">
       <span>{{ project.title }}</span>
     </div>
diff --git a/site/templates/index.liquid b/site/templates/index.liquid
index c67cdc2..5807329 100644
--- a/site/templates/index.liquid
+++ b/site/templates/index.liquid
@@ -85,28 +85,28 @@ WEBSITE BY OKFOCUS, http://okfoc.us, Internet Legends.
 <nav>
 	<div class="top">
 		<img src="assets/images/2H_WORDMARK.png" class="toplogo">
-		<div class="cat" data-type="retail">retail</div>
-		<div class="sub" data-type="retail">
-		  {% for project in retails %}
-        <a href="#" data-type="retail" data-id="{{ project.id }}" data-name="{{ project.menu }}" data-image="{{ project.shape.uri }}">{{ project.menu }}</a>
-      {% endfor %}
-		</div>
 		<div class="cat" data-type="advertising">advertising</div>
 		<div class="sub" data-type="advertising">
 		  {% for project in advertisings %}
         <a href="#" data-type="advertising" data-id="{{ project.id }}" data-name="{{ project.menu }}" data-image="{{ project.shape.uri }}">{{ project.menu }}</a>
       {% endfor %}
 		</div>
+		<div class="cat" data-type="content">content</div>
+		<div class="sub" data-type="content">
+		  {% for project in contents %}
+        <a href="#" data-type="content" data-id="{{ project.id }}" data-name="{{ project.menu }}" data-image="{{ project.shape.uri }}">{{ project.menu }}</a>
+      {% endfor %}
+		</div>
 		<div class="cat" data-type="experiential">experiential</div>
 		<div class="sub" data-type="experiential">
 		  {% for project in experientials %}
         <a href="#" data-type="experiential" data-id="{{ project.id }}" data-name="{{ project.menu }}" data-image="{{ project.shape.uri }}">{{ project.menu }}</a>
       {% endfor %}
 		</div>
-		<div class="cat" data-type="content">content</div>
-		<div class="sub" data-type="content">
-		  {% for project in contents %}
-        <a href="#" data-type="content" data-id="{{ project.id }}" data-name="{{ project.menu }}" data-image="{{ project.shape.uri }}">{{ project.menu }}</a>
+		<div class="cat" data-type="retail">retail</div>
+		<div class="sub" data-type="retail">
+		  {% for project in retails %}
+        <a href="#" data-type="retail" data-id="{{ project.id }}" data-name="{{ project.menu }}" data-image="{{ project.shape.uri }}">{{ project.menu }}</a>
       {% endfor %}
 		</div>
 	</div>