From 8e048cfb6d758759b563194ca21eca14d8302800 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 19 Nov 2015 17:30:51 -0500
Subject: type=date

---
 StoneIsland/www/css/account.css              | 2 +-
 StoneIsland/www/index.html                   | 6 +++---
 StoneIsland/www/js/lib/account/SignupView.js | 7 ++++++-
 StoneIsland/www/js/lib/blogs/StoryView.js    | 1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'StoneIsland')

diff --git a/StoneIsland/www/css/account.css b/StoneIsland/www/css/account.css
index e2d7ed97..0d3d0e57 100644
--- a/StoneIsland/www/css/account.css
+++ b/StoneIsland/www/css/account.css
@@ -53,7 +53,7 @@ form h2 {
   font-weight: bold;
 }
 
-input[type=text], input[type=password], input[type=number], input[type=email]  {
+input[type=text], input[type=password], input[type=number], input[type=date], input[type=email]  {
   font-family:pfd, sans-serif;
   font-size:14px;
   outline:none!important;
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 1f9b7a54..735b8606 100644
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -272,7 +272,7 @@
         <input type="text" name="Surname" placeholder="LAST NAME" required>
         <input type="email" name="Email" placeholder="EMAIL ADDRESS" required>
         <input type="email" name="ConfirmEmail" placeholder="CONFIRM EMAIL ADDRESS" required>
-        <input type="email" name="Birthday" placeholder="BIRTHDAY (MM/DD/YYYY)" required>
+        <input type="date" name="Birthday" placeholder="BIRTHDAY" required>
         <h2>PASSWORD</h2>
         <input type="password" name="Password" placeholder="PASSWORD (7 CHARACTERS OR MORE)" required>
         <input type="password" name="Password2" placeholder="CONFIRM PASSWORD" required>
@@ -280,7 +280,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>
+               <input id="checkbox-data-profiling" type="checkbox" name="YooxLetter" value="true" required>
                <label for="checkbox-data-profiling"></label>
             </div>
             <div class="checkbox-caption">
@@ -289,7 +289,7 @@
           </div>
           <div class="checkbox-row">
             <div class="checkbox-toggle">
-               <input type="checkbox" id="checkbox-shopping-data-profiling" name="ShoppingDataProfiling" value="true" required>
+               <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling" value="true" required>
                <label for="checkbox-shopping-data-profiling"></label>
             </div>
             <div class="checkbox-caption">
diff --git a/StoneIsland/www/js/lib/account/SignupView.js b/StoneIsland/www/js/lib/account/SignupView.js
index 04600517..123b47a6 100644
--- a/StoneIsland/www/js/lib/account/SignupView.js
+++ b/StoneIsland/www/js/lib/account/SignupView.js
@@ -25,17 +25,22 @@ var SignupView = FormView.extend({
     "Name": "Please enter your first name.",
     "Surname": "Please enter your last name.",
     "Email": "Please enter a valid email address.",
+    "ConfirmEmail": "Please enter a valid email address.",
     "Password": "Please enter your password.",
     "Password2": "Please enter your password again.",
+    "YooxLetter": "You must agree to data profiling.",
     "DataProfiling": "You must agree to data profiling.",
   },
   
   validate_fields: function(errors){
     if (data.Password !== data.Password2) { errors.push("Password2", "Passwords don't match.") }
+    if (data.Email !== data.ConfirmEmail) { errors.push("ConfirmEmail", "Email addresses don't match.") }
+    if (! data.YooxLetter) { data.YooxLetter = "false" }
+    if (! data.DataProfiling) { data.DataProfiling = "false" }
   },
   
   success: function(data){
-    // change login in ui to logout or whatever
+    auth.view_logged_in()
   },
   
   error: function(data){
diff --git a/StoneIsland/www/js/lib/blogs/StoryView.js b/StoneIsland/www/js/lib/blogs/StoryView.js
index 1829e8cf..88a56392 100644
--- a/StoneIsland/www/js/lib/blogs/StoryView.js
+++ b/StoneIsland/www/js/lib/blogs/StoryView.js
@@ -57,6 +57,7 @@ var StoryView = ScrollableView.extend({
     
     var section = this.sections[id]
     this.$img.attr("src", section.image.uri)
+    this.deferScrollToTop()
   },
 
 })
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2