Merge branch 'master' of https://github.com/okfocus/stone-island

1 files changed, 34 insertions, 11 deletions

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")
   },