From 148b087a2f8c8972d18fd0a3aceb0d4f82f6741f Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 18 Nov 2015 21:35:25 -0500 Subject: rewrite faqview into pageview --- StoneIsland/www/css/blogs.css | 9 ++++--- StoneIsland/www/css/nav.css | 5 +++- StoneIsland/www/index.html | 33 ++++++++++++++++++++--- StoneIsland/www/js/index.js | 5 +++- StoneIsland/www/js/lib/_router.js | 7 +++-- StoneIsland/www/js/lib/blogs/BlogView.js | 4 ++- StoneIsland/www/js/lib/blogs/FaqView.js | 24 ----------------- StoneIsland/www/js/lib/blogs/PageView.js | 24 +++++++++++++++++ StoneIsland/www/js/lib/nav/NavView.js | 45 ++++++++++++++++++++++++-------- 9 files changed, 110 insertions(+), 46 deletions(-) delete mode 100644 StoneIsland/www/js/lib/blogs/FaqView.js create mode 100644 StoneIsland/www/js/lib/blogs/PageView.js diff --git a/StoneIsland/www/css/blogs.css b/StoneIsland/www/css/blogs.css index b498fc7d..e259f3d7 100644 --- a/StoneIsland/www/css/blogs.css +++ b/StoneIsland/www/css/blogs.css @@ -38,7 +38,10 @@ display: none; } -.faq #faq { display: block } -#faq { +.privacy #privacy { display: block } +.terms #terms { display: block } +.returns #returns { display: block } +.care #care { display: block } +.page { display: none; -} +} \ No newline at end of file diff --git a/StoneIsland/www/css/nav.css b/StoneIsland/www/css/nav.css index 3173135e..07f62657 100644 --- a/StoneIsland/www/css/nav.css +++ b/StoneIsland/www/css/nav.css @@ -46,8 +46,11 @@ } #nav .main_menu { display: block; } #nav .account_menu { display: none; } +#nav .faq_menu { display: none; } +#nav.faq .main_menu, #nav.account .main_menu { display: none; } #nav.account .account_menu { display: block; } +#nav.faq .faq_menu { display: block; } #nav .submenu { position: absolute; width: 100%; @@ -228,7 +231,7 @@ /* CONTENT */ -#story, #hub, #archive, #faq, +#story, #hub, #archive, .page, #collection, #product, #search, #login, #logout, #cart, diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index 6fb061b1..76498e58 100644 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -43,8 +43,17 @@ PROFILE PAYMENT SHIPPING + ORDERS + RETURN NOTIFICATIONS +
+ < FAQ + PRIVACY POLICY + TERMS AND CONDITIONS + RETURN POLICY + CUSTOMER CARE +
@@ -137,9 +146,27 @@ -
+
+
+

PRIVACY POLICY

+
+
+
+
+
+

TERMS AND CONDITIONS

+
+
+
+
+
+

RETURN POLICY

+
+
+
+
-

FAQ

+

CUSTOMER CARE

@@ -497,7 +524,7 @@ - + diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js index a2bbf992..5a4efec8 100644 --- a/StoneIsland/www/js/index.js +++ b/StoneIsland/www/js/index.js @@ -47,7 +47,10 @@ var app = (function(){ app.settings = new SettingsView () app.intro = new IntroView () - app.faq = new FaqView () + app.terms = new PageView ({ page: "terms" }) + app.privacy = new PageView ({ page: "privacy" }) + app.returns = new PageView ({ page: "returns" }) + app.care = new PageView ({ page: "care" }) app.search = new SearchView () app.product = new ProductView () 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/FaqView.js deleted file mode 100644 index fe7246db..00000000 --- a/StoneIsland/www/js/lib/blogs/FaqView.js +++ /dev/null @@ -1,24 +0,0 @@ -var FaqView = ScrollableView.extend({ - - el: "#faq", - - events: { - }, - - initialize: function(){ - this.$content = this.$(".content") - this.$loader = this.$(".loader") - this.scroller = new IScroll('#faq', app.iscroll_optionsx) - }, - - show: function(){ - this.deferScrollToTop() - app.footer.hide() - document.body.className = "faq" - }, - - populate: function(data){ - this.$content.html(data.body.replace(/\n/g, "
")) - } - -}) \ No newline at end of file diff --git a/StoneIsland/www/js/lib/blogs/PageView.js b/StoneIsland/www/js/lib/blogs/PageView.js new file mode 100644 index 00000000..4bf05430 --- /dev/null +++ b/StoneIsland/www/js/lib/blogs/PageView.js @@ -0,0 +1,24 @@ +var PageView = ScrollableView.extend({ + + events: { + }, + + initialize: function(opt){ + this.page = opt.page + this.setElement("#" + opt.page) + this.$content = this.$(".content") + this.$loader = this.$(".loader") + this.scroller = new IScroll('#' + this.page, app.iscroll_options) + }, + + show: function(){ + this.deferScrollToTop() + app.footer.hide() + document.body.className = this.page + }, + + populate: function(data){ + this.$content.html(data.body.replace(/\n/g, "
")) + }, + +}) \ 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") }, -- cgit v1.2.3-70-g09d2