From ebf29872c4e9108776cd5022450a7d6274ed5d5f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 6 Nov 2015 02:07:18 -0500
Subject: galleries on hub view

---
 StoneIsland/www/css/blogs.css                  |  1 +
 StoneIsland/www/css/index.css                  |  2 +-
 StoneIsland/www/css/products.css               |  4 ++--
 StoneIsland/www/index.html                     |  2 +-
 StoneIsland/www/js/lib/blogs/ArchiveView.js    |  4 ++--
 StoneIsland/www/js/lib/blogs/HubView.js        |  5 +++--
 StoneIsland/www/js/lib/blogs/StoryView.js      |  3 ++-
 StoneIsland/www/js/lib/products/ProductView.js | 20 +++++++++++---------
 8 files changed, 23 insertions(+), 18 deletions(-)

(limited to 'StoneIsland')

diff --git a/StoneIsland/www/css/blogs.css b/StoneIsland/www/css/blogs.css
index 58c45468..5d0f90fd 100644
--- a/StoneIsland/www/css/blogs.css
+++ b/StoneIsland/www/css/blogs.css
@@ -19,6 +19,7 @@
 }
 #story .links li.active {
   font-weight: bold;
+  text-decoration: underline;
 }
 #story .content > div {
   display: none;
diff --git a/StoneIsland/www/css/index.css b/StoneIsland/www/css/index.css
index b0f35a96..f57aebed 100644
--- a/StoneIsland/www/css/index.css
+++ b/StoneIsland/www/css/index.css
@@ -31,7 +31,7 @@ body {
 .loader:before {
   content: '';
   border-radius: 50%;
-  border-top: 3px solid #fff;
+  border-top: 3px solid #999;
   border-right: 3px solid transparent;
   animation: loading .5s linear infinite;
   -webkit-animation: loading .5s linear infinite;
diff --git a/StoneIsland/www/css/products.css b/StoneIsland/www/css/products.css
index e78ee9df..b3dff2ba 100644
--- a/StoneIsland/www/css/products.css
+++ b/StoneIsland/www/css/products.css
@@ -29,12 +29,12 @@
   display: block;
 }
 
-#gallery {
+.gallery {
   width: 100vw;
   height: 63vw;
 }
 
-#gallery .item {
+.gallery .item {
   width: 100vw;
   height: 63vw;
   background-size: contain;
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 705ceca2..953b3f8d 100644
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -146,7 +146,7 @@
   <div id="product">
     <div class="scroll">
       <div class="loader"></div>
-      <div id="gallery">
+      <div id="gallery" class="gallery">
         <script type="text/html" class="template">
           <div class="item" style="background-image:url({{image}})"></div>
         </script>
diff --git a/StoneIsland/www/js/lib/blogs/ArchiveView.js b/StoneIsland/www/js/lib/blogs/ArchiveView.js
index 783254cc..91316dea 100644
--- a/StoneIsland/www/js/lib/blogs/ArchiveView.js
+++ b/StoneIsland/www/js/lib/blogs/ArchiveView.js
@@ -1,4 +1,4 @@
-var ArchiveView = View.extend({
+var ArchiveView = ScrollableView.extend({
   
   el: "#archive",
   template: $("#archive .template").html(),
@@ -13,6 +13,7 @@ var ArchiveView = View.extend({
   },
 
   show: function(){
+    this.deferScrollToTop()
     document.body.className = "archive"
   },
 
@@ -30,5 +31,4 @@ var ArchiveView = View.extend({
     }.bind(this))
   },
 
-
 })
\ No newline at end of file
diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js
index 2f04c5cb..5832eb2e 100644
--- a/StoneIsland/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/www/js/lib/blogs/HubView.js
@@ -13,6 +13,7 @@ var HubView = ScrollableView.extend({
   },
 
   show: function(){
+    this.deferScrollToTop()
     document.body.className = "hub"
   },
 
@@ -22,7 +23,7 @@ var HubView = ScrollableView.extend({
     this.$content.empty()
     // id date subtitle body link image[uri caption]
     this.data.forEach(function(row){
-      console.log(row)
+      // console.log(row)
       var t = this.template.replace(/{{id}}/, row.id)
                            .replace(/{{date}}/, row.date)
                            .replace(/{{title}}/, row.title)
@@ -56,7 +57,7 @@ var HubView = ScrollableView.extend({
       else {
         // single image
         var el = document.createElement("div")
-        el.style.backgroundImage = "url(" + img.uri + ")"
+        el.style.backgroundImage = "url(" + row.image[0].uri + ")"
         el.className = "item"
         $(".gallery-" + row.id).append(el)
         
diff --git a/StoneIsland/www/js/lib/blogs/StoryView.js b/StoneIsland/www/js/lib/blogs/StoryView.js
index b0221de3..62928cec 100644
--- a/StoneIsland/www/js/lib/blogs/StoryView.js
+++ b/StoneIsland/www/js/lib/blogs/StoryView.js
@@ -1,4 +1,4 @@
-var StoryView = View.extend({
+var StoryView = ScrollableView.extend({
   
   el: "#story",
   template: $("#story .template").html(),
@@ -17,6 +17,7 @@ var StoryView = View.extend({
   },
 
   show: function(){
+    this.deferScrollToTop()
     document.body.className = "story"
   },
   
diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js
index c5a7ff29..0d0b0b25 100644
--- a/StoneIsland/www/js/lib/products/ProductView.js
+++ b/StoneIsland/www/js/lib/products/ProductView.js
@@ -1,12 +1,3 @@
-var SIZE_LOOKUP = {
-  "XS": "X-SMALL",
-  "S": "SMALL",
-  "M": "MEDIUM",
-  "L": "LARGE",
-  "XL": "X-LARGE",
-  "XXL": "XX-LARGE",
-  "XXXL": "XXX-LARGE",
-};
 
 var ProductView = ScrollableView.extend({
   
@@ -20,6 +11,7 @@ var ProductView = ScrollableView.extend({
   
   initialize: function(){
     this.gallery = new GalleryView ()
+    this.scroller = new IScroll('#product', app.iscroll_options)
     
     this.$num = this.$(".num")
     this.$title = this.$(".title")
@@ -147,6 +139,16 @@ var ProductView = ScrollableView.extend({
 
 })
 
+var SIZE_LOOKUP = {
+  "XS": "X-SMALL",
+  "S": "SMALL",
+  "M": "MEDIUM",
+  "L": "LARGE",
+  "XL": "X-LARGE",
+  "XXL": "XX-LARGE",
+  "XXXL": "XXX-LARGE",
+};
+
 
 /*
 
-- 
cgit v1.2.3-70-g09d2