4 files changed, 49 insertions, 21 deletions

diff --git a/StoneIsland/www/js/lib/_router.js b/StoneIsland/www/js/lib/_router.js
index 8742ce44..20ef2ce1 100644
--- a/StoneIsland/www/js/lib/_router.js
+++ b/StoneIsland/www/js/lib/_router.js
@@ -21,7 +21,11 @@ var SiteRouter = Router.extend({
     '/account/shipping':  'shipping',
     '/account/settings':  'settings',
 
-    '/faq':               'faq',
+    '/page/terms':        'terms',
+    '/page/privacy':      'privacy',
+    '/page/returns':      'returns',
+    '/page/care':         'care',
+    
     '/search':            'search',
 
     '/cart':              'cart.summary',
@@ -33,7 +37,6 @@ var SiteRouter = Router.extend({
 	},
 	
 	initialize: function(){
-	  console.log("HI!")
 	  var fn
 	  for (var route in this.routes) {
 	    fn = this.routes[route]
diff --git a/StoneIsland/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js
index 357698f5..85ff8a35 100644
--- a/StoneIsland/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/www/js/lib/blogs/BlogView.js
@@ -28,7 +28,9 @@ var BlogView = View.extend({
     this.loader.preloadImage(data.story[0].image.uri, function(img){
       app.story.populate(data.story)
     })
-    app.faq.populate(data.page[0])
+    data.page.forEach(function(page){
+      app[page.tag].populate(page)
+    })
   },
 
 })
\ No newline at end of file
diff --git a/StoneIsland/www/js/lib/blogs/FaqView.js b/StoneIsland/www/js/lib/blogs/PageView.js
index fe7246db..4bf05430 100644
--- a/StoneIsland/www/js/lib/blogs/FaqView.js
+++ b/StoneIsland/www/js/lib/blogs/PageView.js
@@ -1,24 +1,24 @@
-var FaqView = ScrollableView.extend({
-  
-  el: "#faq",
+var PageView = ScrollableView.extend({
   
   events: {
   },
 
-  initialize: function(){
+  initialize: function(opt){
+    this.page = opt.page
+    this.setElement("#" + opt.page)
     this.$content = this.$(".content")
     this.$loader = this.$(".loader")
-    this.scroller = new IScroll('#faq', app.iscroll_optionsx)
+    this.scroller = new IScroll('#' + this.page, app.iscroll_options)
   },
 
   show: function(){
     this.deferScrollToTop()
     app.footer.hide()
-    document.body.className = "faq"
+    document.body.className = this.page
   },
   
   populate: function(data){
     this.$content.html(data.body.replace(/\n/g, "<br>"))
-  }
+  },
 
 })
\ No newline at end of file
diff --git a/StoneIsland/www/js/lib/nav/NavView.js b/StoneIsland/www/js/lib/nav/NavView.js
index 9019275f..a9129650 100644
--- a/StoneIsland/www/js/lib/nav/NavView.js
+++ b/StoneIsland/www/js/lib/nav/NavView.js
@@ -18,13 +18,19 @@ var NavView = View.extend({
     "click .shipping": "shipping",
     "click .settings": "settings",
     
+    "click .faq_back": "faq_back",
+    "click .privacy": "privacy",
+    "click .returns": "returns",
+    "click .terms": "terms",
+    "click .care": "care",
+    
     "click .fb": "fb",
     "click .insta": "insta",
     "click .tw": "tw",
   },
   
-  initialize: function(){
-  },
+	initialize: function(){
+	},
   
   show: function(){
     $("body").addClass("nav")
@@ -62,7 +68,9 @@ var NavView = View.extend({
       app.router.go("account/login")
     }
   },
-  
+  account_back: function(){
+    this.$el.removeClass("account")
+  },
 
   profile: function(){
     this.hide()
@@ -81,18 +89,33 @@ var NavView = View.extend({
     app.router.go("account/settings")
   },
 
-
-  account_back: function(){
-    this.$el.removeClass("account")
+  faq: function(){
+    this.$el.addClass("faq")
   },
-  
-  search: function(){
+  faq_back: function(){
+    this.$el.removeClass("faq")
+  },
+  privacy: function(){
     this.hide()
-    app.router.go("search")
+    app.router.go("page/privacy")
   },
-  faq: function(){
+  returns: function(){
+    this.hide()
+    app.router.go("page/returns")
+  },
+  terms: function(){
+    this.hide()
+    app.router.go("page/terms")
+  },
+  care: function(){
     this.hide()
-    app.router.go("faq")
+    app.router.go("page/care")
+  },
+
+
+  search: function(){
+    this.hide()
+    app.router.go("search")
   },