summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--StoneIsland/www/css/blogs.css9
-rw-r--r--StoneIsland/www/css/nav.css5
-rw-r--r--StoneIsland/www/index.html33
-rw-r--r--StoneIsland/www/js/index.js5
-rw-r--r--StoneIsland/www/js/lib/_router.js7
-rw-r--r--StoneIsland/www/js/lib/blogs/BlogView.js4
-rw-r--r--StoneIsland/www/js/lib/blogs/PageView.js (renamed from StoneIsland/www/js/lib/blogs/FaqView.js)14
-rw-r--r--StoneIsland/www/js/lib/nav/NavView.js45
8 files changed, 93 insertions, 29 deletions
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 @@
<span class="profile">PROFILE</span>
<span class="payment">PAYMENT</span>
<span class="shipping">SHIPPING</span>
+ <span class="orders">ORDERS</span>
+ <span class="return">RETURN</span>
<span class="settings">NOTIFICATIONS</span>
</div>
+ <div class="faq_menu">
+ <span class="faq_back">&lt; FAQ</span>
+ <span class="privacy">PRIVACY POLICY</span>
+ <span class="terms">TERMS AND CONDITIONS</span>
+ <span class="returns">RETURN POLICY</span>
+ <span class="care">CUSTOMER CARE</span>
+ </div>
</span>
<span class="submenu">
@@ -137,9 +146,27 @@
</div>
</div>
- <div id="faq">
+ <div id="privacy" class="page">
+ <div class="scroll">
+ <h1>PRIVACY POLICY</h1>
+ <div class="content"></div>
+ </div>
+ </div>
+ <div id="terms" class="page">
+ <div class="scroll">
+ <h1>TERMS AND CONDITIONS</h1>
+ <div class="content"></div>
+ </div>
+ </div>
+ <div id="returns" class="page">
+ <div class="scroll">
+ <h1>RETURN POLICY</h1>
+ <div class="content"></div>
+ </div>
+ </div>
+ <div id="care" class="page">
<div class="scroll">
- <h1>FAQ</h1>
+ <h1>CUSTOMER CARE</h1>
<div class="content"></div>
</div>
</div>
@@ -497,7 +524,7 @@
<script src="js/lib/blogs/BlogView.js"></script>
<script src="js/lib/blogs/ArchiveView.js"></script>
<script src="js/lib/blogs/HubView.js"></script>
-<script src="js/lib/blogs/FaqView.js"></script>
+<script src="js/lib/blogs/PageView.js"></script>
<script src="js/lib/blogs/StoryView.js"></script>
<script src="js/lib/_router.js"></script>
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/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")
},
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-10 18:10:46 +0000