diff options
Diffstat (limited to 'StoneIsland/platforms/ios/www')
| -rwxr-xr-x | StoneIsland/platforms/ios/www/css/account.css | 22 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/css/cart.css | 4 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/css/nav.css | 6 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/index.html | 60 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/js/index.js | 2 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js | 11 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/js/lib/etc/geo.js | 44 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js | 7 |
8 files changed, 101 insertions, 55 deletions
diff --git a/StoneIsland/platforms/ios/www/css/account.css b/StoneIsland/platforms/ios/www/css/account.css index d96073e4..b77cd428 100755 --- a/StoneIsland/platforms/ios/www/css/account.css +++ b/StoneIsland/platforms/ios/www/css/account.css @@ -295,13 +295,17 @@ 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; @@ -309,9 +313,11 @@ input.switch:checked + label:after { box-sizing:border-box; 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; @@ -347,15 +353,19 @@ input.switch:checked + label:after { margin:0 auto; } +#signup .checkbox-container { + margin-top:12px!important +} + .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; @@ -509,11 +519,11 @@ margin-bottom:9px!important .newuser { display:inline-block; - padding:20px; + padding:14px; text-decoration:underline } .forgotpassword { - padding:20px; + padding:14px; text-decoration:underline }
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/css/cart.css b/StoneIsland/platforms/ios/www/css/cart.css index 9fbc54b3..5c910eb4 100755 --- a/StoneIsland/platforms/ios/www/css/cart.css +++ b/StoneIsland/platforms/ios/www/css/cart.css @@ -355,4 +355,8 @@ color:#000; #cart_shipping .half-input input { margin-top:0px +} + +#cart .scroll, #payment .scroll, #shipping .scroll, #signup .scroll { + min-height:calc(100% + 100px) }
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/css/nav.css b/StoneIsland/platforms/ios/www/css/nav.css index 832ec46a..05e4aedc 100755 --- a/StoneIsland/platforms/ios/www/css/nav.css +++ b/StoneIsland/platforms/ios/www/css/nav.css @@ -395,6 +395,10 @@ h1 { } .msg { - padding: 20px; + margin: 20px; display: inline-block; } + +.msg-condensed { + margin:6px!important; +} diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index 4058403c..b9dd0a91 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -360,28 +360,18 @@ <input type="password" name="Password" placeholder="PASSWORD (7 CHARACTERS OR MORE)" required> <input type="password" name="Password2" placeholder="CONFIRM PASSWORD" required> </div> - <div class="container-row"> - <div class="container-message"> - <span class="msg"> - * Your personal and payment<br> - information will always remain private - </span> - </div> - </div> - - <div class="toggle-container"> - <div class="caption"> - <h3>Newsletter</h3> - Receive Stone Island Newsletter - </div> - <div class="toggle"> - <input type="checkbox" id="receive-newsletter-signup" name="YooxLetter" class="switch" value="true"> - <label for="receive-newsletter-signup"></label> - </div> - </div> <div class="container-row"> - <div class="checkbox-container"> + <div class="checkbox-container "> + <div class="checkbox-row"> + <div class="checkbox-toggle"> + <input type="checkbox" id="checkbox-data-profiling" 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="DataProfiling" value="true" required> @@ -418,20 +408,26 @@ <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 type="checkbox" id="receive-newsletter-profile" name="YooxLetter" value="true" required> + <label for="receive-newsletter-profile"></label> + </div> + <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="DataProfiling" value="true" required> <label for="checkbox-shopping-data-profiling-profile"></label> </div> @@ -445,14 +441,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> diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js index 050a729c..73af443a 100755 --- a/StoneIsland/platforms/ios/www/js/index.js +++ b/StoneIsland/platforms/ios/www/js/index.js @@ -3,7 +3,7 @@ var app = (function(){ app.init = function(){ - sdk.init({ env: "production" }) + sdk.init({ env: "test" }) app.bind() app.build() diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js index dae7f98d..4ed05bb8 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js @@ -25,13 +25,22 @@ var HubView = ScrollableView.extend({ galleries: {}, populate: function(data){ - this.data = data + // sort posts by date, reversed + this.data = data.map(function(s){ + return [ +moment(s.date), s ] + }).sort(function(a,b){ + return a[0] > b[0] ? -1 : a[0] == b[0] ? 0 : 1 + }).map(function(pair){ + console.log(pair[1]) + return pair[1] + }) this.$loader.hide() this.$content.empty() this.galleries = {} // id date subtitle body link store image[uri caption] this.data.forEach(function(row){ // console.log(row) + console.log(moment(row.date)) var t = this.template.replace(/{{id}}/g, row.id) .replace(/{{date}}/, moment(row.date).format("MM.DD.YYYY")) .replace(/{{title}}/, row.title) diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/geo.js b/StoneIsland/platforms/ios/www/js/lib/etc/geo.js index fac34c1e..88521bb1 100755 --- a/StoneIsland/platforms/ios/www/js/lib/etc/geo.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/geo.js @@ -1,23 +1,49 @@ var geo = (function(){ var geo = {} + var polling = false, fetching = false, poll_timeout = null + geo.fetch = function(){ + fetching = true navigator.geolocation.getCurrentPosition(geo.success, geo.error, {timeout: 15000}) } geo.success = function(position){ - var lat_str = as_degrees( position.coords.latitude || 40.99167 ) - var lng_str = as_degrees( position.coords.longitude || -74.07944 ) + var lat_str = as_degrees( position.coords.latitude || 40.99167, "N", "S" ) + var lng_str = as_degrees( position.coords.longitude || -74.07944, "W", "E" ) $(".latlng").html( lat_str + " " + lng_str ) + geo.done() } geo.error = function(error){ - $(".latlng").html( "+40° 58' 90\" -74° 04' 46\"" ) + $(".latlng").html( "+40° 58' 90.9\" N 74° 04' 46.3\" W" ) + geo.done() + } + + geo.done = function(){ + fetching = false + if (polling) { + clearTimeout( poll_timeout ) + poll_timeout = setTimeout(geo.fetch, 15000) + } + } + + geo.start_polling = function(){ + polling = true + if (! fetching) { + geo.fetch() + } + } + + geo.stop_polling = function(){ + polling = false + clearTimeout(poll_timeout) } - function as_degrees (n) { + function as_degrees (n, pos, neg) { var s = "" - if (n >= 0) s += "+" + var sig = n >= 0 ? pos : neg + s += Math.floor(n) + "° " n = Math.abs(n) @@ -31,7 +57,13 @@ var geo = (function(){ n *= 60 nn = Math.floor(n) if (nn < 10) nn = "0" + nn - s += nn + '"' + s += nn + + n %= 1 + n *= 10 + nn = Math.floor(n) + s += "." + nn + '\" ' + sig + return s } diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js b/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js index 5e5ea908..c075619a 100755 --- a/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js +++ b/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js @@ -21,14 +21,13 @@ var IntroView = View.extend({ window.addEventListener("deviceorientation", this.orient) app.footer.hide() this.orient({ alpha: 0 }) - // get location.. }, - + hide: function(){ window.removeEventListener("deviceorientation", this.orient) this.$alert.hide() }, - + deviceorientation: function(e){ var heading if ('webkitCompassHeading' in e) { @@ -61,5 +60,5 @@ var IntroView = View.extend({ e.stopPropagation() app.router.go("archive") }, - + }) |