diff options
Diffstat (limited to 'StoneIsland/platforms/android/assets/www')
14 files changed, 146 insertions, 80 deletions
diff --git a/StoneIsland/platforms/android/assets/www/cordova_plugins.js b/StoneIsland/platforms/android/assets/www/cordova_plugins.js index eec97542..90fa7c51 100755 --- a/StoneIsland/platforms/android/assets/www/cordova_plugins.js +++ b/StoneIsland/platforms/android/assets/www/cordova_plugins.js @@ -9,6 +9,14 @@ module.exports = [ ] }, { + "file": "plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js", + "id": "com.parse.cordova.core.pushplugin.ParsePlugin", + "pluginId": "com.parse.cordova.core.pushplugin", + "clobbers": [ + "window.parsePlugin" + ] + }, + { "file": "plugins/cordova-plugin-console/www/logger.js", "id": "cordova-plugin-console.logger", "pluginId": "cordova-plugin-console", @@ -111,20 +119,13 @@ module.exports = [ "clobbers": [ "PushNotification" ] - }, - { - "file": "plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js", - "id": "com.parse.cordova.core.pushplugin.ParsePlugin", - "pluginId": "com.parse.cordova.core.pushplugin", - "clobbers": [ - "window.parsePlugin" - ] } ]; module.exports.metadata = // TOP OF METADATA { "com.ionic.keyboard": "1.0.4", + "com.parse.cordova.core.pushplugin": "0.1.0", "cordova-plugin-console": "1.0.1", "cordova-plugin-customurlscheme": "4.0.0", "cordova-plugin-device": "1.0.1", @@ -135,8 +136,7 @@ module.exports.metadata = "cordova-plugin-splashscreen": "2.1.0", "cordova-plugin-whitelist": "1.0.0", "cordova-plugin-x-socialsharing": "5.0.7", - "phonegap-plugin-push": "1.4.4", - "com.parse.cordova.core.pushplugin": "0.1.0" + "phonegap-plugin-push": "1.4.4" } // BOTTOM OF METADATA });
\ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/css/account.css b/StoneIsland/platforms/android/assets/www/css/account.css index fbb960d0..4c71ac57 100755 --- a/StoneIsland/platforms/android/assets/www/css/account.css +++ b/StoneIsland/platforms/android/assets/www/css/account.css @@ -172,7 +172,17 @@ input[type=text], input[type=password], input[type=number], input[type=email] { border-right: 1px solid #a9a9a9; } -.toggle-container { +#signup .toggle-container, #profile .toggle-container { + margin: 0px auto; + display: table; + margin-top: 0px; + width: calc(100vw - 10px); + box-sizing: border-box; + padding:0px 18px 2px; + font-size:14px; +} + +#settings .toggle-container { margin: 0px auto; display: table; margin-top: 10px; @@ -285,23 +295,29 @@ input.switch:checked + label:after { } .container-fill { - min-height:50px; + min-height:80px; flex: 1; align-items: center; justify-content: center; position:relative; } +.container-fill-condensed { + min-height:38px!important; +} + .container-row .container-message { color:#000; text-align:center; width:calc(100vw - 10px); box-sizing:border-box; - margin:10px auto; + margin:10px auto 0; position:relative - } +.container-row .container-message-condensed { + margin: 2px auto!important +} .container-fill .container-message { font-size:12px; letter-spacing:0.5px; @@ -340,12 +356,12 @@ input.switch:checked + label:after { .checkbox-toggle { display:table-cell; box-sizing:border-box; - padding-right:15px; + padding-right:0px; position:relative; } .checkbox-toggle input { - width: 50px; + width: 45px; height: 35px; opacity: 0; z-index: 99999; @@ -495,4 +511,15 @@ margin-top:0px #login .container-row input:first-child { margin-bottom:9px!important +} + +.newuser { + display:inline-block; + padding:14px; + text-decoration:underline +} + +.forgotpassword { + padding:14px; + text-decoration:underline }
\ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/css/blogs.css b/StoneIsland/platforms/android/assets/www/css/blogs.css index 7af45c4f..8b27dda9 100755 --- a/StoneIsland/platforms/android/assets/www/css/blogs.css +++ b/StoneIsland/platforms/android/assets/www/css/blogs.css @@ -129,6 +129,7 @@ animation: mfadein 0.6s; z-index:2; position:absolute; display:block; + animation: gallery-fade 4s forwards; } .gallery-right { @@ -150,8 +151,15 @@ animation: mfadein 0.6s; z-index:2; position:absolute; display:block; + animation: gallery-fade 4s forwards; } +@-webkit-keyframes gallery-fade { + 0%{opacity:0} + 20%{opacity:1} + 78% {opacity:1} + 100% {opacity:0} +} /* NOTE: not sure if this down arrow is necessary.. the fade might do..? what do you think? it can be removed with javascript when the body hits the bottom of diff --git a/StoneIsland/platforms/android/assets/www/css/cart.css b/StoneIsland/platforms/android/assets/www/css/cart.css index 9fbc54b3..c214c93e 100755 --- a/StoneIsland/platforms/android/assets/www/css/cart.css +++ b/StoneIsland/platforms/android/assets/www/css/cart.css @@ -355,4 +355,8 @@ color:#000; #cart_shipping .half-input input { margin-top:0px +} + +#cart .scroll, #payment .scroll, #shipping .scroll { + min-height:calc(100% + 100px) }
\ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/css/nav.css b/StoneIsland/platforms/android/assets/www/css/nav.css index c769dabd..05e4aedc 100755 --- a/StoneIsland/platforms/android/assets/www/css/nav.css +++ b/StoneIsland/platforms/android/assets/www/css/nav.css @@ -81,7 +81,7 @@ font-size: 14px; letter-spacing:1.25px; color: #bbb; - padding: 4px 0 7px 20px + padding: 4px 0 12px 20px } #nav .social { @@ -321,20 +321,46 @@ padding-bottom:0px; #selector { display: none; position: absolute; - bottom: 0; left: 0; background: #fff; z-index: 2; - width:100%; - box-sizing:border-box + box-sizing:border-box; + min-width:100px; + animation: selector-spring .15s forwards; + animation-timing-function: cubic-bezier(.43,1,.89,.95) } + +@keyframes selector-spring { + 0% { + margin-top: 15px + } + 100% { + margin-top: 0 + } +} + #selector .options div { - width: 100%; background: white; text-align: center; - padding: 8px; - + padding: 7px 12px; box-sizing:border-box; font-size: 14px; + border-left:1px solid black; + border-right:1px solid black; + border-top:1px solid black; + +} + +#selector .options div:last-of-type { + border-bottom:1px solid black +} + +.selector-full { + width: 100% !important; + box-sizing:border-box +} + +.selector-full > div > div { + padding: 12px 0 !important; } /* CONTENT */ @@ -369,6 +395,10 @@ h1 { } .msg { - padding: 20px; + margin: 20px; display: inline-block; } + +.msg-condensed { + margin:6px!important; +} diff --git a/StoneIsland/platforms/android/assets/www/css/products.css b/StoneIsland/platforms/android/assets/www/css/products.css index bc215573..52de76d0 100755 --- a/StoneIsland/platforms/android/assets/www/css/products.css +++ b/StoneIsland/platforms/android/assets/www/css/products.css @@ -22,6 +22,7 @@ } #product .style { text-transform: uppercase; + box-sizing:border-box } #product.loading #gallery, @@ -117,7 +118,8 @@ .product .size { padding-right:16px; - position:relative + position:relative; + box-sizing:border-box } .product .price { diff --git a/StoneIsland/platforms/android/assets/www/index.html b/StoneIsland/platforms/android/assets/www/index.html index 5b949646..9f8da2b4 100755 --- a/StoneIsland/platforms/android/assets/www/index.html +++ b/StoneIsland/platforms/android/assets/www/index.html @@ -195,7 +195,7 @@ </div> <div class="heading"> <h1>ARCHIVE</h1> - <div class="subtitle">'982-'015</div> + <div class="subtitle">'982'015</div> </div> </div> @@ -316,7 +316,8 @@ </div> <div class="container-fill"> <div class="container-message premessage"> - <span class="newuser">New User?</span> + <div class="newuser">New User?</div> + <div class="forgotpassword">Forgot Password?</div> </div> <div class="container-message submessage"> <span class="msg"></span> @@ -352,7 +353,7 @@ <input type="email" name="ConfirmEmail" placeholder="CONFIRM EMAIL ADDRESS" required> <div class="select-wrapper date-wrapper"> <span>BIRTHDAY (MM/DD/YYYY)</span> - <input type="date" name="BirthDay" placeholder="BIRTHDAY (MM/DD/YYYY)" required> + <input type="date" name="BirthDay" min="1900-01-01" placeholder="BIRTHDAY (MM/DD/YYYY)" required> </div> <h2>PASSWORD</h2> @@ -383,16 +384,7 @@ <div class="checkbox-container"> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input id="checkbox-data-profiling" type="checkbox" name="DataProfiling" value="true" required> - <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). - </label> - </div> - <div class="checkbox-row"> - <div class="checkbox-toggle"> - <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling2" value="true" required> + <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling" value="true" required> <label for="checkbox-shopping-data-profiling"></label> </div> <label class="checkbox-caption" for="checkbox-shopping-data-profiling"> @@ -420,36 +412,33 @@ <input type="email" name="Email" placeholder="EMAIL ADDRESS" required> <div class="select-wrapper date-wrapper"> <span>BIRTHDAY (MM/DD/YYYY)</span> - <input type="date" name="BirthDay" placeholder="BIRTHDAY (MM/DD/YYYY)" required> + <input type="date" name="BirthDay" min="1900-01-01" placeholder="BIRTHDAY (MM/DD/YYYY)" required> </div> <h2>CHANGE PASSWORD</h2> <input type="password" name="CurrentPassword" placeholder="CURRENT PASSWORD" required> <input type="password" name="NewPassword" placeholder="NEW PASSWORD (7 CHARACTERS OR MORE)" required> - <div class="toggle-container"> - <div class="caption"> - <h3>Newsletter</h3> - Receive Stone Island Newsletter - </div> - <div class="toggle"> - <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" class="switch" value="true"> - <label for="receive-newsletter-profile"></label> + <div class="container-fill container-fill-condensed"> + <div class="container-message container-message-condensed"> + <span class="msg msg-condensed"> + </span> </div> </div> <div class="container-row"> <div class="checkbox-container"> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input id="checkbox-data-profiling-profile" type="checkbox" name="DataProfiling" value="true" required> - <label for="checkbox-data-profiling-profile"></label> + <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" value="true" required> + <label for="receive-newsletter-profile"></label> </div> - <label class="checkbox-caption" for="checkbox-data-profiling-profile"> - I agree that YOOX and SPORTSWEAR COMPANY may collect my personal information for marketing purposes (newsletters, news and promotions). + <label class="checkbox-caption" for="receive-newsletter-profile"> + <b>Newsletter</b><br> + Receive Stone Island Newsletter </label> </div> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling2" value="true" required> + <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling" value="true" required> <label for="checkbox-shopping-data-profiling-profile"></label> </div> <label class="checkbox-caption" for="checkbox-shopping-data-profiling-profile"> @@ -462,14 +451,6 @@ </div> </div> </div> - <div class="container-fill"> - <div class="container-message"> - <span class="msg"> - * Your personal and payment<br> - information will always remain private - </span> - </div> - </div> </div> </form> </div> @@ -730,21 +711,21 @@ <div class="checkbox-container"> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input id="express-shipping" type="radio" name="ShippingType" value="Express" required> + <input id="express-shipping" type="radio" name="ShippingType" value="Express" checked required> <label for="express-shipping"></label> </div> <label class="checkbox-caption" for="express-shipping"> - <b>COMPLIMENTARY EXPRESS $19.50</b><br> + <b>COMPLIMENTARY EXPRESS</b><br> (DELIVERY IN 2-4 WORKING DAYS) </label> </div> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input id="standard-shipping" type="radio" name="ShippingType" value="Standard" checked required> + <input id="standard-shipping" type="radio" name="ShippingType" value="Standard" required> <label for="standard-shipping"></label> </div> <label class="checkbox-caption" for="standard-shipping"> - <b>STANDARD SHIPPING $9.50</b><br> + <b>STANDARD SHIPPING</b><br> (DELIVERY IN 5-8 WORKING DAYS) </label> </div> diff --git a/StoneIsland/platforms/android/assets/www/js/lib/account/ProfileView.js b/StoneIsland/platforms/android/assets/www/js/lib/account/ProfileView.js index 2b608cb4..d36f7f38 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/account/ProfileView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/account/ProfileView.js @@ -17,7 +17,6 @@ var ProfileView = FormView.extend({ if (! auth.logged_in()) { return app.router.go("intro") } app.footer.show("SAVE") document.body.className = "profile" - auth.user.DataProfiling2 = auth.user.DataProfiling if (auth.user.BirthDay.match(/T/)) { auth.user.BirthDay = auth.user.BirthDay.split("T")[0] } diff --git a/StoneIsland/platforms/android/assets/www/js/lib/auth/LoginView.js b/StoneIsland/platforms/android/assets/www/js/lib/auth/LoginView.js index 4ef2823f..504827c8 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/auth/LoginView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/auth/LoginView.js @@ -6,6 +6,7 @@ var LoginView = FormView.extend({ events: { "click .newuser": "new_user", + "click .forgotpassword": "forgot_password", "submit form": "save", }, @@ -29,6 +30,10 @@ var LoginView = FormView.extend({ new_user: function(){ app.router.go("account/signup") + }, + + forgot_password: function(){ + window.open("http://www.stoneisland.co.uk/pages/forgotten-password", '_system') }, validate_presence: { diff --git a/StoneIsland/platforms/android/assets/www/js/lib/auth/SignupView.js b/StoneIsland/platforms/android/assets/www/js/lib/auth/SignupView.js index 599f57c7..4645d4d9 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/auth/SignupView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/auth/SignupView.js @@ -15,7 +15,6 @@ var SignupView = FormView.extend({ "Surname": "TestSurname", "BirthDay": "1978-11-12", "DataProfiling": true, - "DataProfiling2": true, }, */ @@ -63,12 +62,10 @@ var SignupView = FormView.extend({ if (data.Email.toLowerCase() !== data.ConfirmEmail.toLowerCase()) { errors.push([ "ConfirmEmail", "Email addresses don't match." ]) } // if (data.Gender === "NONE") { errors.push([ "Gender", "Please supply your gender." ]) } if (data.DataProfiling !== "true") { errors.push([ "DataProfiling", "You must consent to use this service." ]) } - if (data.DataProfiling2 !== "true") { errors.push([ "DataProfiling2", "You must consent to use this service." ]) } data.YooxLetter = this.$("[name=YooxLetter]").prop("checked") }, finalize: function(data){ - delete data.DataProfiling2 delete data.ConfirmEmail data.Gender = "U" diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js index c2a9f4b4..73b7b83b 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js @@ -26,7 +26,7 @@ var StoryView = ScrollableView.extend({ }, populate: function(data){ - if (this.loaded) {} + if (this.loaded) { return } this.loaded = true this.data = data this.$loader.hide() diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js index 1c12e7a1..fc373858 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js @@ -115,7 +115,7 @@ var NavView = View.extend({ app.router.go("account/settings") }, return_link: function(){ - window.open("http://www.stoneisland.com/", '_system') + window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/return&deviceYeti=smartphone", '_system') }, @@ -135,7 +135,7 @@ var NavView = View.extend({ app.router.go("page/terms") }, care: function(){ - window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/return&deviceYeti=smartphone", '_system') + window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/home&deviceYeti=smartphone", '_system') }, @@ -146,7 +146,7 @@ var NavView = View.extend({ fb: function(){ - window.open("https://www.facebook.com/StoneIsland", '_system') + window.open(is_ios ? "facebook://profile/231623463406" : "https://www.facebook.com/StoneIsland", '_system') }, insta: function(){ window.open("https://instagram.com/stoneisland_official", '_system') @@ -155,7 +155,6 @@ var NavView = View.extend({ window.open("https://twitter.com/stoneisland", '_system') }, yt: function(){ - console.log("youtube") window.open("https://www.youtube.com/user/StoneIslandOfficial", '_system') }, diff --git a/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js b/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js index 4e23ba1f..4e0a5f04 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js @@ -27,13 +27,26 @@ var Selector = View.extend({ this.$el.show() app.curtain.show("white") this.visible = true -// var selectionXY = $("." + origin).offset() -// var selectionWidth = $("." + origin).width() -// var selectorHeight = $('#selector').height() -// console.log(selectionXY.left) -// console.log(selectionXY.top) -// -// $("#selector").css({"top":(selectionXY.top - selectorHeight),"left":selectionXY.left}) + if ( origin == "wide") { + $("#selector").addClass("selector-full") + } + else { + $("#selector").removeClass("selector-full") + } + var originXY = $("." + origin).offset() + var originWidth = $("." + origin).width() + var selectorHeight = $('#selector').height() + var originHeight = $("." + origin).height() + console.log(originXY.left) + console.log(originXY.top) + console.log(selectorHeight) + console.log(origin) + + $("#selector").css({"top":(originXY.top - selectorHeight - originHeight + 20),"left":originXY.left}) + originXY = null; + originWidth = null; + originHeight = null; + selectorHeight = null; }, hide: function(){ diff --git a/StoneIsland/platforms/android/assets/www/js/vendor/util.js b/StoneIsland/platforms/android/assets/www/js/vendor/util.js index e09b6ada..d45c4b98 100755 --- a/StoneIsland/platforms/android/assets/www/js/vendor/util.js +++ b/StoneIsland/platforms/android/assets/www/js/vendor/util.js @@ -173,6 +173,7 @@ var browser = (function( ua ) { // Naive useragent detection pattern var is_iphone = (navigator.userAgent.match(/iPhone/i)) || (navigator.userAgent.match(/iPod/i)) var is_ipad = (navigator.userAgent.match(/iPad/i)) +var is_ios = is_iphone || is_ipad var is_android = (navigator.userAgent.match(/Android/i)) var is_mobile = is_iphone || is_ipad || is_android var is_desktop = ! is_mobile; |