diff options
Diffstat (limited to 'StoneIsland')
| -rw-r--r-- | StoneIsland/www/index.html | 18 | ||||
| -rw-r--r-- | StoneIsland/www/js/lib/account/ProfileView.js | 7 | ||||
| -rw-r--r-- | StoneIsland/www/js/lib/auth/SignupView.js | 3 | ||||
| -rw-r--r-- | StoneIsland/www/js/lib/products/ProductView.js | 4 |
4 files changed, 12 insertions, 20 deletions
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index ab5ae2d5..9c008b31 100644 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -342,14 +342,6 @@ <input type="email" name="ConfirmEmail" placeholder="CONFIRM EMAIL ADDRESS" required> <input type="date" name="BirthDay" placeholder="BIRTHDAY (MM/DD/YYYY)" required> - <div class="select-wrapper"> - <span>GENDER</span> - <select name="Gender"> - <option value="NONE">Gender</option> - <option value="U">Male</option> - <option value="D">Female</option> - </select> - </div> <h2>PASSWORD</h2> <input type="password" name="Password" placeholder="PASSWORD (7 CHARACTERS OR MORE)" required> <input type="password" name="Password2" placeholder="CONFIRM PASSWORD" required> @@ -403,15 +395,6 @@ <input type="email" name="Email" placeholder="EMAIL ADDRESS" required> <input type="date" name="BirthDay" placeholder="BIRTHDAY (MM/DD/YYYY)" required> - <div class="select-wrapper"> - <span>GENDER</span> - <select name="Gender"> - <option value="NONE">Gender</option> - <option value="U">Male</option> - <option value="D">Female</option> - </select> - </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> @@ -756,6 +739,7 @@ <div class="cc_confirm"> <h3>PLEASE ENTER YOUR SECURITY CODE TO CONFIRM</h3> <input type="number" name="Cvv" placeholder="SECURITY CODE" required> + </div> </div> <div class="container-fill"> diff --git a/StoneIsland/www/js/lib/account/ProfileView.js b/StoneIsland/www/js/lib/account/ProfileView.js index 999e8d65..da25fefc 100644 --- a/StoneIsland/www/js/lib/account/ProfileView.js +++ b/StoneIsland/www/js/lib/account/ProfileView.js @@ -5,6 +5,8 @@ var ProfileView = FormView.extend({ events: { }, + action: sdk.account.update, + initialize: function(){ this.$form = this.$("form") this.$msg = this.$(".msg") @@ -30,7 +32,7 @@ var ProfileView = FormView.extend({ if (! data.CurrentPassword && (data.NewPassword || data.Email !== auth.user.Email)) { errors.push([ "CurrentPassword", "Please enter your current password." ]) } if (data.CurrentPassword && ! data.NewPassword) { errors.push([ "NewPassword", "Please enter your new password." ]) } if (data.NewPassword && data.NewPassword.length < 7) { errors.push([ "CurrentPassword", "New password must be 7 characters or more." ]) } - if (data.Gender === "NONE") { errors.push([ "Gender", "Please supply your gender." ]) } + // if (data.Gender === "NONE") { errors.push([ "Gender", "Please supply your gender." ]) } }, finalize: function(data){ @@ -50,7 +52,8 @@ var ProfileView = FormView.extend({ }) } - var submissible_data = _.pick(data, "Name Surname BirthDay Gender YooxLetter".split(" ")) + var submissible_data = _.pick(data, "Name Surname BirthDay YooxLetter".split(" ")) + submissible_data.Gender = "U" // submissible_data.idUser = auth.user_id // submissible_data.AccessToken = auth.access_token // submissible_data.Premium = "false" diff --git a/StoneIsland/www/js/lib/auth/SignupView.js b/StoneIsland/www/js/lib/auth/SignupView.js index 7e6fc04d..22b310de 100644 --- a/StoneIsland/www/js/lib/auth/SignupView.js +++ b/StoneIsland/www/js/lib/auth/SignupView.js @@ -57,7 +57,7 @@ var SignupView = FormView.extend({ if (data.Password !== data.Password2) { errors.push([ "Password2", "Passwords don't match." ]) } if (! data.Email.match("@")) { errors.push([ "Email", "Email address is not valid." ]) } 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.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." ]) } if (! data.YooxLetter) { data.YooxLetter = false } @@ -67,6 +67,7 @@ var SignupView = FormView.extend({ delete data.DataProfiling2 delete data.ConfirmEmail + data.Gender = "U" data.BirthDay += "T00:00:00Z" this.last_data = data diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js index 3e21b994..eacfe989 100644 --- a/StoneIsland/www/js/lib/products/ProductView.js +++ b/StoneIsland/www/js/lib/products/ProductView.js @@ -4,6 +4,7 @@ var ProductView = ScrollableView.extend({ el: "#product", events: { + "click .fit": "scroll_to_bottom", "click .size": "select_size", "click .color": "select_color", "click .share": "share", @@ -244,6 +245,9 @@ var ProductView = ScrollableView.extend({ app.router.go('store') }, + scroll_to_bottom: function(){ + }, + share: function(){ }, |