summaryrefslogtreecommitdiff
path: root/StoneIsland/platforms/ios/www
diff options
context:
space:
mode:
Diffstat (limited to 'StoneIsland/platforms/ios/www')
-rwxr-xr-xStoneIsland/platforms/ios/www/css/account.css15
-rwxr-xr-xStoneIsland/platforms/ios/www/index.html41
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/_router.js15
-rw-r--r--StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js6
4 files changed, 51 insertions, 26 deletions
diff --git a/StoneIsland/platforms/ios/www/css/account.css b/StoneIsland/platforms/ios/www/css/account.css
index 973f3d2c..32c7df79 100755
--- a/StoneIsland/platforms/ios/www/css/account.css
+++ b/StoneIsland/platforms/ios/www/css/account.css
@@ -442,12 +442,15 @@ input.switch:checked + label:after {
}
.privacy-msg {
- left: 50%;
- display: inline-block;
- position: relative;
- transform: translateX(-50%);
- padding-top: 15px;
- padding-bottom: 80px;
+ left: 50%;
+ display: inline-block;
+ position: relative;
+ transform: translateX(-50%);
+ padding-top: 15px;
+ padding-bottom: 80px;
+}
+.privacy-msg a {
+ color: black;
}
.select-wrapper {
diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html
index 8837b9a3..e8816830 100755
--- a/StoneIsland/platforms/ios/www/index.html
+++ b/StoneIsland/platforms/ios/www/index.html
@@ -67,7 +67,7 @@
<!-- flex fill -->
<span class="submenu">
<div class="main_menu">
- <span class="account">ACCOUNT</span>
+ <span class="account">MY ACCOUNT</span>
<span class="login">LOGIN</span>
<span class="faq">FAQ</span>
</div>
@@ -77,7 +77,7 @@
<span class="main">MAIN MENU</span>
</div>
<div class="faq_menu">
- <span class="account">ACCOUNT</span>
+ <span class="account">MY ACCOUNT</span>
<span class="login">LOGIN</span>
<span class="logout">LOGOUT</span>
<span class="main">MAIN MENU</span>
@@ -429,7 +429,7 @@
<label for="checkbox-data-profiling"></label>
</div>
<label class="checkbox-caption" for="checkbox-data-profiling">
- I agree that YOOX and SPORTSWEAR COMPANY may collect my personal information for marketing purposes (newsletters, news and promotions).
+ I AGREE TO STONE ISLAND - SPORTSWEAR COMPANY COLLECTING AND PROCESSING MY PERSONAL INFORMATION FOR MARKETING PURPOSES.
</label>
</div>
<div class="checkbox-row">
@@ -438,23 +438,25 @@
<label for="checkbox-shopping-data-profiling"></label>
</div>
<label class="checkbox-caption" for="checkbox-shopping-data-profiling">
- I agree that YOOX NET-A-PORTER GROUP and SPORTSWEAR COMPANY may collect my personal information for creating a profile of my shopping habits.
+ I AGREE TO STONE ISLAND - SPORTSWEAR COMPANY COLLECTING AND PROCESSING MY PERSONAL INFORMATION TO CUSTOMIZE MY SHOPPING EXPERIENCE BASED ON MY INTERESTS AND HABITS.
</label>
</div>
<div class="checkbox-row">
<div class="checkbox-toggle">
- <input type="checkbox" id="checkbox-shopping-account-terms" name="AccountTerms" value="true" required tabindex="9">
+ <input type="checkbox" id="checkbox-shopping-account-terms" name="AccountTerms" value="true" required tabindex="10">
<label for="checkbox-shopping-data-profiling"></label>
</div>
<label class="checkbox-caption" for="checkbox-shopping-account-terms">
- Accept account terms and conditions of use
+ ACCEPT MY ACCOUNT TERMS AND CONDITIONS OF USE *
</label>
</div>
<div class="container-message submessage">
<span class="msg"></span>
</div>
<div class="privacy-msg">
- Consult our <u>PRIVACY POLICY</u> for further information.
+ Personal data will be electronically processed by SPORTSWEAR COMPANY and YOOX NET-A-PORTER GROUP in order to complete your request. Please note that you are responsible for third party data that you disclose to SPORTSWEAR COMPANY and YOOX NET-A-PORTER GROUP.
+ <br>
+ Consult our <a href="#/page/privacy">PRIVACY POLICY</a> for further information.
</div>
</div>
</div>
@@ -465,7 +467,7 @@
<div id="profile">
<div class="scroll">
- <h1>PROFILE</h1>
+ <h1>MY PROFILE</h1>
<div class="form">
<div class="container">
<div class="container-row">
@@ -500,15 +502,26 @@
</div>
<div class="checkbox-row">
<div class="checkbox-toggle">
- <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling" value="true" required tabindex="7">
+ <input type="checkbox" id="checkbox-data-profiling-profile" name="DataProfiling" value="true" required tabindex="7">
+ <label for="checkbox-data-profiling-profile"></label>
+ </div>
+ <label class="checkbox-caption" for="checkbox-data-profiling-profile">
+ I AGREE TO STONE ISLAND - SPORTSWEAR COMPANY COLLECTING AND PROCESSING MY PERSONAL INFORMATION FOR MARKETING PURPOSES.
+ </label>
+ </div>
+ <div class="checkbox-row">
+ <div class="checkbox-toggle">
+ <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling" value="true" required tabindex="8">
<label for="checkbox-shopping-data-profiling-profile"></label>
</div>
<label class="checkbox-caption" for="checkbox-shopping-data-profiling-profile">
- I agree that YOOX NET-A-PORTER GROUP and SPORTSWEAR COMPANY may collect my personal information for creating a profile of my shopping habits.
+ I AGREE TO STONE ISLAND - SPORTSWEAR COMPANY COLLECTING AND PROCESSING MY PERSONAL INFORMATION TO CUSTOMIZE MY SHOPPING EXPERIENCE BASED ON MY INTERESTS AND HABITS.
</label>
</div>
<div class="privacy-msg">
- Consult our <u>PRIVACY POLICY</u> for further information.
+ Personal data will be electronically processed by SPORTSWEAR COMPANY and YOOX NET-A-PORTER GROUP in order to complete your request. Please note that you are responsible for third party data that you disclose to SPORTSWEAR COMPANY and YOOX NET-A-PORTER GROUP.
+ <br>
+ Consult our <a href="#/page/privacy">PRIVACY POLICY</a> for further information.
</div>
</div>
</div>
@@ -521,7 +534,7 @@
<div id="shipping">
<div class="scroll">
- <h1>SHIPPING</h1>
+ <h1>ADDRESS BOOK</h1>
<div class="form">
<div class="container">
<div class="container-row">
@@ -545,7 +558,7 @@
<div id="payment">
<div class="scroll">
- <h1>PAYMENT</h1>
+ <h1>MY CARD</h1>
<div class="form">
<div class="container">
<div class="container-row">
@@ -600,7 +613,7 @@
<div id="orders">
<div class="scroll">
- <h1>ORDERS</h1>
+ <h1>MY ORDERS</h1>
<div id="order_list">
<div class="list"></div>
<div class="empty">You have no orders.</div>
diff --git a/StoneIsland/platforms/ios/www/js/lib/_router.js b/StoneIsland/platforms/ios/www/js/lib/_router.js
index 723bb944..bd13c126 100755
--- a/StoneIsland/platforms/ios/www/js/lib/_router.js
+++ b/StoneIsland/platforms/ios/www/js/lib/_router.js
@@ -42,12 +42,12 @@ var SiteRouter = Router.extend({
initialize: function(){
var fn
- for (var route in this.routes) {
- fn = this.routes[route]
- if (! this[fn]) {
- this[fn] = this.default_view(fn)
- }
- }
+ for (var route in this.routes) {
+ fn = this.routes[route]
+ if (! this[fn]) {
+ this[fn] = this.default_view(fn)
+ }
+ }
},
initial_route: null,
@@ -75,6 +75,9 @@ var SiteRouter = Router.extend({
default_view: function(name){
var fn = function(){
console.log(name)
+ if (app.demand_consent && app.consent.check()) {
+ return
+ }
if (app.view != app.login && app.view != app.signin) {
app.last_view = app.view
}
diff --git a/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js b/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js
index c4fe0b53..22f63c53 100644
--- a/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js
+++ b/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js
@@ -19,12 +19,16 @@ var ConsentModal = View.extend({
var status = localStorage.getItem('account_terms.consent')
if (status !== 'true') {
this.show()
+ return true
} else {
this.hide()
+ app.demand_consent = false
+ return false
}
},
show: function(){
+ app.demand_consent = true
this.$el.show()
setTimeout(function(){
this.$el.addClass('visible')
@@ -63,11 +67,13 @@ var ConsentModal = View.extend({
if (!state) {
return
}
+ app.demand_consent = false
this.hide()
localStorage.setItem('account_terms.consent', 'true')
},
logout: function(){
+ app.demand_consent = false
this.hide()
localStorage.setItem('account_terms.consent', 'false')
app.router.go("account/logout")